From 87438fbb49199341cb185366e111357b007c0a87 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 25 Jun 2025 13:54:40 +0200 Subject: [PATCH] mapping tweaks, lawbooks fix - replaced old space law books with gato law books in centcomm - replaced old space law book family heirlooms for security roles with gato law book - small cosmetic changes for snaxi - renamed a xenoarch teleporter on box to make it more apparent where it leads --- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- _maps/map_files/Snaxi/Snaxi.dmm | 461 ++++++++++++------ _maps/map_files/generic/CentCom.dmm | 64 ++- .../jobs/job_types/head_of_security.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- 6 files changed, 362 insertions(+), 171 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 195484a931..34abcb800d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3354,7 +3354,7 @@ "bnJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/cafeteria,/area/service/kitchen) "bnK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/start/cook,/turf/open/floor/plasteel/cafeteria,/area/service/kitchen) "bnL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/light,/obj/machinery/light_switch{pixel_y = -25},/turf/open/floor/plasteel/cafeteria,/area/service/kitchen) -"bnM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch"); pixel_y = 7},/obj/effect/turf_decal/stripes/box,/obj/structure/sign/warning/xeno_mining{pixel_y = 32},/turf/open/floor/plasteel,/area/hallway/primary/starboard) +"bnM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch"); pixel_y = 7; name = "TO XENOARCH"},/obj/effect/turf_decal/stripes/box,/obj/structure/sign/warning/xeno_mining{pixel_y = 32; name = "TO XENOARCH"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bnN" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/airalarm{pixel_y = 25},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bnO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/event_spawn,/turf/open/floor/plasteel,/area/hallway/secondary/exit) "bnP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/hallway/secondary/exit) diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 8869b4a006..a4c157b869 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -65,6 +65,7 @@ dir = 2; name = "Cargo ORM" }, +/obj/machinery/poweredfans, /turf/open/floor/plasteel, /area/cargo/miningdock) "abF" = ( @@ -85,6 +86,16 @@ /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "abR" = ( @@ -2542,6 +2553,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "bds" = ( @@ -2712,9 +2725,6 @@ /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) "bgM" = ( -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, @@ -3102,6 +3112,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "bsU" = ( @@ -4263,15 +4281,17 @@ /turf/open/floor/engine/o2, /area/engineering/atmos) "bTU" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/computer/arcade/orion_trail{ dir = 8 }, /obj/structure/sign/poster/official/nanomichi_ad{ pixel_x = 32 }, +/obj/machinery/light{ + dir = 4; + light_color = "#ffa570"; + color = "#ffa570" + }, /turf/open/floor/wood, /area/service/bar) "bUd" = ( @@ -4576,7 +4596,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/ai_monitored/command/nuke_storage) "bZQ" = ( /obj/effect/landmark/start/scientist, @@ -5203,6 +5223,9 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/red, /area/commons/dorms) "cjL" = ( @@ -5558,6 +5581,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "cri" = ( @@ -5744,18 +5775,12 @@ /turf/open/floor/plasteel/solarpanel, /area/solars/port/aft) "cxk" = ( -/obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/loading_area{ dir = 4; icon_state = "drain"; name = "drain" }, -/obj/effect/turf_decal/loading_area{ - dir = 8; - icon_state = "drain"; - name = "drain" - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/service/hydroponics) "cxw" = ( /obj/machinery/door/airlock/medical/glass{ @@ -5852,10 +5877,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/vault, -/obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/stairs, /area/ai_monitored/command/nuke_storage) "czv" = ( /obj/structure/cable{ @@ -6478,7 +6501,8 @@ }, /obj/machinery/door/poddoor{ id = "trash"; - name = "disposal bay door" + name = "disposal bay door"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -8658,6 +8682,11 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/science/robotics/mechbay) +"dIx" = ( +/obj/structure/table/wood/poker, +/obj/item/book/lorebooks/welcome_to_gato, +/turf/open/floor/wood, +/area/hallway/primary/port) "dIV" = ( /obj/structure/chair/sofa/corp/corner, /turf/open/floor/glass/reinforced, @@ -11523,6 +11552,13 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"eUd" = ( +/obj/structure/chair/beanbag/green, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "eUw" = ( /obj/structure/cable{ icon_state = "0-8" @@ -13395,7 +13431,7 @@ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/ai_monitored/command/nuke_storage) "fMc" = ( /obj/structure/cable{ @@ -13689,9 +13725,6 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "fRZ" = ( -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, @@ -14006,7 +14039,7 @@ /area/hallway/secondary/exit/departure_lounge) "fYr" = ( /obj/machinery/computer/bank_machine, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/ai_monitored/command/nuke_storage) "fYw" = ( /obj/effect/spawner/structure/window/reinforced, @@ -14155,9 +14188,6 @@ /area/engineering/main) "gbv" = ( /obj/structure/dresser, -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, @@ -14488,7 +14518,11 @@ /turf/open/floor/plating, /area/security/detectives_office) "gib" = ( -/obj/machinery/light, +/obj/machinery/light{ + dir = 2; + light_color = "#ffa570"; + color = "#ffa570" + }, /turf/open/floor/wood, /area/service/bar) "gil" = ( @@ -15915,9 +15949,6 @@ /turf/open/floor/plasteel/dark, /area/service/hydroponics) "gNg" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/door/window/brigdoor{ dir = 4; name = "Kitchen"; @@ -15930,6 +15961,11 @@ /obj/structure/noticeboard{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 1; + light_color = "#ffa570"; + color = "#ffa570" + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "gNh" = ( @@ -18126,7 +18162,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_trim" + }, /area/ai_monitored/command/nuke_storage) "hPj" = ( /mob/living/carbon/monkey, @@ -18395,6 +18434,14 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "hUA" = ( @@ -18544,12 +18591,14 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/light{ - dir = 8 - }, /obj/structure/chair/sofa/right{ dir = 4 }, +/obj/machinery/light{ + dir = 8; + light_color = "#ffa570"; + color = "#ffa570" + }, /turf/open/floor/carpet, /area/service/bar) "hWX" = ( @@ -19170,6 +19219,11 @@ /area/maintenance/aft/secondary) "imB" = ( /obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "imE" = ( @@ -20597,6 +20651,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "iSH" = ( @@ -21193,7 +21252,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/ai_monitored/command/nuke_storage) "jjc" = ( /obj/machinery/firealarm{ @@ -21321,6 +21383,11 @@ dir = 4; pixel_x = -24 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "jkU" = ( @@ -21636,6 +21703,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "jrp" = ( @@ -25129,6 +25204,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/red, /area/commons/dorms) "kOO" = ( @@ -25714,6 +25792,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ldG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, +/area/service/hydroponics) "ldJ" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -25957,10 +26050,8 @@ }, /area/cargo/storage) "ljt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/commons/dorms) +/turf/closed/wall/r_wall, +/area/mine/eva) "ljw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26671,7 +26762,10 @@ /obj/item/radio/intercom{ pixel_x = -25 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, /area/ai_monitored/command/nuke_storage) "lxL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -26903,6 +26997,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 9 }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/wood, /area/commons/dorms) "lDe" = ( @@ -29424,6 +29522,9 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "mIc" = ( @@ -30224,6 +30325,7 @@ req_access_txt = "48"; dir = 4 }, +/obj/machinery/poweredfans, /turf/open/floor/plasteel, /area/cargo/miningdock) "mYV" = ( @@ -32249,7 +32351,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/ai_monitored/command/nuke_storage) "nRm" = ( /turf/open/floor/plasteel/white/corner{ @@ -32778,9 +32880,6 @@ /area/service/chapel/office) "ocM" = ( /obj/structure/dresser, -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, @@ -33246,6 +33345,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"onV" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/plating, +/area/engineering/storage) "oog" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -33454,11 +33557,12 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "otH" = ( +/obj/structure/bookcase/random, /obj/machinery/light{ dir = 1; - pixel_y = 12 + light_color = "#ffa570"; + color = "#ffa570" }, -/obj/structure/bookcase/random, /turf/open/floor/wood, /area/commons/dorms) "otI" = ( @@ -33823,13 +33927,11 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "oDy" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/light, -/turf/closed/wall, -/area/commons/dorms) +/turf/open/floor/plating, +/area/engineering/storage) "oDL" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" @@ -35013,12 +35115,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "pku" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engineering/storage) +/turf/closed/wall/r_wall, +/area/mine/lobby) "pkz" = ( /obj/structure/cable{ icon_state = "1-8" @@ -37286,6 +37384,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/holopad, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "qmi" = ( @@ -38066,6 +38174,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"qEf" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plating, +/area/engineering/storage) "qEi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38141,7 +38253,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/mine/lobby) "qFt" = ( /obj/structure/table/wood, @@ -40721,9 +40833,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "rMJ" = ( -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, @@ -40826,17 +40935,9 @@ /area/command/teleporter) "rPc" = ( /obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/loading_area{ - dir = 8; - icon_state = "drain"; - name = "drain" +/turf/open/floor/plasteel{ + icon_state = "floor_whole" }, -/obj/effect/turf_decal/loading_area{ - dir = 4; - icon_state = "drain"; - name = "drain" - }, -/turf/open/floor/plasteel/dark, /area/service/hydroponics) "rQg" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -42510,6 +42611,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "sBg" = ( @@ -45016,7 +45125,9 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel{ + icon_state = "floor_trim" + }, /area/ai_monitored/command/nuke_storage) "tEf" = ( /obj/structure/cable{ @@ -45617,6 +45728,15 @@ }, /turf/open/floor/wood, /area/hallway/primary/port) +"tRH" = ( +/obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, +/area/service/hydroponics) "tRK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46450,7 +46570,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "ukX" = ( -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel{ + icon_state = "floor_whole" + }, /area/ai_monitored/command/nuke_storage) "ulg" = ( /obj/structure/table/reinforced, @@ -46504,6 +46626,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "ulF" = ( @@ -48961,6 +49091,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "vlf" = ( @@ -49998,9 +50131,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/power/apc{ areastring = "/area/service/bar"; dir = 1; @@ -50016,6 +50146,11 @@ dir = 8; name = "west facing firelock" }, +/obj/machinery/light{ + dir = 1; + light_color = "#ffa570"; + color = "#ffa570" + }, /turf/open/floor/plasteel/grimy, /area/service/bar) "vHZ" = ( @@ -50909,6 +51044,13 @@ /obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"wcR" = ( +/obj/structure/rack/shelf, +/obj/item/soap/nanotrasen, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/turf/open/floor/plating, +/area/maintenance/disposal) "wcU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair/pew/left{ @@ -52713,6 +52855,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "wQu" = ( @@ -53355,6 +53500,9 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "xhR" = ( @@ -53611,6 +53759,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/security/courtroom) +"xod" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, +/area/service/hydroponics) "xov" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -53990,9 +54146,6 @@ /area/commons/dorms) "xxK" = ( /obj/structure/dresser, -/obj/structure/sign/painting{ - pixel_y = -32 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, @@ -167207,11 +167360,11 @@ uIZ uIZ uIZ nHQ -hYb +ljt lcA lzT joS -hYb +ljt uJv nHQ nHQ @@ -167464,11 +167617,11 @@ uIZ uIZ nHQ nHQ -hYb +ljt fkN kJo jHM -hYb +ljt uJv nHQ nHQ @@ -167721,11 +167874,11 @@ nHQ nHQ nHQ nHQ -hYb +ljt dRj kJo qJx -hYb +ljt uJv nHQ nHQ @@ -167975,17 +168128,17 @@ uIZ uIZ nHQ nHQ -wuo +pku uMj -hYb -hYb +ljt +ljt aQa vIX fym -hYb -hYb +ljt +ljt nfB -hYb +ljt nHQ nHQ uIZ @@ -168231,8 +168384,8 @@ sks uIZ uIZ nHQ -wuo -wuo +pku +pku atY aOJ hYb @@ -168242,8 +168395,8 @@ omP nhI dsf qyV -hYb -hYb +ljt +ljt nHQ uIZ uIZ @@ -168745,7 +168898,7 @@ sks nHQ nHQ nHQ -wuo +pku ekL ktD mmI @@ -168757,7 +168910,7 @@ jkv gIp dfS yga -hYb +ljt nHQ nHQ uIZ @@ -169000,9 +169153,9 @@ sks sks sks nHQ -wuo -wuo -wuo +pku +pku +pku wuo kOc mVf @@ -169257,7 +169410,7 @@ sks sks nHQ nHQ -wuo +pku lGi nFJ wjP @@ -169771,7 +169924,7 @@ sks sks nHQ nHQ -wuo +pku nvM rmH wjP @@ -170028,9 +170181,9 @@ sks sks uIZ nHQ -wuo -wuo -wuo +pku +pku +pku wuo wuo dUE @@ -170287,7 +170440,7 @@ uIZ nHQ nHQ nHQ -wuo +pku sTo tkx nDs @@ -170299,7 +170452,7 @@ cca tUR cjE iZm -wuo +pku uIZ uIZ uIZ @@ -170556,7 +170709,7 @@ ktX akr sbw iZm -wuo +pku uIZ uIZ uIZ @@ -170801,8 +170954,8 @@ sks uIZ uIZ nHQ -wuo -wuo +pku +pku srI vJq srI @@ -170812,8 +170965,8 @@ wuo sSi joP xkt -wuo -wuo +pku +pku uIZ uIZ sks @@ -171059,17 +171212,17 @@ sks uIZ nHQ nHQ -wuo +pku uMj qFg -wuo +pku wuo lih wuo -wuo -wuo -wuo -wuo +pku +pku +pku +pku uIZ uIZ sks @@ -171319,11 +171472,11 @@ nHQ nHQ nHQ jCY -wuo +pku uOr cNQ guY -wuo +pku uIZ uIZ uIZ @@ -171576,11 +171729,11 @@ sks uIZ nHQ vyx -wuo -wuo -wuo -wuo -wuo +pku +pku +pku +pku +pku uIZ uIZ uIZ @@ -204502,7 +204655,7 @@ rnm wjJ ljy gwp -kiX +dIx uGq hZN rnm @@ -219375,7 +219528,7 @@ fvR fvR rXE lOd -oDy +fvR fvR fvR ltb @@ -220901,7 +221054,7 @@ fvR uZR nrk wKw -ljt +rXE aax ygL thi @@ -228103,9 +228256,9 @@ mpX iye gop jlC -imB +tRH jkT -pmS +cxk oBB mWU eJv @@ -228617,9 +228770,9 @@ iye iye dhc cra -cxk -cxk -cxk +rPc +rPc +rPc hUz mWU kUg @@ -228876,7 +229029,7 @@ ehk wOe abL qmh -ehk +ldG jfJ eLE iyL @@ -229119,8 +229272,8 @@ sgP miE dGH vpI -gFr -aOa +wcR +eUd vpI msO gBt @@ -229388,9 +229541,9 @@ iye qdm woC jrd -cxk -cxk -cxk +rPc +rPc +rPc ulq mWU iyL @@ -229647,7 +229800,7 @@ hXu pmS imB iSF -pmS +xod gRP hTN iyL @@ -239688,12 +239841,12 @@ aPB gen aij jUV -jUV -jUV -jUV -jUV -jUV -sgP +bOM +bOM +bOM +bOM +bOM +bOM sgP sgP sgP @@ -239946,10 +240099,10 @@ pkN vHs jqI iIX -bOM -bOM -bOM -bOM +qEf +oDy +loX +loX bOM sgP sgP @@ -240204,7 +240357,7 @@ rpq pya bOM gjX -pku +dWC loX loX bOM @@ -240462,8 +240615,8 @@ sJT bOM xAk dWC -loX -loX +onV +onV bOM sgP btn diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e959887114..df32e50096 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1748,6 +1748,14 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) +"buG" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/book/manual/gato_spacelaw, +/turf/open/floor/plasteel, +/area/centcom/supply) "buU" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/plasteel/cafeteria, @@ -2609,6 +2617,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/centcom/control) "ccO" = ( @@ -4194,6 +4203,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = -15; + pixel_y = 0 + }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "dnI" = ( @@ -4224,8 +4237,6 @@ /obj/item/clothing/head/HoS/beret/gato, /obj/item/clothing/suit/armor/vest/capcarapace/gato, /obj/item/clothing/suit/armor/vest/capcarapace/cc, -/obj/item/clothing/under/centcomdress, -/obj/item/clothing/under/centcomdressvk, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "dog" = ( @@ -13857,6 +13868,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/centcom/control) "kxp" = ( @@ -16540,11 +16552,14 @@ "myX" = ( /obj/structure/table/reinforced, /obj/item/taperecorder, -/obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = -16; + pixel_y = 0 + }, /turf/open/floor/plasteel/dark, /area/centcom/evac) "mzj" = ( @@ -21825,7 +21840,6 @@ "qlf" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/machinery/airalarm{ @@ -21842,6 +21856,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = 15; + pixel_y = 2 + }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) "qlM" = ( @@ -23126,6 +23144,21 @@ "rlj" = ( /turf/open/floor/plasteel/white, /area/fatlab) +"rly" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/book/manual/gato_spacelaw, +/turf/open/floor/plasteel/dark, +/area/centcom/ferry) "rmk" = ( /obj/machinery/vending/autodrobe, /turf/open/indestructible/hotelwood, @@ -24205,7 +24238,6 @@ /area/tdome/tdomeobserve) "scm" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/machinery/firealarm{ dir = 4; @@ -24221,6 +24253,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = 6; + pixel_y = -16 + }, /turf/open/floor/plasteel/dark, /area/centcom/control) "sdx" = ( @@ -24617,8 +24653,6 @@ /obj/item/clothing/suit/armor/vest/capcarapace/gato, /obj/item/clothing/suit/armor/vest/capcarapace/paradepurple, /obj/item/clothing/suit/armor/vest/capcarapace/paradeblack, -/obj/item/clothing/under/centcomdress, -/obj/item/clothing/under/centcomdressvk, /turf/open/floor/plasteel/dark/side{ dir = 9 }, @@ -25039,7 +25073,6 @@ /turf/open/floor/plasteel, /area/centcom/supply) "sHh" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -25052,6 +25085,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = 12; + pixel_y = 0 + }, /turf/open/floor/plasteel/dark, /area/centcom/control) "sHj" = ( @@ -26776,7 +26813,6 @@ "tYz" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/tile/neutral{ @@ -29330,6 +29366,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/centcom/control) "vTe" = ( @@ -30626,6 +30663,7 @@ /area/centcom/control) "wMd" = ( /obj/structure/table/wood, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/grimy, /area/centcom/control) "wMh" = ( @@ -30956,6 +30994,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel, /area/centcom/control) "xaH" = ( @@ -31448,7 +31487,6 @@ "xwF" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/tile/neutral{ @@ -32364,7 +32402,6 @@ /turf/open/floor/plating/abductor, /area/abductor_ship) "yao" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -32376,6 +32413,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/centcom/control) "yaq" = ( @@ -76044,7 +76082,7 @@ hkT xLN lyK aJd -jLL +rly pVI nWv jAM @@ -79628,7 +79666,7 @@ lfI qDa lUv frb -sGK +buG kwA iyc kwA diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 5f8fa7ac51..b35979bcb1 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -41,7 +41,7 @@ threat = 3 family_heirlooms = list( - /obj/item/book/manual/wiki/security_space_law + /obj/item/book/manual/gato_spacelaw, //gs13 - gato law book ) /datum/outfit/job/hos diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index a29ac23834..080ba16df4 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -31,7 +31,7 @@ threat = 2 family_heirlooms = list( - /obj/item/book/manual/gato_spacelaw, + /obj/item/book/manual/gato_spacelaw, //gs13 - gato law book /obj/item/clothing/head/beret/sec ) diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 7ab010b356..bfb2807bbf 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -32,7 +32,7 @@ threat = 2 family_heirlooms = list( - /obj/item/book/manual/wiki/security_space_law + /obj/item/book/manual/gato_spacelaw //gs13 - gato law book ) mail_goodies = list(