diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 8fb6f919ff..4fedb94d82 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4018,7 +4018,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ahS" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4029,11 +4028,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/bot, /obj/machinery/camera{ c_tag = "Brig Infirmary"; dir = 4 }, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel/dark, /area/security/brig) "ahT" = ( @@ -4359,9 +4358,19 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "air" = ( -/obj/structure/chair, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ais" = ( /obj/structure/filingcabinet, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -4635,6 +4644,7 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/start/brigdoc, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) "aiN" = ( @@ -4763,13 +4773,15 @@ /turf/open/floor/plasteel, /area/security/brig) "ajd" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/turf/open/floor/plasteel, -/area/commons/vacant_room/office/b) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "aje" = ( /obj/machinery/door/airlock/security{ name = "Armory"; @@ -4790,13 +4802,15 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ajf" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ajg" = ( /obj/machinery/computer/secure_data, /obj/effect/turf_decal/bot, @@ -4894,15 +4908,13 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "ajr" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ajs" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -4915,17 +4927,14 @@ /turf/open/floor/plasteel, /area/command/heads_quarters/hop) "ajt" = ( -/obj/machinery/camera{ - c_tag = "Vacant Office B"; - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/open/floor/plasteel, -/area/commons/vacant_room/office/b) +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "aju" = ( /obj/structure/cable{ icon_state = "2-4" @@ -7552,13 +7561,14 @@ /area/security/detectives_office) "ape" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/abandoned{ - abandoned = 0; - name = "Vacant Office B"; - req_access_txt = "32" +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" }, /turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/area/command/bridge{ + name = "Blueshield's Office" + }) "apf" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -7938,8 +7948,13 @@ /turf/open/floor/plating, /area/security/brig) "apU" = ( -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/export/bottle/whiskey, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "apV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8370,29 +8385,19 @@ /obj/item/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, /area/maintenance/fore) -"aqV" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) "aqW" = ( /turf/open/floor/carpet, /area/security/detectives_office) "aqX" = ( -/obj/machinery/airalarm{ - pixel_y = 23 +/obj/machinery/light{ + dir = 1; + light_color = "#d1dfff" }, -/obj/structure/chair, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) -"aqY" = ( -/obj/structure/table/wood, -/obj/item/pen, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "aqZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -8732,10 +8737,10 @@ /area/security/brig) "arR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "arS" = ( /obj/structure/chair{ dir = 8 @@ -8746,12 +8751,23 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "arT" = ( -/turf/open/floor/plasteel, -/area/commons/vacant_room/office/b) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "arU" = ( -/obj/structure/rack, -/turf/open/floor/plasteel, -/area/commons/vacant_room/office/b) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "arV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8894,13 +8910,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"asj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) "ask" = ( /obj/item/flashlight/lamp/green{ pixel_x = -2; @@ -8910,12 +8919,13 @@ /turf/open/floor/wood, /area/commons/dorms) "asl" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "asm" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -8924,8 +8934,17 @@ /area/commons/dorms) "asn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/effect/landmark/start/blueshield, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "aso" = ( /obj/machinery/door/airlock/maintenance{ name = "Law Office Maintenance"; @@ -9469,8 +9488,10 @@ /area/maintenance/port/fore) "atK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "atL" = ( /obj/structure/cable{ icon_state = "1-8" @@ -9518,10 +9539,6 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/maintenance/port/fore) -"atY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/commons/vacant_room/office/b) "atZ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -9639,7 +9656,9 @@ "auq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/commons/vacant_room/office/b) +/area/command/bridge{ + name = "Blueshield's Office" + }) "aur" = ( /obj/machinery/button/door{ id = "Room One"; @@ -9870,15 +9889,24 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/power/apc{ - areastring = "/area/commons/vacant_room/office/b"; - dir = 8; - name = "Vacant Office B APC"; - pixel_x = -25 +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 }, -/turf/open/floor/plating, -/area/maintenance/fore) +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "avi" = ( /obj/machinery/power/apc{ areastring = "/area/service/lawoffice"; @@ -10275,17 +10303,12 @@ /area/maintenance/fore) "awi" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/fore) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "awj" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -51099,7 +51122,9 @@ /area/construction) "cCi" = ( /turf/closed/wall, -/area/commons/vacant_room/office/b) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cCj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51709,8 +51734,10 @@ /area/security/brig) "cLS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/commons/vacant_room/office/b) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cMC" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -53136,6 +53163,16 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"eiz" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Blueshield's Office Maintenance"; + req_access_txt = "19" + }, +/turf/open/floor/plating, +/area/command/bridge{ + name = "Blueshield's Office" + }) "eiB" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -54890,6 +54927,18 @@ "gjl" = ( /turf/closed/wall, /area/cargo/warehouse) +"gkj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gnf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59279,6 +59328,13 @@ icon_state = "platingdmg3" }, /area/maintenance/port/fore) +"mxk" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mxn" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -59408,6 +59464,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/security/range) +"mGR" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mHA" = ( /obj/item/reagent_containers/food/snacks/grown/banana, /obj/item/reagent_containers/food/snacks/grown/banana, @@ -60655,6 +60722,14 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, /area/hallway/primary/central) +"oGZ" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/folder/blue, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "oHB" = ( /turf/open/floor/plasteel/dark, /area/commons/dorms) @@ -62764,6 +62839,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"rRy" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "rSf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -63208,6 +63291,21 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"sBt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "sBM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green{ @@ -63476,6 +63574,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sVY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/wood, +/obj/machinery/computer/secure_data/laptop, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "sWR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -64089,8 +64195,16 @@ /obj/item/radio/intercom{ pixel_y = 20 }, -/turf/open/floor/plating, -/area/commons/vacant_room/office/b) +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tKk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -64116,6 +64230,16 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) +"tLE" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/blue/double, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tMl" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, @@ -65746,6 +65870,15 @@ }, /turf/open/floor/plasteel, /area/security/prison/cells) +"wfg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "wfC" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -92180,11 +92313,11 @@ cCi apU ajd arU -apU -apU -cCi -awg -axy +wfg +sVY +auq +avs +axz ayL azQ aBk @@ -92435,10 +92568,10 @@ anz aov cCi air -aqY arT -apU -apU +mxk +mGR +oGZ cCi awg axy @@ -92693,10 +92826,10 @@ aov cCi aqX arR -asj +cLS cLS ajr -atY +cLS auo axy ayN @@ -92949,9 +93082,9 @@ anz aov ape arT -aqV +arT ajf -apU +rRy ajt cCi awg @@ -93207,7 +93340,7 @@ aov cCi tKb arT -arT +cCi asn atK auq @@ -93462,13 +93595,13 @@ anz anz aov cCi -arT -arT +avh +awi asl -arT -apU -cCi -awg +gkj +tLE +asl +sBt axy ayv azE @@ -93720,7 +93853,7 @@ anz aox cCi cCi -cCi +eiz cCi cCi cCi @@ -93981,7 +94114,7 @@ aqZ aqZ apW aqZ -avh +aqZ awh axz ayO @@ -94239,7 +94372,7 @@ arW aso auf avi -awi +auo axy ayS azS diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 75a24fe468..7504b0b767 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -10862,6 +10862,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/effect/landmark/start/brigdoc, /turf/open/floor/plasteel, /area/security/brig) "ayX" = ( @@ -10949,6 +10950,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel, /area/security/brig) "azg" = ( @@ -18943,6 +18945,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/closet/secure_closet/blueshield, /turf/open/floor/plasteel, /area/command/bridge) "aPv" = ( @@ -70858,6 +70861,10 @@ }, /turf/open/space/basic, /area/space/nearstation) +"ffr" = ( +/obj/effect/landmark/start/blueshield, +/turf/open/floor/plasteel, +/area/command/bridge) "fgS" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -91072,7 +91079,7 @@ urj cbX aGq aGX -aHM +ffr aHM aIP aJB diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5a56881764..e4b81565ec 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -15607,6 +15607,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/landmark/start/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "bkm" = ( @@ -15892,6 +15893,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "bmf" = ( @@ -36949,6 +36951,16 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cJk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cJJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -52848,6 +52860,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) +"dpM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "dpX" = ( /obj/structure/chair/office/light{ dir = 8 @@ -72462,8 +72484,10 @@ }, /obj/item/folder/yellow, /obj/item/pen, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "eBl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, @@ -72478,15 +72502,6 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"eBK" = ( -/obj/structure/table/wood, -/obj/item/stack/packageWrap, -/obj/item/hand_labeler, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) "eBO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73448,11 +73463,10 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "eVt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ @@ -74451,9 +74465,11 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/photocopier, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "fmE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 4 @@ -75110,7 +75126,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "fzJ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -75715,7 +75733,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "fJW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -76178,11 +76198,11 @@ /turf/open/floor/plasteel, /area/cargo/storage) "fSs" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/obj/effect/landmark/start/blueshield, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "fSZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -78288,8 +78308,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gGl" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 6 @@ -80554,6 +80576,24 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"hsR" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "hsV" = ( /obj/structure/cable/white{ icon_state = "1-4" @@ -80638,8 +80678,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/filingcabinet/chestdrawer, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) +"hur" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/structure/curtain, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "huv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/neutral{ @@ -80804,10 +80856,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "hym" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ - name = "Office Maintenance"; - req_access_txt = "32" - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" @@ -80821,8 +80869,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Blueshield's Office Maintenance"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "hyt" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -82281,9 +82336,13 @@ /obj/machinery/status_display/ai{ pixel_x = 32 }, -/obj/structure/frame/computer, +/obj/machinery/computer/med_data{ + dir = 8 + }, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "hUA" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -82947,7 +83006,9 @@ "igs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "igt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -84804,10 +84865,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/cargo/qm) -"iIi" = ( -/mob/living/simple_animal/cockroach, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) "iIp" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -85239,7 +85296,9 @@ "iOi" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "iOr" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -86690,9 +86749,6 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) -"jqr" = ( -/turf/closed/wall, -/area/commons/vacant_room/office) "jra" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -87237,6 +87293,12 @@ }, /turf/open/floor/plating, /area/commons/fitness/recreation) +"jxO" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "jxV" = ( /obj/structure/table, /obj/item/stack/sheet/cloth/ten, @@ -90556,9 +90618,13 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/structure/frame/computer, +/obj/machinery/computer/secure_data{ + dir = 8 + }, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "kCt" = ( /turf/closed/wall/r_wall, /area/engineering/supermatter) @@ -91029,6 +91095,15 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"kMA" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kND" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -91536,11 +91611,6 @@ }, /turf/open/floor/plasteel, /area/service/janitor) -"kVv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/mob/living/simple_animal/cockroach, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "kVI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -92403,9 +92473,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/command/gateway) -"lpx" = ( -/turf/open/floor/wood, -/area/commons/vacant_room/office) "lpz" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -93932,8 +93999,13 @@ /area/command/heads_quarters/captain) "lPU" = ( /obj/item/kirbyplants/random, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "lQc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -96636,6 +96708,16 @@ }, /turf/open/floor/carpet, /area/service/library/abandoned) +"mNs" = ( +/obj/structure/chair/office/dark, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mNu" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -97232,8 +97314,10 @@ /turf/open/floor/plasteel/white, /area/command/heads_quarters/rd) "mWx" = ( -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mWJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -97941,6 +98025,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/service/hydroponics) +"nkU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nlh" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -98991,6 +99083,17 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"nDx" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nDA" = ( /obj/structure/sink{ dir = 8; @@ -100340,9 +100443,10 @@ "oaL" = ( /obj/structure/table/wood, /obj/item/folder, -/obj/item/pen, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "obe" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -100761,8 +100865,12 @@ dir = 4; pixel_x = -23 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/structure/dresser, +/obj/machinery/light/small, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "oko" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -101639,9 +101747,21 @@ /area/command/gateway) "oAi" = ( /obj/structure/table/wood, -/obj/item/storage/briefcase, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/export/bottle/whiskey, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "oAk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -102378,7 +102498,9 @@ /area/cargo/warehouse) "oMN" = ( /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "oNd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -102509,13 +102631,15 @@ /area/service/library/abandoned) "oQN" = ( /obj/structure/cable/white{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 + dir = 4 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "oRN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -103381,13 +103505,17 @@ /area/commons/dorms) "pgG" = ( /obj/structure/table/wood, -/obj/item/camera_film{ - pixel_x = 3; - pixel_y = 3 +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 }, -/obj/item/camera_film, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "pho" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -105054,12 +105182,18 @@ /area/commons/fitness/recreation) "pKj" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/structure/sign/warning/nosmoking{ - pixel_x = 32 +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/multitool, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "pKk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -105151,8 +105285,11 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/effect/landmark/start/blueshield, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "pLb" = ( /obj/structure/cable/white{ icon_state = "2-4" @@ -108831,9 +108968,19 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/office) "rhk" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "rhn" = ( /obj/structure/plasticflaps/opaque, /obj/effect/decal/cleanable/dirt, @@ -109195,7 +109342,9 @@ "rnK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "rod" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -110571,10 +110720,15 @@ /turf/open/floor/plasteel, /area/cargo/storage) "rKt" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/bed/double, +/obj/item/bedsheet/blue/double, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "rKE" = ( /obj/structure/chair/wood/normal, /obj/machinery/newscaster{ @@ -112729,11 +112883,14 @@ /turf/open/floor/plasteel, /area/engineering/main) "suU" = ( -/obj/structure/table/wood, -/obj/item/folder, -/obj/item/pen, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = -26 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "suV" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -113544,12 +113701,10 @@ "sKu" = ( /obj/structure/table/wood, /obj/item/clipboard, -/obj/machinery/camera{ - c_tag = "Vacant Office"; - dir = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "sLd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -113777,8 +113932,10 @@ "sOH" = ( /obj/structure/table/wood, /obj/item/paicard, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "sOX" = ( /turf/closed/wall, /area/cargo/sorting) @@ -113976,10 +114133,6 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) -"sSj" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) "sSp" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -114280,8 +114433,14 @@ /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "sWQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -114917,6 +115076,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/science/research/abandoned) +"thS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tin" = ( /obj/machinery/light{ dir = 1 @@ -115255,12 +115422,18 @@ /area/service/hydroponics/garden/abandoned) "tny" = ( /obj/structure/table/wood, -/obj/item/taperecorder, /obj/machinery/light/small{ dir = 1 }, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "tnJ" = ( /obj/machinery/light/small{ dir = 8 @@ -115535,17 +115708,11 @@ /turf/open/floor/plasteel/dark, /area/service/electronic_marketing_den) "trJ" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/machinery/light/small, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "trN" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -116974,7 +117141,9 @@ dir = 4 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "tRl" = ( /obj/item/wrench, /turf/open/floor/plating, @@ -116982,7 +117151,9 @@ "tRF" = ( /obj/machinery/status_display/evac, /turf/closed/wall, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "tRI" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -117627,9 +117798,11 @@ /area/service/kitchen) "ubw" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ucc" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -119861,13 +120034,19 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "uSI" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light/small, -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_y = -32 +/obj/structure/mirror{ + pixel_y = 32 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/structure/toilet/secret/low_loot{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "uTc" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -120787,8 +120966,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vmb" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -121541,15 +121722,14 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vCn" = ( -/obj/machinery/power/apc{ - areastring = "/area/commons/vacant_room/office"; - name = "Auxiliary Office APC"; - pixel_y = -26 +/obj/machinery/newscaster{ + pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/white, +/obj/machinery/photocopier, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "vCH" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -122170,6 +122350,25 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"vPp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/effect/landmark/start/blueshield, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vQm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -122429,14 +122628,10 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "vWG" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vWJ" = ( /obj/machinery/light_switch{ pixel_x = -26; @@ -124401,8 +124596,10 @@ /obj/structure/sign/poster/official/do_not_question{ pixel_x = -32 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "wEu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -124790,7 +124987,9 @@ dir = 9 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "wLU" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/apron/chef, @@ -125554,18 +125753,16 @@ /turf/open/floor/wood, /area/service/lawoffice) "xbT" = ( -/obj/machinery/door/airlock/abandoned{ - name = "Auxiliary Office"; - req_access_txt = "32" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" }, -/obj/effect/landmark/event_spawn, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "xcf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -126476,19 +126673,27 @@ /area/commons/fitness/recreation) "xsp" = ( /obj/structure/table/wood, -/obj/item/camera, /obj/machinery/light/small, /obj/structure/sign/nanotrasen{ pixel_y = -32 }, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "xsA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "xtf" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -127165,14 +127370,13 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "xFF" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "xFX" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -162243,14 +162447,14 @@ aaa abf ajx ajW -jqr -jqr -jqr -jqr -jqr -jqr -jqr -jqr +vWG +vWG +vWG +vWG +vWG +vWG +vWG +vWG arB asK alf @@ -162500,14 +162704,14 @@ aad aaO ajw ajX -jqr +vWG oaL wEh vlK ojM -sSj -oaL -jqr +vWG +hur +vWG alg asQ aug @@ -162757,14 +162961,14 @@ aaO abf ajy ajV -jqr +vWG eVa mWx fSs -oMN -mWx +nkU +dpM trJ -jqr +vWG arC asR ami @@ -163019,9 +163223,9 @@ fmm xsA suU rKt -iIi +vWG uSI -jqr +vWG arD asS aEg @@ -163271,14 +163475,14 @@ aaO aaO ajw ajV -jqr -eBK -gGc -pKU -pKU -mWx vWG -jqr +vWG +gGc +cJk +thS +vWG +vWG +vWG arE asT aEg @@ -163528,14 +163732,14 @@ aeb ajf ajw ajV -jqr +vWG oAi -gGc -mWx -mWx -sSj +vPp +kMA +hsR +mNs sKu -jqr +vWG arE asU aEg @@ -163788,11 +163992,11 @@ ajZ igs fzF wLv -lpx +mWx rhk -lpx +mWx lPU -jqr +vWG arD asV aEg @@ -164045,11 +164249,11 @@ ajU xbT fJH rnK -kVv +rnK oQN xFF vCn -jqr +vWG arF asW aEg @@ -164299,14 +164503,14 @@ aaO abf ajA ajV -jqr +vWG ubw eAP sOH hul -rhk -lPU -jqr +mWx +jxO +vWG arD asX aEg @@ -164560,10 +164764,10 @@ tRF tny pKU oMN -hul -lpx +nDx +mWx xsp -jqr +vWG arD asT aEg @@ -164813,14 +165017,14 @@ aaa abf ajz aka -jqr +vWG sWN hUz kCk tQU pgG pKj -jqr +vWG arG asY aEg @@ -165070,14 +165274,14 @@ abf abf tww ajV -jqr -jqr -jqr -jqr +vWG +vWG +vWG +vWG hym -jqr -jqr -jqr +vWG +vWG +vWG kqo asZ aui diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index bd20b2edc8..0063f9332a 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -17855,6 +17855,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "aGd" = ( @@ -50921,7 +50922,9 @@ /area/engineering/main) "cmC" = ( /turf/closed/wall, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cmD" = ( /obj/machinery/computer/operating{ dir = 1 @@ -50939,25 +50942,52 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cmF" = ( -/turf/open/floor/wood, -/area/commons/vacant_room/office) -"cmG" = ( -/obj/structure/table/wood, -/obj/item/paper, -/turf/open/floor/wood, -/area/commons/vacant_room/office) -"cmH" = ( -/obj/structure/table/wood, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) +"cmG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) +"cmH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/structure/dresser, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/export/bottle/whiskey, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cmI" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/bedsheet/blue/double, +/obj/structure/bed/double, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cmJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 @@ -51560,27 +51590,29 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "coX" = ( -/obj/machinery/power/apc{ - areastring = "/area/commons/vacant_room/office"; - dir = 8; - name = "Vacant Office APC"; - pixel_x = -25 - }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "coY" = ( /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /turf/open/floor/engine/n2, /area/engineering/atmos) "coZ" = ( -/obj/structure/chair/office/dark{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/effect/landmark/start/blueshield, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cpa" = ( /obj/effect/turf_decal/vg_decals/atmos/air, /turf/open/floor/engine/air, @@ -52170,12 +52202,20 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cqs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cqu" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 4 @@ -52945,10 +52985,6 @@ /area/hallway/primary/aft) "csG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Vacant Office"; - req_access_txt = "32" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -52958,8 +52994,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "csH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -52975,7 +53017,9 @@ pixel_y = 25 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "csI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -52984,22 +53028,32 @@ dir = 4 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "csJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) -"csK" = ( -/obj/machinery/camera/autoname{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/structure/mirror{ + pixel_y = 32 }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) +"csK" = ( +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "csL" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -53806,11 +53860,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cuK" = ( -/obj/structure/chair/comfy/black{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/folder/blue, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cuL" = ( /obj/machinery/door/poddoor{ id = "SecJusticeChamber"; @@ -53820,9 +53879,11 @@ /area/security/execution/education) "cuM" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/machinery/computer/secure_data/laptop, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cuN" = ( /obj/item/paper_bin{ pixel_x = -2; @@ -53832,20 +53893,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 }, +/obj/item/pen, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cuP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cuR" = ( /obj/item/radio/intercom{ pixel_x = 28 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cuS" = ( /obj/structure/table, /obj/item/hemostat{ @@ -54935,20 +55007,19 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "cxr" = ( -/obj/item/folder/blue, -/obj/structure/table/wood, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +/obj/structure/chair/comfy/black{ + dir = 1 }, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cxs" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, +/obj/machinery/light, /turf/open/floor/carpet, -/area/space) +/area/command/bridge{ + name = "Blueshield's Office" + }) "cxu" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/maintenance_hatch/abandoned{ @@ -55722,11 +55793,13 @@ /area/hallway/primary/aft) "czj" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maintenance"; - req_access_txt = "32" + name = "Blueshield's Office Maintenance"; + req_access_txt = "19" }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "czl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/stripes/line{ @@ -65301,6 +65374,20 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark, /area/science/circuit) +"gzA" = ( +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gAO" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/machinery/light{ @@ -65694,6 +65781,16 @@ dir = 1 }, /area/engineering/atmos) +"hlk" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + alpha = 255 + }, +/obj/effect/landmark/start/brigdoc, +/turf/open/floor/plasteel/white, +/area/security/brig) "hnj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -66291,6 +66388,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/port/fore) +"iBi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "iCA" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ @@ -67274,6 +67382,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"kzG" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kAs" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/cable{ @@ -67359,6 +67476,14 @@ /obj/item/storage/box/lights, /turf/open/floor/plasteel, /area/engineering/break_room) +"kKh" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kKY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -68053,6 +68178,17 @@ }, /turf/open/floor/plasteel/dark, /area/science/circuit) +"lUa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "lVT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -68161,6 +68297,11 @@ "maX" = ( /turf/closed/wall, /area/maintenance/disposal/incinerator) +"maY" = ( +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mbj" = ( /obj/machinery/light{ dir = 8 @@ -70413,6 +70554,17 @@ }, /turf/open/floor/plasteel, /area/engineering/break_room) +"qXk" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "qYQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -70783,6 +70935,17 @@ /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"rFG" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "rFZ" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/disposal/incinerator"; @@ -71806,6 +71969,19 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"uax" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ubl" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -73769,6 +73945,14 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"yhf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "yhm" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -108983,7 +109167,7 @@ coX cqr csH cuK -cuK +rFG cmC cBW rEw @@ -109234,10 +109418,10 @@ boU bYf bHW cgK -baE -cmF -cmF -cmF +boU +uax +gzA +qXk csI cuM cxr @@ -109491,9 +109675,9 @@ boU bYf bHW cgK -baE +boU cmG -cmF +kKh cqs csJ cuN @@ -109748,13 +109932,13 @@ boU bYs bHW cgK -baE +boU cmH coZ -cmF -cmF +iBi +yhf cuP -cmF +maY cmC cAx cqP @@ -110005,13 +110189,13 @@ bVG bYf bHW cgK -baE +boU cmI -cmI -cmF +lUa +cmC csK cuR -cmF +kzG czj ejv cQI @@ -115343,7 +115527,7 @@ aAk aKQ aCo aCZ -aDO +hlk aEK aDO aGd diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7c75dbfc2b..afff70134a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3467,15 +3467,9 @@ /turf/open/floor/plasteel/white, /area/security/brig) "akw" = ( -/obj/structure/table, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -3483,6 +3477,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "akx" = ( @@ -3902,6 +3897,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/effect/landmark/start/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "alP" = ( @@ -49785,11 +49781,19 @@ /turf/closed/wall, /area/commons/cryopod) "edM" = ( -/obj/structure/light_construct{ - dir = 4 +/obj/structure/sink{ + pixel_y = 25 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/toilet/secret/low_loot{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "edY" = ( /obj/structure/window, /turf/open/floor/plasteel/cafeteria, @@ -49814,9 +49818,14 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "efp" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 28 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "efB" = ( /obj/machinery/shieldwallgen, /obj/structure/window/reinforced{ @@ -50635,12 +50644,18 @@ /turf/open/floor/plating, /area/engineering/atmos) "eBu" = ( -/obj/machinery/door/airlock/grunge, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/commons/vacant_room/office) +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "eBD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ dir = 1 @@ -51156,11 +51171,16 @@ /turf/open/floor/carpet, /area/service/library) "ePx" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/pen/red, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/machinery/computer/med_data{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ePC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -51984,12 +52004,6 @@ "flY" = ( /turf/open/pool, /area/commons/fitness/pool) -"fmJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "fmO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -53244,10 +53258,14 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "gdH" = ( -/obj/item/toy/cards/deck, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gdJ" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -30 @@ -54155,13 +54173,13 @@ /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "gCM" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 +/obj/machinery/light/small{ + dir = 4 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gCY" = ( /obj/effect/landmark/start/head_of_personnel, /obj/structure/chair/office/dark{ @@ -55304,6 +55322,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) +"hqm" = ( +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "hqy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -55685,6 +55713,12 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"hAH" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "hAI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -55746,10 +55780,12 @@ /area/engineering/gravity_generator) "hBP" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "hCt" = ( /obj/machinery/gibber, /turf/open/floor/plasteel/showroomfloor, @@ -56032,16 +56068,18 @@ /turf/open/floor/plating, /area/security/prison/upper) "hKm" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 }, -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" }, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "hKA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -56842,8 +56880,11 @@ /obj/item/radio/intercom{ pixel_x = -29 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "igL" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ @@ -57208,11 +57249,11 @@ /turf/open/floor/plasteel, /area/engineering/main) "irH" = ( -/obj/item/folder/blue, -/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "irY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60041,14 +60082,25 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "jUo" = ( -/obj/structure/table/wood, /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/folder, +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "jUp" = ( /obj/machinery/door/window/northleft{ dir = 8; @@ -61013,6 +61065,14 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) +"kzB" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kAc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, @@ -61506,6 +61566,11 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"kLv" = ( +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kLD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61784,13 +61849,13 @@ dir = 8; pixel_x = 24 }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 +/obj/machinery/computer/secure_data{ + dir = 8 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kSy" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/aft"; @@ -61977,12 +62042,6 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) -"kXR" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "kXS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -62019,9 +62078,6 @@ }, /turf/open/floor/plasteel, /area/security/office) -"kYv" = ( -/turf/closed/wall, -/area/commons/vacant_room/office) "kYC" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light, @@ -63668,11 +63724,20 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "lVL" = ( -/obj/structure/light_construct{ - dir = 8 +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/multitool, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "lWq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63799,14 +63864,27 @@ /turf/open/floor/plating, /area/commons/cryopod) "lZv" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "lZE" = ( /obj/structure/chair/office/dark{ dir = 8 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "lZK" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -63867,11 +63945,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mbw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -64306,13 +64389,6 @@ "mmH" = ( /turf/open/floor/carpet, /area/command/heads_quarters/hop) -"mmJ" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "mmU" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, @@ -66937,14 +67013,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/office) -"nTV" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) "nUa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -69042,6 +69110,12 @@ }, /turf/open/floor/plasteel, /area/commons/storage/primary) +"oYW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "oZg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69902,6 +69976,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/commons/fitness/recreation) +"ptO" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ptX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -70332,6 +70412,17 @@ }, /turf/open/space, /area/solars/starboard/aft) +"pDM" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pen, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "pEN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -70639,6 +70730,11 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"pMZ" = ( +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "pNU" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -71139,17 +71235,15 @@ }, /area/command/heads_quarters/rd) "qde" = ( -/obj/machinery/power/apc{ - areastring = "/area/commons/vacant_room/office"; - dir = 8; - name = "Vacant Office APC"; - pixel_x = -25 +/obj/effect/landmark/start/blueshield, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "qed" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -71535,10 +71629,16 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/clipboard, -/obj/item/paper, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/folder/blue, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "qmK" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -71908,16 +72008,12 @@ /area/service/library) "qxN" = ( /obj/structure/table/wood, -/obj/item/camera_film{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/camera_film{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/export/bottle/whiskey, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "qyd" = ( /obj/structure/bed/roller, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -72787,14 +72883,6 @@ }, /turf/open/floor/plasteel, /area/security/prison/upper) -"qUY" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "qVi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -73580,8 +73668,13 @@ /area/engineering/main) "rrD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "rrX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -76058,14 +76151,13 @@ /turf/closed/wall/r_wall, /area/command/heads_quarters/captain/private) "sKp" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "sKv" = ( /turf/closed/wall, /area/engineering/atmos) @@ -76556,8 +76648,11 @@ /area/service/chapel/main) "taZ" = ( /obj/structure/table/wood, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tbN" = ( /obj/machinery/status_display/ai{ pixel_y = 32 @@ -77360,6 +77455,14 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) +"tCt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tCA" = ( /obj/machinery/disposal/bin{ pixel_x = -2; @@ -77695,9 +77798,11 @@ /area/commons/locker) "tLu" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tLZ" = ( /obj/machinery/light{ dir = 8 @@ -78089,6 +78194,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/service/kitchen) +"tWQ" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/light, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tXp" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -79190,11 +79302,27 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "uEC" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = -29 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "uFM" = ( /obj/machinery/power/emitter, /obj/machinery/light/small, @@ -79289,14 +79417,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/main) -"uIN" = ( -/obj/structure/table/wood, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) "uIY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -80379,6 +80499,14 @@ }, /turf/open/floor/carpet, /area/service/theater) +"vqk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vqv" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -80956,6 +81084,14 @@ }, /turf/open/floor/wood, /area/commons/dorms) +"vJr" = ( +/obj/machinery/firealarm{ + pixel_y = -24 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vJE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/chem_master/condimaster{ @@ -81039,9 +81175,15 @@ /area/engineering/atmos) "vMu" = ( /obj/structure/table/wood, -/obj/item/folder, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, /turf/open/floor/wood, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "vMG" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -81164,7 +81306,9 @@ "vQX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "vRu" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -82310,13 +82454,15 @@ /turf/open/floor/plasteel, /area/command/gateway) "wul" = ( -/obj/structure/table/wood, -/obj/item/paper, /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/turf/open/floor/wood, -/area/commons/vacant_room/office) +/obj/item/bedsheet/blue/double, +/obj/structure/bed/double, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "wuo" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -82450,13 +82596,16 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "wxF" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Vacant Office Maintenance"; - req_access_txt = "32" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/maintenance{ + name = "Blueshield's Office Maintenance"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/maintenance/port) +/area/command/bridge{ + name = "Blueshield's Office" + }) "wxP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -84761,11 +84910,10 @@ /turf/open/floor/wood, /area/commons/dorms) "xGF" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/commons/vacant_room/office) +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "xGK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, @@ -85843,11 +85991,15 @@ }, /area/service/kitchen) "yfu" = ( -/obj/structure/chair/comfy/black{ - dir = 4 +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" }, +/obj/machinery/door/firedoor, /turf/open/floor/carpet, -/area/commons/vacant_room/office) +/area/command/bridge{ + name = "Blueshield's Office" + }) "yfL" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -100546,17 +100698,17 @@ bHM ajs jBe pHS -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF alC mEe alK @@ -100808,12 +100960,12 @@ jUo uEC lVL vMu -qUY +xGF igf qde -tLu -gCM -kYv +kzB +ptO +xGF amZ bSq bTr @@ -101060,17 +101212,17 @@ swU aeD kQP rNX -kYv +xGF lZv -lZv -lZv -lZv -kXR +oYW +oYW +oYW +vQX mbl -fmJ +kLv efp wul -kYv +xGF auF bSo alK @@ -101319,15 +101471,15 @@ aju syk eBu hBP -hBP -hBP -hBP -fmJ +pMZ +pMZ +vJr +xGF sKp yfu -lZv -uIN -kYv +xGF +xGF +xGF aoa bSo alK @@ -101574,16 +101726,16 @@ aiW dig amv wlH -kYv +xGF tLu taZ -lZv -lZv -lZv +pDM +vqk +irH hKm irH rrD -rrD +irH wxF bRd ghM @@ -101831,17 +101983,17 @@ baE baE bqd xfI -kYv +xGF qmB lZE -lZv -lZv -lZv -nTV +kLv +tCt +tWQ +xGF +xGF +hqm +xGF xGF -efp -uIN -kYv bRe xDn aSO @@ -102088,17 +102240,17 @@ bJp eiS jBe xmb -kYv +xGF qxN ePx kSt -lZv -lZv -mmJ +pMZ +hAH +xGF edM gCM gdH -kYv +xGF aqO bSt dux @@ -102345,17 +102497,17 @@ bsu btY maP xLL -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv -kYv +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF +xGF alK bSo dux diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 4c17a0ed49..e2381a90a8 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -4021,6 +4021,7 @@ dir = 4 }, /obj/structure/table/optable, +/obj/item/storage/backpack/duffelbag/sec/surgery, /turf/open/floor/plasteel/white, /area/security/brig) "akw" = ( @@ -4034,8 +4035,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, +/obj/structure/closet/secure_closet/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "akx" = ( @@ -4601,6 +4601,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/start/brigdoc, /turf/open/floor/plasteel/white, /area/security/brig) "alV" = ( @@ -5625,6 +5626,14 @@ }, /turf/open/floor/plasteel/dark, /area/command/gateway) +"aoG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "aoH" = ( /obj/structure/lattice, /obj/structure/grille, @@ -7496,6 +7505,11 @@ "atn" = ( /turf/closed/wall, /area/commons/fitness/recreation) +"atp" = ( +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "atv" = ( /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 3"; @@ -8379,6 +8393,7 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "avp" = ( @@ -8959,6 +8974,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/commons/fitness/recreation) "awE" = ( @@ -9259,6 +9275,7 @@ dir = 9 }, /obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/commons/fitness/recreation) "axC" = ( @@ -9623,6 +9640,7 @@ icon_state = "1-2" }, /obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/commons/fitness/recreation) "ayy" = ( @@ -10126,6 +10144,7 @@ dir = 8 }, /obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/commons/fitness/recreation) "azG" = ( @@ -10573,8 +10592,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) @@ -41268,6 +41287,20 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"bSg" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pen, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "bSh" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -51563,6 +51596,21 @@ }, /turf/open/floor/plasteel/dark, /area/medical/surgery) +"cOd" = ( +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cOp" = ( /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -51662,6 +51710,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/lab) +"cSV" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "cTI" = ( /obj/item/wirecutters, /obj/effect/spawner/lootdrop/maintenance, @@ -52344,6 +52400,18 @@ }, /turf/open/floor/plasteel, /area/cargo/office) +"efl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) "efu" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/scientist, @@ -52355,6 +52423,14 @@ icon_state = "panelscorched" }, /area/maintenance/department/science) +"efW" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "egu" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/plasteel/dark, @@ -52611,6 +52687,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"eKq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "eKC" = ( /obj/machinery/door/airlock/grunge{ name = "Library" @@ -53133,6 +53217,14 @@ }, /turf/open/floor/engine, /area/engineering/supermatter) +"fDd" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "fFv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -53323,6 +53415,37 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"gdN" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) +"gdS" = ( +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) +"geb" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "geL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -53683,6 +53806,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"gDY" = ( +/obj/machinery/computer/med_data{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gDZ" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -53952,6 +54086,19 @@ "gXv" = ( /turf/open/floor/plasteel/dark, /area/service/library/lounge) +"gXB" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "gXZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -54476,6 +54623,11 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"hTR" = ( +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "hUt" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -54567,6 +54719,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/engineering/main) +"ier" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 28 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "igB" = ( /obj/machinery/camera{ c_tag = "Turbine Chamber"; @@ -54820,6 +54981,15 @@ /obj/structure/disposaloutlet, /turf/open/floor/plating, /area/space/nearstation) +"izp" = ( +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "izB" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod" @@ -55518,6 +55688,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"jMp" = ( +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "jOB" = ( /turf/open/floor/plating, /area/commons/storage/emergency/starboard) @@ -55881,6 +56061,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"ktt" = ( +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/toilet/secret/low_loot{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/command/bridge{ + name = "Blueshield's Office" + }) "kuS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -56599,6 +56793,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/engine, /area/science/xenobiology) +"lDf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) "lEh" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -57070,6 +57272,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"mqQ" = ( +/obj/effect/landmark/start/blueshield, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "mqS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57463,6 +57675,11 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"nbX" = ( +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ncm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -57593,6 +57810,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/department/engine) +"npO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nqu" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -57688,6 +57913,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"nwA" = ( +/obj/machinery/firealarm{ + pixel_y = -24 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nxf" = ( /obj/machinery/light/small{ dir = 4 @@ -57723,6 +57956,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"nzh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nzD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -57996,6 +58237,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"nPI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "nQc" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -58381,6 +58636,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/commons/storage/primary) +"oyH" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ozO" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, @@ -58527,6 +58794,12 @@ /obj/item/pen, /turf/open/floor/plasteel/dark, /area/service/library) +"oJf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) "oKa" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -58829,6 +59102,16 @@ /obj/effect/landmark/start/warden, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"peY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) "pfz" = ( /obj/machinery/light{ dir = 1 @@ -59101,6 +59384,20 @@ /mob/living/simple_animal/opossum, /turf/open/floor/wood, /area/maintenance/department/crew_quarters/dorms) +"pBy" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "pBD" = ( /obj/structure/cable{ icon_state = "0-8" @@ -59206,6 +59503,26 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"pFT" = ( +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "pGe" = ( /obj/structure/chair{ dir = 1 @@ -59711,6 +60028,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"qEq" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "qEN" = ( /obj/machinery/rnd/production/techfab/department/service, /obj/structure/window/reinforced{ @@ -60135,6 +60460,24 @@ "rmC" = ( /turf/open/space/basic, /area/space/station_ruins) +"rnf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall, +/area/command/bridge{ + name = "Blueshield's Office" + }) +"rnj" = ( +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "rnr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -60745,6 +61088,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"sxR" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/light, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "syn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/mineral/iron, @@ -60933,6 +61283,14 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/cargo/storage) +"sSp" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "sUP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -61250,6 +61608,16 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"ttf" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/item/bedsheet/blue/double, +/obj/structure/bed/double, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "ttS" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/green, @@ -61549,6 +61917,14 @@ icon_state = "platingdmg3" }, /area/maintenance/department/security/brig) +"tYe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "tYu" = ( /obj/item/reagent_containers/food/snacks/donut, /turf/open/floor/plating{ @@ -61592,6 +61968,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) +"udp" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "uek" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -61861,6 +62243,18 @@ /obj/item/dice/d20, /turf/open/floor/plating, /area/maintenance/department/science) +"uvY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = -29 + }, +/obj/structure/closet/secure_closet/blueshield, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "uwb" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -61902,6 +62296,28 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine, /area/science/xenobiology) +"uyW" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = -29 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "uzh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ @@ -62457,6 +62873,14 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/department/cargo) +"vue" = ( +/obj/structure/dresser, +/obj/item/export/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/flask, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vuP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -62629,6 +63053,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"vMQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vOw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -62742,6 +63174,14 @@ }, /turf/open/floor/plasteel/dark, /area/service/library) +"vTF" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/bridge{ + name = "Blueshield's Office" + }) "vTL" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/tile/neutral{ @@ -62867,6 +63307,15 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"wfy" = ( +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "wfO" = ( /mob/living/simple_animal/hostile/retaliate/poison/snake, /turf/open/floor/plating, @@ -63907,6 +64356,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/service/lawoffice) +"xLE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/command/bridge{ + name = "Blueshield's Office" + }) "xLL" = ( /turf/closed/wall, /area/maintenance/solars/port) @@ -108152,14 +108607,14 @@ ale ale ale ale -ale +efl ale ale abv ale abG -ale -ale +peY +lDf avn awD axA @@ -108408,15 +108863,15 @@ aiS aiS aiS aiS -aiT -aiS -aiS -aiS -aiS -aiS -aiT -aiS -aiS +atp +oyH +atp +atp +atp +npO +oJf +rnf +atp atn atn avm @@ -108665,18 +109120,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abI -aaa +atp +pFT +uyW +cOd +gdN +aoG +uvY +mqQ +efW +vue +atp +mZE aaa aaa abI @@ -108922,17 +109377,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +pBy +xLE +xLE +xLE +cSV +nPI +nbX +ier +ttf +atp aaa aaa aaa @@ -109179,17 +109634,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +tYe +eKq +hTR +nwA +atp +nzh +jMp +atp +atp +atp aaa aaa aaa @@ -109436,17 +109891,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +atp +bSg +sSp +qEq +wfy +gXB +hTR +geb +hTR +atp aaa aaa aaa @@ -109694,16 +110149,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +vTF +nbX +vMQ +sxR +atp +atp +rnj +atp +atp aaa aaa aaa @@ -109951,16 +110406,16 @@ rmC rmC rmC rmC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +gDY +gdS +hTR +udp +atp +ktt +fDd +izp +atp abN aaa aaa @@ -110208,16 +110663,16 @@ rmC rmC rmC rmC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +atp +atp +atp +atp +atp +atp +atp +atp +atp +atp aaa aaa aaa diff --git a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm index aeab3ca747..7d76fe556a 100644 --- a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm +++ b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm @@ -748,6 +748,18 @@ /obj/machinery/power/apc/auto_name/east, /turf/open/floor/plating, /area/maintenance/port/fore) +"afQ" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "afU" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/dark, @@ -2896,6 +2908,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, /area/hallway/primary/port) +"aFX" = ( +/obj/effect/landmark/start/brigdoc, +/turf/open/floor/plasteel/white, +/area/security) "aFY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 @@ -4047,6 +4063,14 @@ /obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"aZi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "aZz" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -11493,6 +11517,9 @@ "dAV" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) +"dBs" = ( +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "dBL" = ( /obj/structure/closet/secure_closet/medical1, /obj/structure/extinguisher_cabinet{ @@ -12206,6 +12233,17 @@ }, /turf/open/floor/wood, /area/service/bar) +"dVF" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin{ + pixel_x = -5 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "dVG" = ( /obj/structure/cable{ icon_state = "2-8" @@ -12418,6 +12456,18 @@ }, /turf/open/floor/wood, /area/command/meeting_room) +"ebE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "ebF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -13090,6 +13140,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/dark, /area/command/gateway) +"ete" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors) "ets" = ( /obj/machinery/camera{ c_tag = "Medbay Treatment Center"; @@ -14140,6 +14194,19 @@ }, /turf/open/floor/plating, /area/hallway/primary/central) +"eOT" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + amount = 20 + }, +/obj/item/storage/box/matches, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "eOZ" = ( /obj/machinery/atmospherics/components/binary/pump/on, /turf/open/floor/plasteel/dark, @@ -15771,6 +15838,12 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plasteel/freezer, /area/commons/toilet) +"fCW" = ( +/obj/structure/fireplace{ + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "fDi" = ( /turf/closed/wall, /area/medical/psychology) @@ -16680,6 +16753,15 @@ /obj/item/stack/tile/carpet/fifty, /turf/open/floor/plating, /area/maintenance/bar) +"fWR" = ( +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "fXa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 9 @@ -18534,6 +18616,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/engineering/atmos) +"gPz" = ( +/obj/machinery/light, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "gPF" = ( /obj/machinery/light/small{ dir = 8 @@ -19272,6 +19358,19 @@ /obj/item/instrument/piano_synth, /turf/open/floor/plasteel/cafeteria, /area/security/prison) +"hko" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/exit/departure_lounge) "hkL" = ( /obj/item/clothing/head/cone, /turf/open/floor/plating, @@ -21671,6 +21770,15 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "ijL" = ( @@ -23646,6 +23754,15 @@ /obj/item/kirbyplants{ icon_state = "plant-05" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "jdS" = ( @@ -24951,6 +25068,18 @@ dir = 8 }, /area/commons/fitness/pool) +"jIN" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/item/pen, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "jJb" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /turf/closed/wall/r_wall, @@ -25231,6 +25360,13 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmospherics_engine) +"jPo" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "jPz" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -26093,6 +26229,15 @@ /obj/structure/railing/corner{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "kkc" = ( @@ -26518,6 +26663,18 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) +"ksi" = ( +/obj/structure/table/wood, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "ksq" = ( /obj/effect/turf_decal/bot_white, /obj/structure/cable{ @@ -27210,6 +27367,15 @@ dir = 1 }, /obj/machinery/vending/kink, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "kJO" = ( @@ -27279,6 +27445,18 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"kLz" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "kLQ" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/dark, @@ -27742,6 +27920,15 @@ }, /turf/open/floor/wood, /area/icemoon/surface/outdoors) +"kWO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/structure/dresser, +/obj/item/reagent_containers/food/drinks/flask, +/obj/item/export/bottle/whiskey, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "kXY" = ( /obj/structure/cable{ icon_state = "1-8" @@ -27988,6 +28175,15 @@ dir = 1 }, /obj/machinery/gear_painter, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "leq" = ( @@ -29529,6 +29725,12 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) +"lRF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "lRV" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -30126,6 +30328,23 @@ }, /turf/open/floor/carpet, /area/service/library) +"mdJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Blueshield"; + req_access_txt = "19" + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "meG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -30863,6 +31082,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"myr" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "myZ" = ( /obj/structure/cable{ icon_state = "1-4" @@ -31635,6 +31860,15 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "mPA" = ( @@ -32305,6 +32539,15 @@ /obj/item/kirbyplants{ icon_state = "plant-05" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "nek" = ( @@ -32809,6 +33052,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/commons/dorms) +"nrZ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/secure_data/laptop, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "nsf" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -32869,6 +33117,15 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"ntN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Blueshield's Quarters"; + req_access_txt = "19" + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "ntO" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -35034,6 +35291,14 @@ }, /turf/open/floor/plasteel, /area/commons/storage/primary) +"one" = ( +/obj/item/bedsheet/blue/double, +/obj/structure/bed/double, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "onm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36571,6 +36836,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"pbl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "pbs" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -38122,6 +38396,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/security/prison) +"pEN" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/folder/blue, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "pFf" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel, @@ -39356,6 +39639,15 @@ dir = 1 }, /obj/machinery/vending/clothing, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "qgZ" = ( @@ -43347,6 +43639,15 @@ dir = 1 }, /obj/machinery/vending/autodrobe, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "rVt" = ( @@ -43928,6 +44229,12 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"skJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors) "skT" = ( /obj/machinery/light{ dir = 4 @@ -44309,6 +44616,15 @@ }, /turf/open/floor/plasteel, /area/cargo/miningdock) +"suX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "sve" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -44447,6 +44763,15 @@ /obj/structure/sign/poster/official/fashion{ pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "syz" = ( @@ -44816,6 +45141,16 @@ /obj/structure/chair/comfy/brown, /turf/open/floor/carpet, /area/service/library) +"sGX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/camera{ + c_tag = "Blueshield"; + dir = 4 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "sHd" = ( /obj/structure/table, /obj/item/folder/white{ @@ -46600,6 +46935,21 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"tws" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/structure/sink{ + pixel_y = 25 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "twU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47751,6 +48101,13 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/wataur, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"tYQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "tYT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48124,6 +48481,22 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"ugk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = 25 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "ugr" = ( /obj/machinery/button/door{ id = "Bath1"; @@ -48599,6 +48972,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"uvA" = ( +/obj/machinery/power/apc{ + areastring = "/area/security/brig"; + dir = 1; + name = "Blueshield's Office APC"; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "uvB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -50205,6 +50594,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"vhS" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors) "vhT" = ( /obj/machinery/space_heater, /turf/open/floor/plasteel, @@ -51335,6 +51730,22 @@ /obj/item/pickaxe, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"vGI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Blueshield's Office Maintenance"; + req_access_txt = "19" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "vGT" = ( /turf/open/floor/wood, /area/service/library) @@ -52498,6 +52909,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/starboard/fore) +"wgQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/exit/departure_lounge) "wha" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o{ dir = 1 @@ -53156,6 +53579,10 @@ }, /turf/open/floor/carpet, /area/service/library) +"wvi" = ( +/obj/structure/closet/secure_closet/brigdoc, +/turf/open/floor/plasteel/white, +/area/security) "wvj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -53689,6 +54116,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"wJL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "wJN" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -53719,6 +54150,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark, /area/hallway/primary/starboard) +"wKa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/effect/landmark/start/blueshield, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "wKC" = ( /obj/machinery/firealarm{ dir = 8; @@ -54876,6 +55314,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/miningdock) +"xob" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/icemoon/surface/outdoors) "xok" = ( /obj/structure/railing/corner{ dir = 1 @@ -55888,10 +56335,14 @@ /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "xOV" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating/asteroid/snow/icemoon, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "xOY" = ( /obj/effect/spawner/structure/window/reinforced, @@ -56073,6 +56524,15 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/port) +"xTt" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/icemoon/surface/outdoors) "xTw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -85522,7 +85982,7 @@ xal xhZ thQ uqV -jAV +wvi dqL cMZ thQ @@ -86036,7 +86496,7 @@ fKC fKC thQ rlp -jAV +aFX epU aMc thQ @@ -89865,7 +90325,7 @@ beo beo beo tJA -beo +xOV beo rmQ wZl @@ -90122,7 +90582,7 @@ wdk iFm wdk eVp -wdk +hko wdk bnE fqE @@ -90379,7 +90839,7 @@ ceJ daX uBa uBa -tif +wgQ cMP lbp ceA @@ -90636,7 +91096,7 @@ pcd piX hJw uBa -tif +wgQ faZ bwx bvl @@ -93720,7 +94180,7 @@ rJO xUL pZl bok -tif +wgQ sEJ unA vAs @@ -93977,7 +94437,7 @@ avT avT xUL unA -tif +wgQ xws pce vAs @@ -94234,7 +94694,7 @@ avT avT xUL unA -tif +wgQ jcp unA vAs @@ -94491,7 +94951,7 @@ avT avT xUL unA -tif +wgQ mxI bok vAs @@ -94748,7 +95208,7 @@ avT avT xUL bok -bok +vGI bok bok bok @@ -95004,9 +95464,9 @@ avT avT avT xUL -avT -avT -avT +xiw +ebE +xiw avT avT avT @@ -95261,12 +95721,12 @@ avT avT avT xUL -avT -avT -avT -avT -avT -avT +xiw +ebE +xiw +xiw +xiw +xiw bLT bIm bIm @@ -95518,13 +95978,13 @@ avT avT avT xUL -avT -avT -avT -avT -avT -avT -xnP +xiw +kLz +aZi +aZi +afQ +xiw +bLT qJV qJV brY @@ -95775,12 +96235,12 @@ avT avT avT xUL -avT -avT -avT -avT -avT -avT +xiw +xiw +xiw +xiw +ebE +xiw bLT xnP xnP @@ -96035,9 +96495,9 @@ xUL avT avT avT -avT -avT -avT +xiw +ebE +xiw avT avT avT @@ -96289,14 +96749,14 @@ avT avT avT xUL -avT -avT -avT -avT -avT -avT -avT -avT +xiw +xiw +xiw +xiw +mdJ +xiw +xiw +xiw avT avT avT @@ -96546,14 +97006,14 @@ avT avT avT xUL -avT -avT -avT -avT -avT -avT -avT -avT +xiw +uvA +xTt +sGX +ugk +pEN +xob +wJL avT avT avT @@ -96803,14 +97263,14 @@ xUL xUL xUL xiw -xOV -avT -avT -avT -avT -avT -avT -avT +bok +dVF +ksi +eOT +pbl +nrZ +myr +wJL avT avT avT @@ -97060,14 +97520,14 @@ avT avT avT hho -avT -avT -avT -avT -avT -avT -avT -avT +xiw +skJ +vhS +ete +tws +jIN +gPz +xiw avT avT avT @@ -97317,14 +97777,14 @@ avT avT avT avT -avT -avT -avT -avT -avT -avT -avT -avT +xiw +kWO +wKa +ntN +lRF +tYQ +dBs +wJL avT avT avT @@ -97574,14 +98034,14 @@ avT avT avT avT -avT -avT -avT -avT -avT -avT -avT -avT +xiw +one +suX +xiw +fCW +fWR +jPo +wJL avT avT avT @@ -97831,14 +98291,14 @@ ydp ydp ydp avT -avT -avT -avT -avT -avT -avT -avT -avT +xiw +xiw +xiw +xiw +xiw +xiw +xiw +xiw avT avT avT diff --git a/auxmos b/auxmos index 531c270128..d4e49afbc4 160000 --- a/auxmos +++ b/auxmos @@ -1 +1 @@ -Subproject commit 531c27012870aa2d536c856ea215ab4fac5a2a6d +Subproject commit d4e49afbc434ebff077245ea2cbb2a2903fbb28a diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index d4ab59cbc1..345a8f9e87 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -12,6 +12,8 @@ #define ROBOTICIST (1<<8) #define AI_JF (1<<9) #define CYBORG (1<<10) +#define BRIGDOC (1<<11) +#define BLUESHIELD (1<<12) #define MEDSCI (1<<1) @@ -59,35 +61,37 @@ #define JOB_DISPLAY_ORDER_ASSISTANT 1 #define JOB_DISPLAY_ORDER_CAPTAIN 2 -#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3 -#define JOB_DISPLAY_ORDER_QUARTERMASTER 4 -#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5 -#define JOB_DISPLAY_ORDER_SHAFT_MINER 6 -#define JOB_DISPLAY_ORDER_BARTENDER 7 -#define JOB_DISPLAY_ORDER_COOK 8 -#define JOB_DISPLAY_ORDER_BOTANIST 9 -#define JOB_DISPLAY_ORDER_JANITOR 10 -#define JOB_DISPLAY_ORDER_CLOWN 11 -#define JOB_DISPLAY_ORDER_MIME 12 -#define JOB_DISPLAY_ORDER_CURATOR 13 -#define JOB_DISPLAY_ORDER_LAWYER 14 -#define JOB_DISPLAY_ORDER_CHAPLAIN 15 -#define JOB_DISPLAY_ORDER_AI 16 -#define JOB_DISPLAY_ORDER_CYBORG 17 -#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18 -#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19 -#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20 -#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21 -#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22 -#define JOB_DISPLAY_ORDER_PARAMEDIC 23 -#define JOB_DISPLAY_ORDER_CHEMIST 24 -#define JOB_DISPLAY_ORDER_VIROLOGIST 25 -#define JOB_DISPLAY_ORDER_GENETICIST 26 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 -#define JOB_DISPLAY_ORDER_SCIENTIST 28 -#define JOB_DISPLAY_ORDER_ROBOTICIST 29 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 -#define JOB_DISPLAY_ORDER_WARDEN 31 -#define JOB_DISPLAY_ORDER_DETECTIVE 32 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 -#define JOB_DISPLAY_ORDER_PRISONER 34 +#define JOB_DISPLAY_ORDER_BLUESHIELD 2 +#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 4 +#define JOB_DISPLAY_ORDER_QUARTERMASTER 5 +#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 6 +#define JOB_DISPLAY_ORDER_SHAFT_MINER 7 +#define JOB_DISPLAY_ORDER_BARTENDER 8 +#define JOB_DISPLAY_ORDER_COOK 9 +#define JOB_DISPLAY_ORDER_BOTANIST 10 +#define JOB_DISPLAY_ORDER_JANITOR 11 +#define JOB_DISPLAY_ORDER_CLOWN 12 +#define JOB_DISPLAY_ORDER_MIME 13 +#define JOB_DISPLAY_ORDER_CURATOR 14 +#define JOB_DISPLAY_ORDER_LAWYER 15 +#define JOB_DISPLAY_ORDER_CHAPLAIN 16 +#define JOB_DISPLAY_ORDER_AI 17 +#define JOB_DISPLAY_ORDER_CYBORG 18 +#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 19 +#define JOB_DISPLAY_ORDER_STATION_ENGINEER 20 +#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 21 +#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 22 +#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 23 +#define JOB_DISPLAY_ORDER_PARAMEDIC 24 +#define JOB_DISPLAY_ORDER_CHEMIST 25 +#define JOB_DISPLAY_ORDER_VIROLOGIST 26 +#define JOB_DISPLAY_ORDER_GENETICIST 27 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 28 +#define JOB_DISPLAY_ORDER_SCIENTIST 29 +#define JOB_DISPLAY_ORDER_ROBOTICIST 30 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 31 +#define JOB_DISPLAY_ORDER_WARDEN 32 +#define JOB_DISPLAY_ORDER_DETECTIVE 33 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 34 +#define JOB_DISPLAY_ORDER_BRIG_PHYSICIAN 35 +#define JOB_DISPLAY_ORDER_PRISONER 36 diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 86fafbead7..ade5a7a4dd 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -352,10 +352,10 @@ return "Code Scotch" /proc/get_all_jobs() - return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", + return list("Assistant", "Captain", "Blueshield", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner") + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Prisoner") diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index d91b102599..585b9ba45b 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -5,7 +5,8 @@ GLOBAL_LIST_INIT(command_positions, list( "Chief Engineer", "Research Director", "Chief Medical Officer", - "Quartermaster")) + "Quartermaster", + "Blueshield")) GLOBAL_LIST_INIT(engineering_positions, list( "Chief Engineer", @@ -50,7 +51,8 @@ GLOBAL_LIST_INIT(security_positions, list( "Head of Security", "Warden", "Detective", - "Security Officer")) + "Security Officer", + "Brig Physician")) GLOBAL_LIST_INIT(nonhuman_positions, list( diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index ad25e0065c..f969fdbcd5 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 1bd94f2424..64a4e78a5b 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/modular_splurt/code/modules/clothing/suits/vest.dm b/modular_splurt/code/modules/clothing/suits/vest.dm new file mode 100644 index 0000000000..0432001f9d --- /dev/null +++ b/modular_splurt/code/modules/clothing/suits/vest.dm @@ -0,0 +1,23 @@ +/obj/item/clothing/suit/brigdoc + name = "brig physician vest" + desc = "A dark red vests for brig physicians." + icon = 'modular_splurt/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi' + icon_state = "brigphysicianvest" + item_state = "brigphysicianvest" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + +/obj/item/clothing/suit/armor/vest/bluesheid + name = "bluesheid armored vest" + desc = "A lightweight vest with a bluesheid on it." + icon = 'modular_splurt/icons/obj/clothing/suits.dmi' + mob_overlay_icon = 'modular_splurt/icons/mobs/suits.dmi' + icon_state = "blueshield" + item_state = "blueshield" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + +/obj/item/clothing/suit/armor/vest/bluesheid/coat + name = "bluesheid armored coat" + desc = "A fastional piece of armored style." + icon_state = "blueshieldcoat" + item_state = "blueshieldcoat" diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm index c3837e3e2f..0e46f683af 100644 --- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm @@ -72,3 +72,47 @@ can_adjust = FALSE mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' mutantrace_variation = NONE + +/obj/item/clothing/under/rank/brigdoc + name = "brig physician outfit" + desc = "The uniform of the Brig Physician. Do know harm." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mobs/uniforms.dmi' + icon_state = "brigphys" + item_state = "brigphys" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 20, "acid" = 30, "wound" = 10) + can_adjust = FALSE + strip_delay = 50 + alt_covers_chest = TRUE + sensor_mode = SENSOR_COORDS + sensor_flags = NONE + +/obj/item/clothing/under/rank/brigdoc/skirt + name = "brig physician skirt" + desc = "The uniform of the Brig Physician. Do know harm, with a skirt" + icon_state = "brigphysf" + item_state = "brigphysf" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + +/obj/item/clothing/under/rank/blueshield + name = "blueshield outfit" + desc = "The uniform of the Blueshield. It makes you feel protected" + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mobs/uniforms.dmi' + icon_state = "blueshield" + item_state = "blueshield" + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 30, "wound" = 10) + can_adjust = FALSE + strip_delay = 50 + alt_covers_chest = TRUE + sensor_mode = SENSOR_COORDS + sensor_flags = NONE + + +/obj/item/clothing/under/rank/blueshield/skirt + name = "blueshield skirt" + desc = "The uniform of the Blueshield. It makes you feel protected, even with a bit of a breeze." + icon_state = "blueshieldf" + item_state = "blueshieldf" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + diff --git a/modular_splurt/code/modules/jobs/job_types/blueshield.dm b/modular_splurt/code/modules/jobs/job_types/blueshield.dm new file mode 100644 index 0000000000..014c0ddd20 --- /dev/null +++ b/modular_splurt/code/modules/jobs/job_types/blueshield.dm @@ -0,0 +1,82 @@ +/datum/job/blueshield + title = "Blueshield" + flag = BLUESHIELD + department_head = list("Heads of Staff") + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + selection_color = "#aac1ee" + minimal_player_age = 7 + exp_requirements = 300 + exp_type = EXP_TYPE_COMMAND + considered_combat_role = TRUE //Brigger then shit yes it is + exp_type_department = EXP_TYPE_COMMAND + alt_titles = list("Command Security", "Command Guard", "Command Bodyguard", "Blueshit") + + + outfit = /datum/outfit/job/blueshield + plasma_outfit = /datum/outfit/plasmaman/blueshield + + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_HEADS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_HEADS) + paycheck = PAYCHECK_COMMAND + paycheck_department = ACCOUNT_SEC + + mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) + + display_order = JOB_DISPLAY_ORDER_BLUESHIELD + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia, /datum/quirk/insanity) + threat = 3 + + +/datum/outfit/job/blueshield + name = "Blueshield" + jobtype = /datum/job/blueshield + + belt = /obj/item/pda/security + ears = /obj/item/radio/headset/headset_blueshield + uniform = /obj/item/clothing/under/rank/blueshield + head = /obj/item/clothing/head/helmet/blueshirt + gloves = /obj/item/clothing/gloves/color/black + glasses = /obj/item/clothing/glasses/hud/health/sunglasses + suit = /obj/item/clothing/suit/armor/vest/bluesheid + shoes = /obj/item/clothing/shoes/jackboots + suit_store = /obj/item/gun/energy/e_gun // want to replace with something more custom later + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/assembly/flash/handheld + backpack_contents = list(/obj/item/storage/firstaid/regular, /obj/item/melee/classic_baton/telescopic) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/sec + box = /obj/item/storage/box/survival + + implants = list(/obj/item/implant/mindshield) + + chameleon_extras = list(/obj/item/storage/firstaid/regular) + +/datum/outfit/plasmaman/blueshield + name = "Blueshield" + + head = /obj/item/clothing/head/helmet/space/plasmaman/security/hos //need to make custom sprites for the plasmaman + uniform = /obj/item/clothing/under/plasmaman/security/hos + ears = /obj/item/radio/headset/headset_blueshield + +/obj/item/radio/headset/headset_blueshield + name = "blueshield bowman headset" + desc = "This is used by the blueshield. It protects from flashbangs" + icon_state = "com_headset_alt" + item_state = "com_headset_alt" + keyslot = new /obj/item/encryptionkey/headset_blueshield + bowman = TRUE + + +/obj/item/encryptionkey/headset_blueshield + name = "blueshield radio encryption key" + icon_state = "com_cypherkey" + channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_MEDICAL = 1) + +/obj/effect/landmark/start/blueshield + name = "Blueshield" + icon_state = "Security Officer" diff --git a/modular_splurt/code/modules/jobs/job_types/brigdoc.dm b/modular_splurt/code/modules/jobs/job_types/brigdoc.dm new file mode 100644 index 0000000000..7797c0e254 --- /dev/null +++ b/modular_splurt/code/modules/jobs/job_types/brigdoc.dm @@ -0,0 +1,85 @@ +/datum/job/brigdoc + title = "Brig Physician" + flag = BRIGDOC +// auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY + department_head = list("Head of Security") + department_flag = ENGSEC + faction = "Station" + total_positions = 1 //Handled in /datum/controller/occupations/proc/setup_officer_positions() + spawn_positions = 1 //Handled in /datum/controller/occupations/proc/setup_officer_positions() + supervisors = "the head of security, and the head of your assigned department (if applicable)" + selection_color = "#c02f2f" + minimal_player_age = 7 + exp_requirements = 300 + exp_type = EXP_TYPE_MEDICAL + considered_combat_role = TRUE + exp_type_department = EXP_TYPE_MEDICAL + alt_titles = list("Security Doctor", "Security Medic", "Brig Doctor", "Brig EMT", "Security Physician", "Security EMT", "Police Doctor") + + + outfit = /datum/outfit/job/brigdoc + plasma_outfit = /datum/outfit/plasmaman/brigdoc + + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access() + paycheck = PAYCHECK_MEDIUM + paycheck_department = ACCOUNT_SEC + + mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) + + display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN + blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia) + threat = 2 + +/datum/outfit/job/brigdoc + name = "Brig Physician" + jobtype = /datum/job/brigdoc + + belt = /obj/item/pda/security + ears = /obj/item/radio/headset/headset_brigdoc/alt + uniform = /obj/item/clothing/under/rank/brigdoc + gloves = /obj/item/clothing/gloves/color/latex + glasses = /obj/item/clothing/glasses/hud/health/sunglasses + suit = /obj/item/clothing/suit/brigdoc + shoes = /obj/item/clothing/shoes/jackboots + l_pocket = /obj/item/reagent_containers/spray/pepper + r_pocket = /obj/item/assembly/flash/handheld + backpack_contents = list(/obj/item/storage/hypospraykit/regular, /obj/item/storage/firstaid/regular, /obj/item/melee/classic_baton/telescopic) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel/sec + duffelbag = /obj/item/storage/backpack/duffelbag/sec + box = /obj/item/storage/box/survival/security + + implants = list(/obj/item/implant/mindshield) + + chameleon_extras = list(/obj/item/storage/firstaid/regular) + +/datum/outfit/plasmaman/brigdoc + name = "Brig Physician" + + head = /obj/item/clothing/head/helmet/space/plasmaman/security + uniform = /obj/item/clothing/under/plasmaman/security + ears = /obj/item/radio/headset/headset_brigdoc + +/obj/item/radio/headset/headset_brigdoc + name = "security radio headset" + desc = "This is used by your elite security force's brig physician." + icon_state = "sec_headset" + keyslot = new /obj/item/encryptionkey/headset_brigdoc + +/obj/item/radio/headset/headset_brigdoc/alt + name = "brig physician bowman headset" + desc = "This is used by your elite security force's brig physician. Protects ears from flashbangs." + icon_state = "sec_headset_alt" + item_state = "sec_headset_alt" + bowman = TRUE + +/obj/item/encryptionkey/headset_brigdoc + name = "brig physician radio encryption key" + icon_state = "sec_cypherkey" + channels = list(RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_MEDICAL = 1) + +/obj/effect/landmark/start/brigdoc + name = "Brig Physician" + icon_state = "Security Officer" diff --git a/modular_splurt/code/modules/vending/security.dm b/modular_splurt/code/modules/vending/security.dm index 650bb8c154..6cf20b6e39 100644 --- a/modular_splurt/code/modules/vending/security.dm +++ b/modular_splurt/code/modules/vending/security.dm @@ -15,3 +15,33 @@ ) LAZYADD(products, extra_products) . = ..() + +/obj/structure/closet/secure_closet/brigdoc + name = "brig physician's locker" + req_access = list(ACCESS_MEDICAL) + icon_state = "med_secure" + +/obj/structure/closet/secure_closet/brigdoc/PopulateContents() + ..() + new /obj/item/clothing/under/rank/brigdoc(src) + new /obj/item/clothing/under/rank/brigdoc/skirt(src) + new /obj/item/radio/headset/headset_brigdoc(src) + new /obj/item/radio/headset/headset_brigdoc/alt(src) + new /obj/item/flashlight/seclite(src) + +/obj/structure/closet/secure_closet/blueshield + name = "blueshield's locker" + req_access = list(ACCESS_HEADS) + icon_state = "tac" + +/obj/structure/closet/secure_closet/blueshield/PopulateContents() + ..() + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/head/helmet/sec(src) + new /obj/item/radio/headset/headset_blueshield(src) + new /obj/item/clothing/glasses/hud/security/sunglasses(src) + new /obj/item/flashlight/seclite(src) + new /obj/item/clothing/under/rank/blueshield(src) + new /obj/item/clothing/under/rank/blueshield/skirt(src) + new /obj/item/clothing/head/helmet/blueshirt(src) + new /obj/item/storage/belt/security(src) diff --git a/modular_splurt/icons/mob/clothing/uniform_digi.dmi b/modular_splurt/icons/mob/clothing/uniform_digi.dmi index 2496ba2053..d0bfd9b032 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform_digi.dmi and b/modular_splurt/icons/mob/clothing/uniform_digi.dmi differ diff --git a/modular_splurt/icons/mobs/suits.dmi b/modular_splurt/icons/mobs/suits.dmi index a2dcf641ae..1369bc912a 100644 Binary files a/modular_splurt/icons/mobs/suits.dmi and b/modular_splurt/icons/mobs/suits.dmi differ diff --git a/modular_splurt/icons/mobs/uniforms.dmi b/modular_splurt/icons/mobs/uniforms.dmi index 89868e8c4f..62a8e8a42d 100644 Binary files a/modular_splurt/icons/mobs/uniforms.dmi and b/modular_splurt/icons/mobs/uniforms.dmi differ diff --git a/modular_splurt/icons/obj/clothing/suits.dmi b/modular_splurt/icons/obj/clothing/suits.dmi index 9d90fd06c8..a06b475462 100644 Binary files a/modular_splurt/icons/obj/clothing/suits.dmi and b/modular_splurt/icons/obj/clothing/suits.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index f241ea703c..4ae1c10b4d 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index eaf056b34a..f426820b02 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4289,6 +4289,7 @@ #include "modular_splurt\code\modules\clothing\neck\_neck.dm" #include "modular_splurt\code\modules\clothing\shoes\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\suits\cloaks.dm" +#include "modular_splurt\code\modules\clothing\suits\vest.dm" #include "modular_splurt\code\modules\clothing\under\miscellaneous.dm" #include "modular_splurt\code\modules\discord\accountlink.dm" #include "modular_splurt\code\modules\discord\discord_link_record.dm" @@ -4297,6 +4298,8 @@ #include "modular_splurt\code\modules\food_and_drinks\food\snacks.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\drink_recipes.dm" #include "modular_splurt\code\modules\hydroponics\grown\towercap.dm" +#include "modular_splurt\code\modules\jobs\job_types\blueshield.dm" +#include "modular_splurt\code\modules\jobs\job_types\brigdoc.dm" #include "modular_splurt\code\modules\jobs\job_types\command.dm" #include "modular_splurt\code\modules\jobs\job_types\prisoner.dm" #include "modular_splurt\code\modules\jobs\job_types\security_officer.dm"