From add73479102afd9796846918ea424d8c72619459 Mon Sep 17 00:00:00 2001 From: Professor Popoff Date: Thu, 15 Aug 2024 14:56:23 -0400 Subject: [PATCH] Map fixes + kills BOS --- _maps/map_files/Mammoth_Mini/Mammoth_mini.dmm | 419 +++++++++++++----- .../Mammoth_Mini/Mammoth_mini_above.dmm | 101 ++++- .../mojave/jobs/departments/departments.dm | 3 +- .../code/modules/jobs/job_types/bos/_bos.dm | 2 +- .../jobs/job_types/bos/head_paladin.dm | 4 +- .../modules/jobs/job_types/bos/head_scribe.dm | 4 +- .../modules/jobs/job_types/bos/initiate.dm | 4 +- .../code/modules/jobs/job_types/bos/knight.dm | 4 +- .../modules/jobs/job_types/bos/paladin.dm | 4 +- .../code/modules/jobs/job_types/bos/scribe.dm | 4 +- mojave/code/modules/jobs/jobs.dm | 8 +- tgstation.dme | 1 - 12 files changed, 418 insertions(+), 140 deletions(-) diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm index fabc8b053b0..d2ba7aef2a1 100644 --- a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm +++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm @@ -154,6 +154,11 @@ /obj/structure/ms13/wall_decor/flag, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"adv" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/power_armor/parts, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "ady" = ( /obj/structure/ms13/fence/wire, /obj/structure/ms13/pallet/stack, @@ -280,6 +285,7 @@ /area/ms13) "agU" = ( /obj/structure/table/ms13/metal/grate, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, /turf/open/floor/wood/ms13/carpet/blue, /area/ms13/town) "ahz" = ( @@ -1140,6 +1146,12 @@ /obj/effect/spawner/random/ms13/drink/soda, /turf/open/floor/ms13/tile/brown, /area/ms13/town) +"aRP" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "aRQ" = ( /obj/structure/ms13/pipes/horizontal/brown, /obj/structure/bonfire/ms13/fire_barrel, @@ -1353,6 +1365,13 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/ms13/tile, /area/ms13/town) +"aXi" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/hat, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "aXq" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -1734,6 +1753,11 @@ }, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"bqH" = ( +/obj/structure/lattice/catwalk/ms13, +/obj/effect/spawner/random/ms13/power_armor/lowrandom, +/turf/open/floor/ms13/metal/plate, +/area/ms13/town) "bre" = ( /obj/machinery/button/ms13{ id = "ncr-bay-door-2" @@ -2269,6 +2293,10 @@ /obj/structure/ms13/trash/cardboard, /turf/open/floor/ms13/tile/large/white, /area/ms13/town) +"bMW" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy/gun, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "bNy" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -3558,6 +3586,7 @@ /area/ms13) "cVC" = ( /obj/structure/ms13/pa_jack, +/obj/effect/spawner/random/ms13/power_armor/lowrandom, /turf/open/floor/ms13/metal/grate, /area/ms13/town) "cVP" = ( @@ -4036,8 +4065,10 @@ /turf/open/floor/wood/ms13/common, /area/ms13/town) "doQ" = ( -/obj/structure/noticeboard/ms13/cork, -/obj/structure/ms13/storage/trashcan, +/obj/machinery/light/ms13{ + dir = 4 + }, +/obj/structure/table/ms13/metal/heavy, /turf/open/floor/ms13/concrete, /area/ms13/town) "dpq" = ( @@ -5240,6 +5271,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"eqc" = ( +/obj/effect/spawner/random/ms13/tools/tool, +/turf/open/floor/ms13/metal/grate, +/area/ms13/town) "eqj" = ( /obj/structure/ms13/storage/vent, /obj/effect/decal/cleanable/blood/tracks{ @@ -5372,6 +5407,11 @@ }, /turf/open/floor/ms13/concrete/industrial, /area/ms13/snowcrest/republic) +"evy" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "evK" = ( /obj/structure/closet/ms13/metal, /turf/open/floor/ms13/concrete, @@ -6021,6 +6061,7 @@ "eYo" = ( /obj/structure/table/ms13/metal/alt, /obj/structure/ms13/trash/food, +/obj/effect/spawner/random/ms13/food/junkfood_canned, /turf/open/floor/ms13/concrete, /area/ms13/town) "eYS" = ( @@ -6549,6 +6590,11 @@ /obj/structure/ms13/toilet, /turf/open/floor/ms13/tile/fancy, /area/ms13/town) +"fuC" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "fuX" = ( /obj/effect/turf_decal/ms13/road/verticalline, /mob/living/simple_animal/hostile/retaliate/ms13/robot/eyebot, @@ -7932,6 +7978,11 @@ /obj/effect/turf_decal/ms13/graffiti/deadinside, /turf/closed/wall/ms13/brick/alt, /area/ms13/town) +"gsr" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/tools/tool, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gsF" = ( /obj/structure/table/ms13/no_smooth/counter/wood, /obj/effect/spawner/random/ms13/clothing/under, @@ -8144,7 +8195,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/left{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "gzp" = ( /obj/machinery/door/unpowered/ms13/metal{ @@ -8310,6 +8361,10 @@ /obj/effect/spawner/random/ms13/clothing/hat, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"gEW" = ( +/mob/living/simple_animal/hostile/ms13/robot/protectron/reinforced, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gFc" = ( /obj/machinery/door/unpowered/ms13/metal, /obj/effect/spawner/random/ms13/locked/random/medchance, @@ -8485,7 +8540,7 @@ /area/ms13/town) "gKO" = ( /obj/structure/ms13/skeleton, -/obj/effect/spawner/random/ms13/drugs/tier1, +/obj/effect/spawner/random/ms13/drugs/lowrandom, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) "gKQ" = ( @@ -8508,6 +8563,10 @@ /obj/structure/ms13/barrel/single/red/two, /turf/open/floor/plating/ms13/ground/snow, /area/ms13/snow/lightforest) +"gLj" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy/saw, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "gLp" = ( /obj/structure/chair/ms13/metal/broken{ dir = 4 @@ -8701,6 +8760,11 @@ /area/ms13/underground/mountain) "gPR" = ( /obj/structure/closet/crate/ms13/medical, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, +/obj/effect/spawner/random/ms13/medical/bloodbag, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "gPU" = ( @@ -8712,6 +8776,12 @@ /area/ms13/town) "gPW" = ( /obj/structure/closet/ms13/fridge, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, +/obj/effect/spawner/random/ms13/food/random, /turf/open/floor/ms13/concrete, /area/ms13/town) "gQb" = ( @@ -8950,6 +9020,11 @@ /obj/structure/bed/ms13/mattress/old, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"gXu" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/drugs/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "gXx" = ( /obj/structure/table/ms13/no_smooth/wood/low, /obj/item/ms13/fluff/ashtray, @@ -9049,7 +9124,7 @@ id = "atlas_scrapyard"; dir = 4 }, -/turf/open/floor/plating/ms13/ground/sidewalk, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "gZJ" = ( /obj/structure/table/ms13/no_smooth/cable_reel, @@ -9139,9 +9214,17 @@ /obj/effect/spawner/random/ms13/locked/random/highchance, /turf/open/floor/ms13/tile/large/white, /area/ms13/supermarket) +"hcs" = ( +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/structure/table/ms13/metal/heavy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hcT" = ( /obj/structure/table/ms13/metal/heavy, /obj/machinery/light/ms13, +/obj/effect/spawner/random/ms13/melee/highrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "hcW" = ( @@ -9539,9 +9622,6 @@ /obj/structure/table/ms13/no_smooth/large/metal/desk{ dir = 1 }, -/obj/machinery/ms13/terminal{ - dir = 1 - }, /turf/open/floor/ms13/concrete, /area/ms13/town) "hpr" = ( @@ -10089,6 +10169,13 @@ /obj/structure/ms13/trash/papers/two, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"hGh" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/machinery/light/ms13, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hGy" = ( /obj/structure/ms13/storage/store{ dir = 8 @@ -10220,6 +10307,7 @@ /obj/structure/ms13/rug/rubber{ dir = 4 }, +/obj/effect/spawner/random/ms13/tools/tool, /turf/open/floor/ms13/concrete, /area/ms13/town) "hJv" = ( @@ -11052,6 +11140,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"iho" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13/town) "ihp" = ( /obj/structure/closet/crate/ms13/woodcrate/compact, /obj/effect/spawner/random/ms13/crafting/highrandom, @@ -12035,6 +12127,7 @@ /obj/machinery/light/ms13{ dir = 4 }, +/obj/effect/spawner/random/ms13/drink/soda, /turf/open/floor/ms13/concrete, /area/ms13/town) "iJi" = ( @@ -12224,6 +12317,7 @@ "iPO" = ( /obj/structure/table/ms13/no_smooth/counter/metal, /obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/left/pre_open, +/obj/effect/spawner/random/ms13/gun/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "iQa" = ( @@ -12261,6 +12355,8 @@ "iRy" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/calendar/blank, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, /turf/open/floor/ms13/concrete, /area/ms13/town) "iRS" = ( @@ -12425,6 +12521,9 @@ /area/ms13/town) "iWu" = ( /obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/medkit, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "iWB" = ( @@ -12632,6 +12731,12 @@ /obj/effect/spawner/random/ms13/tools/hardware, /turf/open/floor/wood/ms13/carpet/green, /area/ms13/town) +"jbI" = ( +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/structure/table/ms13/metal/heavy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "jbL" = ( /obj/structure/table/ms13/no_smooth/large/wood/desk, /obj/machinery/ms13/terminal/wasteland, @@ -13378,6 +13483,9 @@ "jwr" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/sign, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/glasses, /turf/open/floor/ms13/concrete, /area/ms13/town) "jww" = ( @@ -13777,6 +13885,10 @@ /obj/structure/ms13/sign/hotel, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/snowcrest) +"jGk" = ( +/obj/structure/ms13/wall_decor/sign/mine, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "jGn" = ( /obj/structure/ms13/pot/plant, /obj/machinery/light/ms13{ @@ -14124,6 +14236,12 @@ }, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) +"jRl" = ( +/obj/effect/turf_decal/ms13/covering/paint/red, +/obj/structure/window/fulltile/ms13/glass, +/obj/structure/table/ms13/low_wall/brick/alt, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "jRt" = ( /obj/structure/table/ms13/no_smooth/counter/wood{ dir = 1 @@ -16975,6 +17093,11 @@ }, /turf/open/floor/wood/ms13/carpet/shaggy, /area/ms13/town) +"lvW" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "lwu" = ( /mob/living/basic/ms13/hostile_animal/radroach, /obj/structure/ms13/rug{ @@ -17735,6 +17858,10 @@ /obj/structure/ms13/barricade, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"lUt" = ( +/mob/living/simple_animal/hostile/ms13/robot/protectron, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "lUw" = ( /obj/structure/ms13/storage/vent, /obj/structure/closet/ms13/metal, @@ -17930,6 +18057,11 @@ }, /turf/open/floor/wood/ms13/carpet, /area/ms13/town) +"map" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/armor/highrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "maz" = ( /obj/structure/ms13/trash/cardboard{ dir = 6 @@ -18101,6 +18233,7 @@ /area/ms13/town) "mfJ" = ( /obj/structure/table/ms13/metal/small, +/obj/effect/spawner/random/ms13/crafting/refined, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) "mfV" = ( @@ -18130,6 +18263,10 @@ /obj/structure/stairs/east, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13) +"mgQ" = ( +/mob/living/basic/ms13/ghoul, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "mgW" = ( /obj/structure/table/ms13/no_smooth/counter/metal{ dir = 4 @@ -20242,6 +20379,10 @@ }, /turf/open/floor/wood/ms13/common, /area/ms13/town) +"nxc" = ( +/mob/living/basic/ms13/ghoul, +/turf/open/floor/plating/ms13/ground/snow, +/area/ms13/snow/lightforest) "nxu" = ( /obj/effect/spawner/random/ms13/tools/tool, /obj/structure/table/ms13/no_smooth/counter/metal{ @@ -20361,6 +20502,10 @@ /obj/effect/spawner/random/ms13/locked/random/lowchance, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"nBz" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "nBE" = ( /obj/machinery/door/unpowered/ms13/metal{ dir = 1 @@ -20711,6 +20856,14 @@ /obj/effect/turf_decal/ms13/covering/tiles/blue, /turf/closed/wall/ms13/metal, /area/ms13/snowcrest/building) +"nOr" = ( +/obj/structure/closet/ms13/metal, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/clothing/backpack, +/obj/effect/spawner/random/ms13/clothing/hat, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "nOx" = ( /obj/structure/ms13/trash/papers/one, /obj/machinery/light/ms13/bulb{ @@ -20990,6 +21143,12 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"oaF" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "obI" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 10 @@ -21730,6 +21889,9 @@ /obj/machinery/button/ms13{ id = "atlas_scrapyard" }, +/obj/structure/railing/ms13/solo/industrial{ + dir = 4 + }, /turf/open/floor/ms13/concrete, /area/ms13/town) "ozW" = ( @@ -22320,6 +22482,8 @@ "paH" = ( /obj/structure/closet/ms13/metal, /obj/structure/ms13/wall_decor/clock, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/shoe, /turf/open/floor/ms13/concrete, /area/ms13/town) "paK" = ( @@ -22359,7 +22523,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/right{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "pdE" = ( /turf/closed/wall/ms13/sewer, @@ -23063,6 +23227,10 @@ }, /turf/open/floor/plating/ms13/ground/road, /area/ms13) +"pQr" = ( +/mob/living/basic/ms13/ghoul/frozen, +/turf/open/floor/plating/ms13/ground/snow, +/area/ms13/snow/forest) "pQz" = ( /obj/structure/closet/ms13/wall/firstaid, /obj/effect/spawner/random/ms13/medical/lowrandom, @@ -23388,6 +23556,10 @@ /obj/structure/railing/ms13/sewer, /turf/open/floor/plating/ms13/ground/snow, /area/ms13/army_base) +"qht" = ( +/obj/effect/spawner/random/ms13/minefield, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "qhA" = ( /obj/machinery/light/ms13, /obj/structure/ms13/trash/papers/two{ @@ -24490,7 +24662,7 @@ /obj/machinery/door/poddoor/shutters/ms13/horizontal/red/mid{ id = "atlas_scrapyard" }, -/turf/open/floor/ms13/concrete, +/turf/open/floor/plating/ms13/ground/road, /area/ms13/town) "rhh" = ( /obj/structure/closet/ms13/fridge, @@ -25317,6 +25489,11 @@ }, /turf/open/floor/ms13/tile/large/cafeteria, /area/ms13/supermarket) +"rWm" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/clothing/glasses, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "rWy" = ( /obj/machinery/power/ms13/streetlamp/double, /turf/open/floor/plating/ms13/ground/sidewalk, @@ -26537,6 +26714,10 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/tribal_abandoned) +"tdT" = ( +/obj/effect/turf_decal/ms13/graffiti/mines, +/turf/open/floor/plating/ms13/ground/road, +/area/ms13) "tek" = ( /obj/structure/table/ms13/wood/bar, /obj/structure/ms13/trash/glass/plate, @@ -28304,6 +28485,10 @@ }, /turf/open/floor/ms13/tile/large/white, /area/ms13/town) +"uIw" = ( +/mob/living/simple_animal/hostile/ms13/robot/handy, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "uIE" = ( /obj/machinery/light/ms13/bulb{ dir = 8 @@ -28768,6 +28953,10 @@ }, /turf/open/floor/wood/ms13/carpet/shaggy, /area/ms13/town) +"vjP" = ( +/obj/structure/ms13/pot/plant, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "vkj" = ( /obj/effect/turf_decal/ms13/graffiti/no_way, /turf/closed/wall/ms13/brick, @@ -28852,6 +29041,7 @@ /area/ms13/town) "vmW" = ( /obj/structure/noticeboard/ms13/cork, +/obj/effect/turf_decal/ms13/graffiti/gohome, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/town) "vnR" = ( @@ -30011,6 +30201,10 @@ /obj/structure/stairs/north, /turf/open/floor/wood/ms13/common, /area/ms13/snowcrest/building) +"wpU" = ( +/obj/effect/turf_decal/ms13/graffiti/fuckyou, +/turf/open/floor/plating/ms13/ground/sidewalk, +/area/ms13) "wqa" = ( /obj/structure/ms13/trash/papers/one, /obj/structure/ms13/pipes/piped, @@ -30288,6 +30482,10 @@ /obj/effect/landmark/start/ms13/bodyguard, /turf/open/floor/wood/ms13/wide, /area/ms13/snowcrest/building) +"wET" = ( +/obj/structure/table/ms13/no_smooth/cable_reel, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "wEU" = ( /obj/structure/closet/ms13/fridge, /obj/effect/spawner/random/ms13/food/produce_random, @@ -30660,6 +30858,11 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"wXL" = ( +/obj/structure/table/ms13/metal/alt, +/obj/effect/spawner/random/ms13/drink/alcohol_beer, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "wYs" = ( /obj/structure/ms13/storage/vent, /obj/structure/table/ms13/no_smooth/counter/wood{ @@ -30839,6 +31042,11 @@ /obj/structure/ms13/lamp/makeshift, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) +"xjp" = ( +/obj/structure/table/ms13/metal/heavy, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "xjs" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 5; @@ -30890,6 +31098,13 @@ }, /turf/open/floor/wood/ms13/wide, /area/ms13/tribal_abandoned) +"xlm" = ( +/obj/structure/ms13/rug/rubber{ + dir = 4 + }, +/obj/effect/spawner/random/ms13/medical/dbag, +/turf/open/floor/ms13/tile/long/blue, +/area/ms13/town) "xlv" = ( /turf/closed/wall/ms13/scrap/red, /area/ms13/town) @@ -74377,7 +74592,7 @@ gVh dFG gJY cbe -kyI +jbI jIO jIO jIO @@ -74387,9 +74602,9 @@ lcg aka hQo opv -cKc -cKc -cKc +adv +gsr +adv uGJ lcg mIJ @@ -74604,14 +74819,14 @@ nwj cbe cbe cbe -cKc +aRP lcg gVx cbe iVF iVF lcg -ffe +eqc jbg cbe cbe @@ -74623,7 +74838,7 @@ cbe cbe uOV gyS -cKc +xjp jIO wtg wtg @@ -74831,7 +75046,7 @@ ahM dFG cbe cbe -hcT +hGh lcg yhP cbe @@ -74841,13 +75056,13 @@ lcg cVC jbg cbe -cbe +gEW cbe cbe cbe bjp cbe -cKc +gsr hJk cbe hcT @@ -75058,7 +75273,7 @@ iSV cbe cbe cbe -kyI +hcs lcg iLu cbe @@ -75067,7 +75282,7 @@ jwl lcg ffe jbg -cbe +amM cbe cbe cbe @@ -75077,7 +75292,7 @@ nwj cbe cbe cbe -cKc +map jIO wtg wtg @@ -75505,15 +75720,15 @@ xZD ylG jaz jIO -cbe +wET qdD cbe cbe cbe cbe qdD -cbe -cbe +cKc +cKc cbe cbe qdD @@ -75745,7 +75960,7 @@ cbe cbe cbe cbe -lcg +jRl gGL aef cbe @@ -75955,10 +76170,12 @@ xZD ykT ykT ykT -xZD +ykT gZA -sUu +mBi gzm +mBi +oaF cbe cbe cbe @@ -75970,9 +76187,7 @@ cbe cbe cbe cbe -cbe -cbe -rcK +jIO iIE gKk cbe @@ -76179,19 +76394,22 @@ khQ ylG ylG xZD +mgQ ykT ykT ykT -xZD -sUu -sUu +mBi +mBi rhc +mBi +oaF cbe cbe cbe cbe cbe cbe +bMW cbe cbe cbe @@ -76199,9 +76417,6 @@ cbe cbe cbe cbe -rcK -cbe -cbe cbe cbe cbe @@ -76409,10 +76624,12 @@ xZD ykT ykT ykT -xZD -sUu -sUu +ykT +mBi +mBi pdx +mBi +oaF cbe cbe cbe @@ -76426,8 +76643,6 @@ cbe cbe cbe cbe -lcg -doQ cbe gUr jdw @@ -76640,10 +76855,10 @@ xZD jIO jIO jIO +gBK cbe cbe -cbe -cbe +bMW cbe cbe cbe @@ -76654,7 +76869,7 @@ cbe cbe cbe jIO -lcg +jIO gzp jIO jWv @@ -76665,7 +76880,7 @@ oNR gvU cbe cbe -cbe +lUt wTi wTi heb @@ -76879,11 +77094,11 @@ cbe cbe cbe cbe -cbe +qqt jIO -sUu -sUu -sUu +xZD +xZD +xZD jWv iOT vJo @@ -77102,15 +77317,15 @@ cbe cbe cbe cbe -cbe +uIw cbe cbe cbe cbe jIO -sUu -sUu -sUu +xZD +xZD +xZD jWv qNx nLd @@ -77333,11 +77548,11 @@ cbe cbe cbe cbe -cbe +adv jIO -sUu -sUu -sUu +xZD +xZD +xZD jIO jIO jIO @@ -77548,7 +77763,7 @@ ylG fvK ylG jIO -pDz +bqH pDz pDz hmi @@ -77560,7 +77775,7 @@ cbe cbe cbe cbe -cbe +cKc jIO xZD xZD @@ -77571,7 +77786,7 @@ xZD xZD xZD xZD -xZD +qht xZD xZD xZD @@ -77780,14 +77995,14 @@ iZV pDz gOx cbe -cbe +cDn bcE cbe cbe cbe cbe -bcE -cbe +doQ +cKc jIO xZD xZD @@ -77795,7 +78010,7 @@ xZD xZD xZD xZD -xZD +qht xZD xZD xZD @@ -78028,7 +78243,7 @@ ykT ykT ykT ykT -ykT +nBz ykT ykT ykT @@ -78246,7 +78461,7 @@ syJ xZD giV ykT -ykT +nBz ykT ykT ykT @@ -78256,7 +78471,7 @@ ykT ykT lzM ykT -ykT +tdT ykT ykT tXh @@ -78458,7 +78673,7 @@ xsE ylG ylG rcK -hLt +aXi los iZk gVu @@ -78468,7 +78683,7 @@ cbe cbe rcK sUu -sUu +iho sUu xZD xZD @@ -78685,7 +78900,7 @@ xsE xsE ylG rcK -jwr +nOr iZk iZk qUg @@ -78907,7 +79122,7 @@ ylG ylG xsE xsE -xsE +pQr xsE xsE ylG @@ -79157,7 +79372,7 @@ ykT iWC nYi ykT -ykT +nBz ykT ykT ykT @@ -79391,7 +79606,7 @@ xBj xZD ydI cbe -cbe +lUt cbe rcK giV @@ -79593,7 +79808,7 @@ xsE ylG ylG rcK -paH +aXi gSB iZk cbe @@ -79619,7 +79834,7 @@ xZD jIO cbe cbe -kyI +vjP rcK xZD ykT @@ -79818,7 +80033,7 @@ ylG xsE ylG ylG -ylG +mSh lcg cbe kyI @@ -79833,7 +80048,7 @@ sUu sUu xom xZD -xZD +qht ykT ykT nYi @@ -79848,7 +80063,7 @@ jIO jIO jIO jIO -xZD +jGk ykT ykT rew @@ -80072,10 +80287,10 @@ xBj xZD xZD xZD +qht xZD xZD -xZD -xZD +wpU ykT ykT rew @@ -80278,7 +80493,7 @@ jch iOt jch shw -xgp +eRe cbe qdD cbe @@ -80500,12 +80715,12 @@ ylG haK rcK hxx -gTQ +xlm +aLq aLq aLq aLq aLq -eRe cbe cbe cbe @@ -80516,7 +80731,7 @@ jIO xZD giV ykT -ykT +nBz ykT ykT ykT @@ -80728,11 +80943,11 @@ ylG rcK jgh gTQ +gLj aLq aLq aLq aLq -dBy cbe cbe cbe @@ -80751,7 +80966,7 @@ ykT ykT ykT ykT -ykT +nBz ykT ykT ykT @@ -81183,16 +81398,16 @@ txT gPR gHf aLq -iWu -iWu +jDc +lvW iWu xgp cbe cbe iSg gJY -cKc -cKc +rWm +evy jIO xZD xZD @@ -81200,7 +81415,7 @@ xZD ykT ykT ykT -xZD +qht xZD jIO jIO @@ -81634,7 +81849,7 @@ ylG xsE xsE txT -hLt +gXu dFG gyS xlv @@ -81879,7 +82094,7 @@ xZD xZD xZD ykT -ykT +nBz ykT xZD xZD @@ -82104,7 +82319,7 @@ gOW jIO xZD xZD -xZD +qht ykT ykT ykT @@ -82560,8 +82775,8 @@ ykT ykT ykT ykT -ykT -ykT +mgQ +nBz xZD xZD jIO @@ -82757,7 +82972,7 @@ khQ khQ khQ khQ -ylG +nxc ylG ylG ylG @@ -82780,7 +82995,7 @@ gXX cbe cbe rNG -adF +fuC gVu gHE ykT @@ -83460,7 +83675,7 @@ xlv eUC fPb gQb -adF +wXL eYo adF jIO @@ -83901,7 +84116,7 @@ khQ khQ khQ ylG -ylG +nxc iBp khQ khQ diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm index bfb4f756f3e..62e556bb559 100644 --- a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm +++ b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm @@ -542,6 +542,9 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/drugs/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, +/obj/effect/spawner/random/ms13/medical/lowrandom, /turf/open/floor/ms13/tile/long/blue, /area/ms13/town) "adH" = ( @@ -823,6 +826,7 @@ dir = 1 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "afz" = ( @@ -3383,6 +3387,7 @@ /obj/structure/table/ms13/metal/small, /obj/structure/noticeboard/ms13/cork, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/medical/medkit, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) "awM" = ( @@ -4648,6 +4653,7 @@ /obj/structure/table/ms13/metal/grate, /obj/machinery/light/ms13, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/tools/radio, /turf/open/floor/ms13/concrete, /area/ms13/town) "aGd" = ( @@ -7199,6 +7205,10 @@ "aXK" = ( /obj/structure/closet/crate/ms13/woodcrate/compact/army, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, +/obj/effect/spawner/random/ms13/gun/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "aXN" = ( @@ -9346,6 +9356,11 @@ "dRT" = ( /obj/structure/closet/ms13/metal, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/clothing/under, +/obj/effect/spawner/random/ms13/clothing/hat, +/obj/effect/spawner/random/ms13/clothing/shoe, +/obj/effect/spawner/random/ms13/smokeable/general, +/obj/effect/spawner/random/ms13/smokeable/general, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) "dRZ" = ( @@ -9650,11 +9665,9 @@ /turf/open/floor/wood/ms13/carpet, /area/ms13/town) "erL" = ( -/obj/structure/closet/crate/ms13/woodcrate, -/obj/machinery/light/ms13{ - dir = 4 - }, +/obj/structure/table/ms13/metal/grate, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/currency/mammoth/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "erT" = ( @@ -10740,6 +10753,7 @@ /obj/structure/table/ms13/metal/grate, /obj/structure/ms13/storage/vent, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/power_armor/parts, /turf/open/floor/ms13/concrete/small, /area/ms13/town) "fLF" = ( @@ -10996,6 +11010,8 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/obj/effect/spawner/random/ms13/crafting/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "gev" = ( @@ -11775,6 +11791,11 @@ /obj/structure/table/ms13/crafting/workbench, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"hno" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete/industrial/walkway, +/area/ms13/town) "hnp" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/ms13/trash/papers{ @@ -11877,8 +11898,8 @@ /turf/open/floor/wood/ms13/wide, /area/ms13) "hwG" = ( -/obj/structure/closet/crate/ms13/woodcrate/compact, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/mob/living/simple_animal/hostile/ms13/robot/protectron, /turf/open/floor/ms13/concrete, /area/ms13/town) "hwT" = ( @@ -12216,6 +12237,12 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) +"hXs" = ( +/obj/structure/table/ms13/metal/grate, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/refined, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "hXV" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/table/rolling/ms13, @@ -12533,6 +12560,7 @@ }, /obj/structure/table/ms13/no_smooth/metal, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/tools/lights, /turf/open/floor/ms13/concrete, /area/ms13/town) "iwv" = ( @@ -12575,6 +12603,11 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"iyQ" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/mob/living/simple_animal/hostile/ms13/robot/protectron/builder, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "iAx" = ( /obj/structure/table/ms13/wood/constructed, /obj/effect/spawner/random/ms13/tools/farming, @@ -13001,6 +13034,7 @@ }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/closet/crate/ms13/woodcrate, +/obj/effect/spawner/random/ms13/gun/military, /turf/open/floor/ms13/concrete, /area/ms13/town) "jav" = ( @@ -14720,9 +14754,9 @@ /obj/structure/railing/ms13/solo/industrial{ dir = 4 }, -/obj/structure/closet/crate/ms13/woodcrate, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/structure/lattice/catwalk/ms13, +/obj/effect/spawner/random/ms13/clothing/backpack/high, /turf/open/openspace/ms13, /area/ms13/town) "lbX" = ( @@ -16894,6 +16928,14 @@ }, /turf/open/floor/wood/ms13/mosaic, /area/ms13/town) +"nTL" = ( +/obj/structure/ms13/storage/vent, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/metal/grate/border{ + dir = 1 + }, +/area/ms13/town) "nVn" = ( /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /obj/effect/spawner/random/ms13/tools/hardware, @@ -17184,7 +17226,6 @@ /turf/open/floor/wood/ms13/common, /area/ms13/town) "orU" = ( -/obj/structure/closet/crate/ms13/woodcrate/compact/army, /obj/structure/ms13/pipes/horizontal/box, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, /turf/open/floor/ms13/concrete, @@ -17426,6 +17467,7 @@ /obj/machinery/light/ms13{ dir = 8 }, +/obj/effect/spawner/random/ms13/ammo/lowrandom, /turf/open/floor/plating/ms13/ground/sidewalk, /area/ms13/town) "oGu" = ( @@ -17951,6 +17993,7 @@ }, /obj/machinery/light/ms13, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/smokeable/lowrandom, /turf/open/floor/wood/ms13/carpet/blue, /area/ms13/town) "pqr" = ( @@ -19383,6 +19426,9 @@ dir = 1 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/obj/effect/spawner/random/ms13/armor/lowrandom, +/obj/effect/spawner/random/ms13/armor/lowrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "rum" = ( @@ -20257,6 +20303,11 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain, /turf/open/floor/plating/ms13/ground/mountain, /area/ms13/underground/mountain) +"sBv" = ( +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "sCj" = ( /obj/effect/decal/cleanable/blood/old{ pixel_x = -5; @@ -20437,6 +20488,12 @@ /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/mountain, /turf/open/floor/wood/ms13/wide, /area/ms13/town) +"sPI" = ( +/obj/structure/table/ms13/metal/grate, +/obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/ammo/lowrandom, +/turf/open/floor/ms13/concrete, +/area/ms13/town) "sQo" = ( /obj/machinery/light/ms13/bulb{ dir = 4 @@ -20658,6 +20715,9 @@ "tgM" = ( /obj/structure/table/ms13/metal/small, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/highrandom, +/obj/effect/spawner/random/ms13/crafting/electrical, +/obj/effect/spawner/random/ms13/crafting/electrical, /turf/open/floor/ms13/concrete/industrial, /area/ms13/town) "tiv" = ( @@ -21304,6 +21364,7 @@ dir = 4 }, /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood, +/obj/effect/spawner/random/ms13/crafting/highrandom, /turf/open/floor/ms13/concrete, /area/ms13/town) "tYI" = ( @@ -67056,7 +67117,7 @@ kES ohc oXt oXt -ami +erL ujL aHe aHe @@ -68205,7 +68266,7 @@ ave aCj awg awn -awn +hwG awn nzT awn @@ -70689,7 +70750,7 @@ alR oXt oXt oXt -ami +hXs awR abJ abJ @@ -70916,7 +70977,7 @@ awn oXt oXt oXt -ami +hXs awR abJ abJ @@ -71591,7 +71652,7 @@ aLH aCj amj aPy -hwG +awn aCj aCj aCj @@ -71826,7 +71887,7 @@ ujL rQB awn alI -ami +sPI oEO lqZ aCj @@ -72278,7 +72339,7 @@ aCj aCj ujL gsG -awn +hwG awn aol awn @@ -73416,7 +73477,7 @@ awn awn awn awn -awn +iyQ atJ awR aLH @@ -73633,7 +73694,7 @@ aLH aLH aCj awn -erL +aRV aAz adI awn @@ -73867,7 +73928,7 @@ kEZ awn aHZ uAK -tET +hno awm aWW hOH @@ -74318,7 +74379,7 @@ akw awn hkJ awn -awn +iyQ aKG esO tET @@ -74772,7 +74833,7 @@ agA gVh adC oGX -awn +sBv awn awn aRV @@ -75698,7 +75759,7 @@ apv apv apv aCj -uKv +nTL swi lib svX diff --git a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm index b0a0a129662..e8dfc7bf195 100644 --- a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm +++ b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm @@ -49,7 +49,7 @@ // department_experience_type = EXP_TYPE_RANGERS // department_full_name = "Desert Rangers" - +/*// There. I made it easy for you to un-fix the server. Just remove the commenting out. /datum/job_department/bos department_name = DEPARTMENT_BOS department_bitflags = DEPARTMENT_BITFLAG_BOS @@ -59,6 +59,7 @@ //display_order = 0 //label_class = "BOS" //latejoin_color = "#ffddf0" +*/ /datum/job_department/raiders department_name = DEPARTMENT_RAIDERS diff --git a/mojave/code/modules/jobs/job_types/bos/_bos.dm b/mojave/code/modules/jobs/job_types/bos/_bos.dm index 8065256194a..d6530923ffa 100644 --- a/mojave/code/modules/jobs/job_types/bos/_bos.dm +++ b/mojave/code/modules/jobs/job_types/bos/_bos.dm @@ -1,4 +1,4 @@ -/datum/job/ms13/bos +/datum/job/ms13/bos // File is unticked. Tick it to re-enable a major reason why Fallout servers are mid lol. selection_color = "#737592" departments_list = list( /datum/job_department/bos, diff --git a/mojave/code/modules/jobs/job_types/bos/head_paladin.dm b/mojave/code/modules/jobs/job_types/bos/head_paladin.dm index b84a44476a7..bea786ba389 100644 --- a/mojave/code/modules/jobs/job_types/bos/head_paladin.dm +++ b/mojave/code/modules/jobs/job_types/bos/head_paladin.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/head_paladin title = "BoS Head Paladin" department_head = list("Brotherhood High Command") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Elder (if present) and Brotherhood High Command" req_admin_notify = 1 description = "Give orders to your Paladin and ensure the Knights are working properly in the region. Work with the Head Scribe to coordinate efforts for the Brotherhood's mission in the region. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/head_scribe.dm b/mojave/code/modules/jobs/job_types/bos/head_scribe.dm index 76c91ed6687..555c3bb0471 100644 --- a/mojave/code/modules/jobs/job_types/bos/head_scribe.dm +++ b/mojave/code/modules/jobs/job_types/bos/head_scribe.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/head_scribe title = "BoS Head Scribe" department_head = list("Brotherhood High Command") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Elder (if present) and Brotherhood High Command" req_admin_notify = 1 description = "Lead and organize your team of scribes. Ensure that the technology and overall workings of the bunker are in order. Provide medical assistance to Brotherhood operations as needed. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/initiate.dm b/mojave/code/modules/jobs/job_types/bos/initiate.dm index c84e5d6f843..107af0375da 100644 --- a/mojave/code/modules/jobs/job_types/bos/initiate.dm +++ b/mojave/code/modules/jobs/job_types/bos/initiate.dm @@ -1,7 +1,7 @@ /datum/job/ms13/bos/initiate title = "BoS Initiate" - total_positions = 3 - spawn_positions = 3 + total_positions = 0 + spawn_positions = 0 supervisors = "Knights, Scribes, and above" description = "You are an inexperienced Brotherhood recruit. Learn what it means to be a member of the Brotherhood and execute orders given to you by anyone that is not a fellow Initiate. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/knight.dm b/mojave/code/modules/jobs/job_types/bos/knight.dm index 280f16091ff..61d71cfd61a 100644 --- a/mojave/code/modules/jobs/job_types/bos/knight.dm +++ b/mojave/code/modules/jobs/job_types/bos/knight.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/knight title = "BoS Knight" department_head = list("Head Paladin") - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "The Paladin and Head Paladin" description = "Follow the orders of your superiors and ensure weaponized technology in the wastes is kept contained and in check. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/paladin.dm b/mojave/code/modules/jobs/job_types/bos/paladin.dm index 467526d9924..dc1cc81d70d 100644 --- a/mojave/code/modules/jobs/job_types/bos/paladin.dm +++ b/mojave/code/modules/jobs/job_types/bos/paladin.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/paladin title = "BoS Paladin" department_head = list("Head Paladin") - total_positions = 1 - spawn_positions = 1 + total_positions = 0 + spawn_positions = 0 supervisors = "The Head Paladin" req_admin_notify = 1 description = "Lead and coordinate the Knights while following and relaying the orders of the Head Paladin. Cooperate with the Scribes to ensure smooth operations in the region and the safety of your bunker. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/job_types/bos/scribe.dm b/mojave/code/modules/jobs/job_types/bos/scribe.dm index 906b83bda4f..9ffa3e384b1 100644 --- a/mojave/code/modules/jobs/job_types/bos/scribe.dm +++ b/mojave/code/modules/jobs/job_types/bos/scribe.dm @@ -1,8 +1,8 @@ /datum/job/ms13/bos/scribe title = "BoS Scribe" department_head = list("Head Scribe") - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "The Head Scribe" description = "Ensure the bunker is up to standards, ensure everyone is in good health, and ensure the technology of the Brotherhood is well maintained. Obey orders from the Head Scribe. You're currently at edge with the NCR, though not at war, yet." diff --git a/mojave/code/modules/jobs/jobs.dm b/mojave/code/modules/jobs/jobs.dm index 21032ff1be5..25d58536813 100644 --- a/mojave/code/modules/jobs/jobs.dm +++ b/mojave/code/modules/jobs/jobs.dm @@ -27,13 +27,15 @@ GLOBAL_LIST_INIT(ncr_positions, list( "NCR Staff Sergeant", "NCR Lieutenant")) +/* // There. I made it easy for you to un-fix the server. Just remove the commenting out. GLOBAL_LIST_INIT(bos_positions, list( "BoS Initiate", "BoS Knight", "BoS Paladin", "BoS Head Paladin", "BoS Scribe", - "BoS Head Scribe")) + "BoS Head Scribe")) +*/ GLOBAL_LIST_INIT(raiders_positions, list( "Raider", @@ -101,7 +103,7 @@ GLOBAL_LIST_INIT(ms13_position_categories, list( EXP_TYPE_WASTELAND = list("jobs" = wasteland_positions, "color" = "#eec66f"), EXP_TYPE_TOWN= list("jobs" = town_positions, "color" = "#4feb64"), EXP_TYPE_NCR = list("jobs" = ncr_positions, "color" = "#cfd1ba"), - EXP_TYPE_BOS = list("jobs" = bos_positions, "color" = "#737592"), + //EXP_TYPE_BOS = list("jobs" = bos_positions, "color" = "#737592"), EXP_TYPE_RAIDERS = list("jobs" = raiders_positions, "color" = "#30389c"), EXP_TYPE_RANGERS = list("jobs" = ranger_positions, "color" = "#bdbc76"), EXP_TYPE_DROUGHTTOWN = list("jobs" = drought_town_positions, "color" = "#12491a"), @@ -114,7 +116,7 @@ GLOBAL_LIST_INIT(ms13_exp_jobsmap, list( EXP_TYPE_WASTELAND = list("titles" = wasteland_positions), EXP_TYPE_TOWN = list("titles" = town_positions), EXP_TYPE_NCR = list("titles" = ncr_positions), - EXP_TYPE_BOS = list("titles" = bos_positions), + //EXP_TYPE_BOS = list("titles" = bos_positions), EXP_TYPE_RAIDERS = list("titles" = raiders_positions), EXP_TYPE_RANGERS = list("titles" = ranger_positions), EXP_TYPE_DROUGHTTOWN = list("titles" = drought_town_positions), diff --git a/tgstation.dme b/tgstation.dme index 926a46d5dbd..d292277bdc6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4440,7 +4440,6 @@ #include "mojave\code\modules\jobs\departments\mojave\jobs\departments\departments.dm" #include "mojave\code\modules\jobs\job_types\_job.dm" #include "mojave\code\modules\jobs\job_types\ms13.dm" -#include "mojave\code\modules\jobs\job_types\bos\_bos.dm" #include "mojave\code\modules\jobs\job_types\bos\head_paladin.dm" #include "mojave\code\modules\jobs\job_types\bos\head_scribe.dm" #include "mojave\code\modules\jobs\job_types\bos\initiate.dm"