diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index 5e94766ac86..8e05fe85242 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -305,7 +305,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "adB" = ( -/obj/structure/closet/secure_closet/security_medic, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/red, /area/station/security/medical) @@ -8981,7 +8980,6 @@ "cuc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, -/mob/living/simple_animal/pet/dog/markus, /obj/machinery/holopad, /turf/open/floor/iron, /area/station/cargo/office) @@ -18828,7 +18826,6 @@ "fSO" = ( /obj/structure/flora/bush/fullgrass, /obj/structure/flora/bush/lavendergrass, -/mob/living/simple_animal/pet/bumbles, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 5 }, @@ -72879,7 +72876,6 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "xWK" = ( -/mob/living/simple_animal/pet/poppy, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm index 257a7bceb83..861fc52d18e 100644 --- a/_maps/map_files/Blueshift/BlueShift_upper.dmm +++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm @@ -45387,7 +45387,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/vending/access/command, +/obj/machinery/vending/autodrobe/all_access, /turf/open/floor/iron/dark, /area/station/command/meeting_room/council) "pqB" = ( diff --git a/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm b/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm index 2e1c29f5971..81745b26e15 100644 --- a/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm +++ b/_maps/map_files/Map_Reset/Skyrat_Map_Reset.dmm @@ -102,16 +102,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) -"al" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/glass/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "am" = ( /obj/machinery/door/window/brigdoor{ id = "scicell"; @@ -276,11 +266,6 @@ /obj/structure/sign/warning/docking/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"aC" = ( -/turf/closed/wall/rock{ - name = "TRAM 61, 149" - }, -/area/space) "aD" = ( /obj/effect/spawner/random/structure/girder{ loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50); @@ -716,18 +701,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"br" = ( -/obj/item/storage/box/bodybags, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/syringe{ - name = "steel point" - }, -/obj/item/reagent_containers/glass/bottle/multiver, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/structure/table/glass, -/obj/structure/window/reinforced, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "bs" = ( /obj/machinery/button/curtain{ id = "prisoncell4"; @@ -769,8 +742,8 @@ name = "Privacy Shutter" }, /obj/machinery/door/window/brigdoor/right/directional/east{ - req_access = list("brig_entrance"); - name = "Orderly Office's Desk" + name = "Orderly Office's Desk"; + req_access = list("brig_entrance") }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) @@ -942,21 +915,6 @@ dir = 8 }, /area/station/security/execution) -"bO" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "bP" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -1144,9 +1102,6 @@ "cj" = ( /turf/closed/wall/r_wall, /area/station/security/lockers) -"ck" = ( -/turf/closed/wall/r_wall, -/area/station/maintenance/port/fore) "cl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1167,18 +1122,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"cn" = ( -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary" - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "cp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -1201,13 +1144,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/blue/side, /area/brigofficer) -"cu" = ( -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "cv" = ( /obj/structure/bed/pod, /obj/effect/turf_decal/tile/purple{ @@ -1329,11 +1265,6 @@ icon_state = "platingdmg3" }, /area/station/maintenance/fore) -"cJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "cK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -1638,10 +1569,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/common/cryopods) -"dw" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, -/area/station/security/medical) "dx" = ( /turf/closed/wall/rust, /area/space/nearstation) @@ -1844,32 +1771,12 @@ }, /turf/open/floor/plating, /area/service/salon) -"dU" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/machinery/camera/directional/east{ - c_tag = "Security Infirmary" - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "dV" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) -"dW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/landmark/start/security_medic, -/turf/open/floor/iron/white, -/area/station/security/medical) "dX" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -2042,17 +1949,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/prison) -"eu" = ( -/obj/machinery/door/window/left/directional/west{ - dir = 4; - name = "Infirmary" - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "ev" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -2192,24 +2088,9 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/security/armory/upper) -"eI" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/medical) "eJ" = ( /turf/open/space/openspace, /area/space) -"eK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/security_medic, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "eL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -2250,13 +2131,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/purple/side, /area/station/security/prison/safe) -"eO" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/closet/secure_closet/security_medic, -/turf/open/floor/iron/dark, -/area/station/security/medical) "eP" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/stripes/line{ @@ -2433,16 +2307,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/mess) -"fe" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/structure/closet/secure_closet/security_medic, -/turf/open/floor/iron/white, -/area/station/security/medical) "ff" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -2496,19 +2360,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/security/prison/garden) -"fn" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/vending/wallmed/directional/east, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "fo" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -3134,11 +2985,6 @@ }, /turf/open/space, /area/space) -"gJ" = ( -/turf/closed/wall/rock{ - name = "BOX 114, 174, 3" - }, -/area/space) "gK" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -3283,16 +3129,6 @@ /obj/effect/landmark/start/science_guard, /turf/open/floor/iron, /area/station/security/checkpoint/science/research) -"gZ" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "ha" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -3352,9 +3188,6 @@ }, /turf/open/floor/iron, /area/service/salon) -"hg" = ( -/turf/closed/wall, -/area/station/security/warden) "hh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3504,25 +3337,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/work) -"hB" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "hC" = ( /turf/closed/wall/rust, /area/station/security/checkpoint/engineering) @@ -3618,9 +3432,6 @@ "hM" = ( /turf/closed/wall/r_wall, /area/station/security/prison) -"hN" = ( -/turf/closed/wall/rust, -/area/station/security/warden) "hO" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -3733,15 +3544,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/mess) -"hZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) -"ia" = ( -/turf/closed/wall/rust, -/area/station/security/medical) "ib" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permainner"; @@ -4270,11 +4072,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/prison/mess) -"iW" = ( -/turf/closed/wall/rock{ - name = "DELTA 193, 150" - }, -/area/space) "iX" = ( /obj/effect/turf_decal/siding/white{ dir = 6 @@ -4613,18 +4410,6 @@ }, /turf/open/floor/plating, /area/station/security/prison/garden) -"jM" = ( -/obj/structure/bed, -/obj/machinery/iv_drip, -/obj/item/bedsheet/medical, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "jN" = ( /obj/effect/turf_decal/tile{ dir = 1 @@ -4719,12 +4504,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/rust, /area/station/security/prison/mess) -"jX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "jY" = ( /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, @@ -4834,8 +4613,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/right/directional/north{ - req_access = list("brig_entrance"); - name = "Orderly Office's Desk" + name = "Orderly Office's Desk"; + req_access = list("brig_entrance") }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) @@ -4862,8 +4641,8 @@ /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/flowers_pp/style_random, /obj/item/toy/plush/lizard_plushie{ - name = "Tends-The-Garden"; - desc = "A cute little lizard plushie. It has some soot on it." + desc = "A cute little lizard plushie. It has some soot on it."; + name = "Tends-The-Garden" }, /turf/open/floor/grass, /area/station/common/cryopods) @@ -5292,14 +5071,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"lk" = ( -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table/glass, -/obj/structure/window/reinforced, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "ll" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -5316,19 +5087,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"lm" = ( -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Brig Infirmary" - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/corner, -/turf/open/floor/iron/white, -/area/station/security/medical) "ln" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/effect/spawner/random/contraband/armory, @@ -5557,13 +5315,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) -"lO" = ( -/obj/item/radio/intercom/directional/north, -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "lP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5613,19 +5364,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"lV" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/regular, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/white, -/area/station/security/medical) "lW" = ( /obj/item/radio/intercom/directional/west, /obj/structure/closet/secure_closet/security/science, @@ -5825,11 +5563,6 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/common/cryopods) -"ms" = ( -/obj/structure/bed, -/obj/effect/turf_decal/trimline/red/filled/line, -/turf/open/floor/iron/white, -/area/station/security/medical) "mt" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -6360,10 +6093,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/fore) -"nA" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/office) "nB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/corner{ @@ -6796,17 +6525,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"ox" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/sign/departments/medbay/alt/directional/south, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/medical) "oy" = ( /obj/machinery/computer/crew{ dir = 1 @@ -7213,9 +6931,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"pv" = ( -/turf/closed/wall, -/area/station/security/medical) "pw" = ( /turf/open/floor/iron/dark/red/side{ dir = 10 @@ -7237,17 +6952,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"pA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "pB" = ( /obj/item/toy/beach_ball/holoball, /obj/effect/decal/cleanable/dirt, @@ -7302,8 +7006,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/left/directional/north{ - req_access = list("brig_entrance"); - name = "Orderly Office's Desk" + name = "Orderly Office's Desk"; + req_access = list("brig_entrance") }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) @@ -7673,23 +7377,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, /area/space/nearstation) -"qA" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/item/storage/box/bodybags, -/obj/item/reagent_containers/glass/bottle/multiver, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/camera{ - c_tag = "Security - Medical Center"; - dir = 10; - network = list("ss13","Security") - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "qB" = ( /obj/structure/chair{ dir = 1 @@ -7755,14 +7442,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"qL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, -/area/station/security/medical) "qM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/purple{ @@ -7793,15 +7472,6 @@ dir = 6 }, /area/station/security/prison/safe) -"qQ" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/white, -/area/station/security/medical) "qR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple{ @@ -7820,23 +7490,11 @@ /obj/structure/closet/wardrobe/white, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"qU" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/security/medical) "qV" = ( /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/side, /area/station/security/prison) -"qW" = ( -/turf/closed/wall, -/area/station/security/office) "qX" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -7868,12 +7526,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/prison) -"rc" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/security_medic, -/turf/open/floor/iron/white, -/area/station/security/medical) "rd" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -7920,8 +7572,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/machinery/button/door/directional/east{ - name = "Abandoned Door Lock"; id = "Abandoned Cell"; + name = "Abandoned Door Lock"; normaldoorcontrol = 1; specialfunctions = 4 }, @@ -8648,11 +8300,6 @@ }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) -"sM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "sN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9132,8 +8779,8 @@ }, /obj/machinery/button/curtain{ id = "barbershopcurtains"; - pixel_y = -26; - pixel_x = 10 + pixel_x = 10; + pixel_y = -26 }, /turf/open/floor/iron/dark, /area/service/salon) @@ -9688,17 +9335,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"vh" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, -/area/station/security/medical) "vi" = ( /turf/closed/wall/rock{ name = "DELTA 215, 93" @@ -10197,16 +9833,6 @@ icon_state = "panelscorched" }, /area/station/maintenance/fore/lesser) -"wn" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Security - Infirmary" - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "wo" = ( /obj/vehicle/ridden/secway, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -10343,17 +9969,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"wD" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/regular, -/obj/structure/table/glass, -/obj/structure/window/reinforced, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "wE" = ( /obj/structure/table, /obj/machinery/door/poddoor/shutters{ @@ -10361,8 +9976,8 @@ name = "Visitation Shutters" }, /obj/machinery/door/window/left/directional/south{ - req_access = list("security"); - name = "Visitation" + name = "Visitation"; + req_access = list("security") }, /turf/open/floor/iron, /area/station/security/prison/visit) @@ -10539,23 +10154,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"wV" = ( -/obj/structure/table, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/small/directional/north, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "wW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10621,15 +10219,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"xe" = ( -/obj/structure/table, -/obj/machinery/airalarm/directional/north, -/obj/machinery/computer/med_data/laptop, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "xf" = ( /obj/machinery/washing_machine, /obj/machinery/camera{ @@ -10841,13 +10430,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"xA" = ( -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "xB" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -11013,12 +10595,6 @@ icon = 'icons/turf/floors.dmi' }, /area/station/security/prison/upper) -"xS" = ( -/obj/structure/window/reinforced, -/obj/machinery/holopad, -/obj/structure/closet/secure_closet/security_medic, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "xT" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -11622,16 +11198,6 @@ /obj/effect/landmark/start/customs_agent, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) -"zl" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "zm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11822,11 +11388,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/service/salon) -"zI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "zJ" = ( /obj/machinery/computer/cryopod{ dir = 8; @@ -11896,13 +11457,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory/upper) -"zQ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/security/medical) "zR" = ( /obj/machinery/hydroponics/soil{ desc = "A patch of fertile soil that you can plant stuff in."; @@ -12206,10 +11760,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/upper) -"Av" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, -/area/station/security/office) "Aw" = ( /obj/machinery/computer/security{ dir = 8 @@ -12759,10 +12309,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"BB" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/medical) "BC" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -12811,13 +12357,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/security/prison/upper) -"BJ" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "BK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13011,16 +12550,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"Cj" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Security Medpost" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "Ck" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13205,31 +12734,6 @@ "CA" = ( /turf/closed/wall, /area/station/security/prison/garden) -"CB" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) -"CC" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/white, -/area/station/security/medical) "CD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -13452,13 +12956,6 @@ dir = 10 }, /area/station/security/prison/safe) -"CV" = ( -/obj/structure/bed, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "CW" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red, @@ -13627,9 +13124,6 @@ /obj/effect/landmark/start/science_guard, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"Do" = ( -/turf/closed/wall/r_wall, -/area/station/security/processing) "Dp" = ( /obj/structure/chair{ dir = 1 @@ -13637,12 +13131,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"Dq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "Dr" = ( /obj/structure/sign/barber{ pixel_x = -13 @@ -13728,25 +13216,6 @@ }, /turf/open/floor/iron/stairs, /area/station/hallway/secondary/entry) -"DD" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "DF" = ( /obj/item/radio/off, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13814,13 +13283,6 @@ dir = 10 }, /area/station/security/prison) -"DK" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/closet/secure_closet/security_medic, -/turf/open/floor/iron/white, -/area/station/security/medical) "DL" = ( /obj/structure/chair/comfy{ color = "#596479"; @@ -14050,14 +13512,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/security/prison) -"Ej" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/structure/sign/departments/medbay/alt/directional/north, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "Ek" = ( /obj/structure/railing{ dir = 4 @@ -14277,11 +13731,6 @@ /obj/effect/landmark/start/brigoff, /turf/open/floor/iron/dark/blue/side, /area/brigofficer) -"EM" = ( -/obj/structure/bed/roller, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "EN" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -14414,12 +13863,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, /area/service/salon) -"Fa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "Fb" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -15008,13 +14451,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/common/cryopods) -"Gl" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "Gm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -15431,9 +14867,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"Hh" = ( -/turf/closed/wall/r_wall, -/area/station/security/prison/visit) "Hi" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -15694,9 +15127,6 @@ "HS" = ( /turf/closed/wall, /area/station/security/checkpoint) -"HT" = ( -/turf/open/floor/iron/white, -/area/station/security/medical) "HU" = ( /obj/effect/spawner/structure/window, /obj/structure/cable, @@ -16108,15 +15538,6 @@ "IK" = ( /turf/open/floor/plating, /area/space) -"IL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/landmark/start/security_medic, -/turf/open/floor/iron/white, -/area/station/security/medical) "IM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -16369,18 +15790,6 @@ dir = 10 }, /area/station/security/prison/safe) -"Jo" = ( -/obj/structure/table, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/glass/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "Jp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, @@ -16399,16 +15808,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"Js" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/medical) "Jt" = ( /obj/structure/cable, /obj/machinery/computer/security{ @@ -16459,16 +15858,6 @@ /obj/structure/window/reinforced/spawner, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"Jy" = ( -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/structure/table, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "Jz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/purple, @@ -16517,16 +15906,6 @@ /obj/effect/landmark/start/brigoff, /turf/open/floor/iron/dark/blue, /area/brigofficer) -"JF" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/secure_closet/security_medic, -/turf/open/floor/iron/dark, -/area/station/security/medical) "JG" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -16853,13 +16232,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured, /area/station/security/prison/work) -"Ks" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/medical) "Kt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17203,11 +16575,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) -"Ln" = ( -/turf/closed/wall/rock{ - name = "KILO 73, 92" - }, -/area/space) "Lo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17331,31 +16698,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) -"LD" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/rack, -/obj/machinery/camera/directional/south{ - c_tag = "Brig - Infirmary" - }, -/obj/item/clothing/under/rank/medical/scrubs/purple, -/obj/item/storage/medkit/regular, -/obj/item/healthanalyzer{ - pixel_y = -2 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "LE" = ( /turf/closed/wall, /area/station/maintenance/port/greater) @@ -17450,15 +16792,6 @@ }, /turf/open/floor/plating, /area/space) -"LP" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "LQ" = ( /obj/machinery/bluespace_vendor/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18406,10 +17739,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"NY" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/white, -/area/station/security/medical) "NZ" = ( /obj/structure/table, /obj/effect/spawner/random/decoration/ornament, @@ -18807,13 +18136,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"OY" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "OZ" = ( /obj/machinery/vending/boozeomat/all_access, /obj/effect/decal/cleanable/cobweb, @@ -18823,10 +18145,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central) -"Pb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/medical) "Pc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18845,13 +18163,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/security/armory) -"Pe" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "Pg" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/end{ @@ -19369,21 +18680,6 @@ }, /turf/open/floor/iron, /area/service/salon) -"Qp" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop{ - dir = 4; - pixel_x = 3; - pixel_y = 2 - }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "Qq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19547,8 +18843,8 @@ name = "Visitation Shutters" }, /obj/machinery/door/window/right/directional/south{ - req_access = list("security"); - name = "Visitation" + name = "Visitation"; + req_access = list("security") }, /turf/open/floor/iron, /area/station/security/prison/visit) @@ -20057,8 +19353,8 @@ }, /obj/structure/table/reinforced/rglass, /obj/item/hairbrush{ - pixel_y = 9; - pixel_x = 6 + pixel_x = 6; + pixel_y = 9 }, /obj/item/clothing/gloves/color/latex, /turf/open/floor/iron/dark, @@ -20187,12 +19483,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"Sc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/departments/medbay/alt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/medical) "Sd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -20455,12 +19745,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"SL" = ( -/obj/structure/bed/roller, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/white, -/area/station/security/medical) "SM" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -20477,15 +19761,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"SO" = ( -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "SQ" = ( /obj/effect/turf_decal/stripes/white/line{ color = "#52B4E9"; @@ -20577,12 +19852,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"Tf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/landmark/start/security_medic, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "Tg" = ( /obj/machinery/camera/directional/south, /obj/effect/decal/cleanable/dirt, @@ -21556,11 +20825,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/mess) -"Vr" = ( -/turf/closed/wall/rock{ - name = "META 92, 169" - }, -/area/space) "Vs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21649,17 +20913,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/security/checkpoint/science) -"VC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/white, -/area/station/security/medical) "VD" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Transit Intersection" @@ -21841,29 +21094,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"VX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" - }, -/obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "VY" = ( /obj/machinery/door/airlock/security{ name = "Orderly's Office" @@ -21973,12 +21203,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"Wk" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "Wl" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -22682,18 +21906,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) -"XN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Brig Infirmary Maintenance" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "XO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -22764,19 +21976,6 @@ /obj/effect/landmark/start/science_guard, /turf/open/floor/iron, /area/station/security/checkpoint/science/research) -"XX" = ( -/obj/structure/bed, -/obj/machinery/iv_drip, -/obj/item/bedsheet/medical, -/obj/machinery/vending/wallmed/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "XY" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle{ @@ -23300,11 +22499,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"Zh" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/medical) "Zi" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, @@ -37426,13 +36620,13 @@ Zt Zt Ic gy -Zt -Zt -Zt -Zt -Zt -Zt -iW +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -37728,13 +36922,13 @@ jv vQ Zt gy -Zt -ea -Zh -Zh -Zh -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -38030,13 +37224,13 @@ sz jv Zt gy -Zt -ea -Qp -CB -al -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -38332,13 +37526,13 @@ iH Io Zt gy -Zt -ea -LP -iR -qQ -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -38634,13 +37828,13 @@ ff jv Zt gy -Zt -ea -IL -Fa -DK -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -38936,13 +38130,13 @@ jv vQ Zt gy -Zt -ea -XX -Fa -SL -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -39238,13 +38432,13 @@ Zt Zt Zt gy -Zt -ea -Ku -DD -Sc -Do -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -39540,13 +38734,13 @@ gy gy gy gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -40166,14 +39360,14 @@ gy NW gy gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Ln +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -40468,14 +39662,14 @@ gy NW gy gy -Zt -dw -BB -pv -pv -ia -qW -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -40770,14 +39964,14 @@ gy NW gy gy -Zt -ia -VX -Jy -JF -SO -Av -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -41072,14 +40266,14 @@ gy NW gy gy -Zt -vh -jX -sM -Tf -hZ -qL -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -41374,14 +40568,14 @@ gy NW gy gy -Zt -BB -fn -jM -hB -dU -nA -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -41676,14 +40870,14 @@ gy NW gy gy -Zt -hg -hg -hg -hN -hg -qW -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -41978,14 +41172,14 @@ gy NW gy gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -44757,14 +43951,14 @@ Zt Zt KX gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Vr +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -45059,14 +44253,14 @@ Pd fT Zt gy -Zt -Hh -ck -ck -ck -XN -ck -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -45361,14 +44555,14 @@ BO gz Zt gy -Zt -ea -gZ -Jo -zl -pA -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -45663,14 +44857,14 @@ BO gz Zt gy -Zt -pv -wV -dW -NY -VC -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -45965,14 +45159,14 @@ kQ fT Zt gy -Zt -pv -xe -dg -EM -bO -pv -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -46267,14 +45461,14 @@ pR fT Zt gy -Zt -pv -fe -eu -cn -LD -pv -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -46569,14 +45763,14 @@ zp BN Zt gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt +gy +gy +gy +gy +gy +gy +gy +gy gy gy gy @@ -47956,12 +47150,12 @@ Zt Zt YE gy -Zt -Zt -Zt -Zt -Zt -gJ +gy +gy +gy +gy +gy +gy gy gy gy @@ -48258,12 +47452,12 @@ fT fT Zt gy -Zt -Lh -pv -pv -pv -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -48560,12 +47754,12 @@ PW ho Zt gy -Zt -Lh -Wk -wn -br -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -48862,12 +48056,12 @@ cr fT Zt gy -Zt -Lh -OY -eK -xS -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -49164,12 +48358,12 @@ gd fT Zt gy -Zt -ea -BJ -Dq -Cj -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -49466,12 +48660,12 @@ Fy fT Zt gy -Zt -ea -lO -cJ -lk -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -49768,12 +48962,12 @@ fW fT Zt gy -Zt -ea -xA -zI -wD -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -49927,15 +49121,15 @@ gy gy gy gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -aC +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt Zt @@ -50070,12 +49264,12 @@ OU fT Zt gy -Zt -ea -ea -ea -ea -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -50229,15 +49423,15 @@ gy gy gy gy -Zt -ea -ea -ea -ea -ea -ea -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt Hf @@ -50372,12 +49566,12 @@ fT fT Zt gy -Zt -Zt -Zt -Zt -Zt -Zt +gy +gy +gy +gy +gy +gy gy gy gy @@ -50531,15 +49725,15 @@ gy gy gy gy -Zt -pv -eO -lV -qU -qA -cu -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt Fz @@ -50833,15 +50027,15 @@ gy gy gy gy -Zt -pv -CC -Js -Ks -eI -zQ -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt Fz @@ -51135,15 +50329,15 @@ gy gy gy gy -Zt -pv -Pe -Pb -rc -dB -ms -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt fT @@ -51437,15 +50631,15 @@ gy gy gy gy -Zt -pv -Gl -HT -HT -dB -CV -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt fT @@ -51739,15 +50933,15 @@ gy gy gy gy -Zt -pv -pv -Ej -lm -ox -ea -ea -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt fT @@ -52041,15 +51235,15 @@ gy gy gy gy -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt -Zt +gy +gy +gy +gy +gy +gy +gy +gy +gy gy Zt fT diff --git a/_maps/map_resetting.md b/_maps/map_resetting.md index 2a5021ef752..450152bece4 100644 --- a/_maps/map_resetting.md +++ b/_maps/map_resetting.md @@ -5,6 +5,7 @@ ## Map resetting /TG/ maps + TG maps do periodically need to be reset to what they are upstream. In the event some major repathing occurs, which would otherwise render the map useless, the maps will need to be reset. Some **CRITICAL** things need to be brought over. These **CRITICAL** things are necessary for the flow of the game and round, in other words, they're **ROUND CRITICAL**. @@ -24,6 +25,16 @@ Round Critical items are rooms/spawners/objs that are **REQUIRED** for the flow - Arrival Shuttle Console +## Critical Changes: +Critical changes are changes that **NEED** be reset during the main reset PR. +- Security: +- - Add Ammo Workbench +- - Add Gun Vendor +- Armory: +- - Replace Disablers With Smartgun +- - Replace Shotguns With Shotgun Spawners +- - Replace Energy Guns With MCRS +- - Replace Laser Guns With CMGs - Central Command Ferry Hangar (inside Arrival area) ### Security @@ -52,8 +63,6 @@ These are rooms/spawners/objs that aren't really required for the flow of the ro - Xenoarch Base (Lavaland) -- Modular pets: E-N (Robotics), Poppy (Engineering), Bumbles (Hydroponics) and Markus (Cargo) - - Drone Dispensers added to all maps - Cryopods (inside Recreational/Dormitory area) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 515175b8391..ac9d0f7d855 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -30,3 +30,4 @@ new /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster(src) // SKYRAT EDIT - The QM's 'special' head item. It spawns loaded, but you have to find more ammo if you run out and get ready to manually load rounds in! new /obj/item/cargo_teleporter(src) // SKYRAT EDIT - Adds a cargo teleporter to QM locker, so they can intice others to research it new /obj/item/clothing/glasses/hud/gun_permit/sunglasses(src) //SKYRAT EDIT - GUN CARGO + new /obj/item/summon_beacon/markus(src) // SKYRAT EDIT ADDITION diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 1fdd070e03f..ef0c857648d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -22,6 +22,7 @@ new /obj/item/storage/box/gas_miner_beacons(src) // SKYRAT EDIT ADDITION new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION + new /obj/item/summon_beacon/poppy(src) //SKYRAT EDIT ADDITION /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index afd09bcefc1..c040f48183f 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -20,6 +20,7 @@ new /obj/item/circuitboard/machine/techfab/department/science(src) new /obj/item/storage/photo_album/rd(src) new /obj/item/storage/box/skillchips/science(src) + new /obj/item/summon_beacon/borgi(src) // SKYRAT EDIT ADDITION diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 89f30c9c73e..0d4eda19c3c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -20,6 +20,7 @@ new /obj/item/storage/box/gunset/pdh_captain(src) // SKYRAT EDIT ADDITION new /obj/item/door_remote/captain(src) new /obj/item/storage/photo_album/captain(src) + new /obj/item/summon_beacon/command_drobe(src) // SKYRAT EDIT ADDITION /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker" @@ -44,6 +45,7 @@ new /obj/item/circuitboard/machine/techfab/department/service(src) new /obj/item/storage/photo_album/hop(src) new /obj/item/storage/lockbox/medal/hop(src) + new /obj/item/summon_beacon/bumbles(src) // SKYRAT EDIT ADDITION /obj/structure/closet/secure_closet/hos name = "\proper head of security's locker" diff --git a/modular_skyrat/modules/advanced_choice_beacons/code/advanced_choice_beacon.dm b/modular_skyrat/modules/advanced_choice_beacons/code/advanced_choice_beacon.dm deleted file mode 100644 index 919452de4ea..00000000000 --- a/modular_skyrat/modules/advanced_choice_beacons/code/advanced_choice_beacon.dm +++ /dev/null @@ -1,80 +0,0 @@ -/obj/item/advanced_choice_beacon - name = "advanced choice beacon" - desc = "A beacon that will send whatever your heart desires, providing Nanotrasen approves it." - icon = 'icons/obj/device.dmi' - icon_state = "gangtool-red" - inhand_icon_state = "radio" - - var/list/possible_choices = list() - - var/pod_style = STYLE_CENTCOM - -/obj/item/advanced_choice_beacon/attack_self(mob/user, modifiers) - if(canUseBeacon(user)) - display_options(user) - -/obj/item/advanced_choice_beacon/proc/canUseBeacon(mob/living/user) - if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return TRUE - else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) - return FALSE - - -/obj/item/advanced_choice_beacon/proc/display_options(mob/user) - var/list/radial_build = get_available_options() - - if(!radial_build) - return - - var/chosen_option = show_radial_menu(user, src, radial_build, radius = 40, tooltips = TRUE) - - if(!chosen_option) - return - - podspawn(list( - "target" = get_turf(src), - "style" = pod_style, - "spawn" = chosen_option, - )) - - qdel(src) - -/obj/item/advanced_choice_beacon/proc/get_available_options() - var/list/options = list() - for(var/iterating_choice in possible_choices) - var/obj/our_object = iterating_choice - var/datum/radial_menu_choice/option = new - option.image = image(icon = initial(our_object.icon), icon_state = initial(our_object.icon_state)) - option.info = span_boldnotice("[initial(our_object.desc)]") - - options[our_object] = option - - sort_list(options) - - return options - -/obj/item/advanced_choice_beacon/exp_corps - name = "vanguard operatives supply beacon" - desc = "Used to request your job supplies, use in hand to do so!" - - possible_choices = list( - /obj/structure/closet/crate/secure/exp_corps/marksman, - /obj/structure/closet/crate/secure/exp_corps/pointman, - /obj/structure/closet/crate/secure/exp_corps/field_medic, - /obj/structure/closet/crate/secure/exp_corps/combat_tech - ) - -/obj/item/advanced_choice_beacon/exp_corps/get_available_options() - var/list/options = list() - for(var/iterating_choice in possible_choices) - var/obj/structure/closet/crate/secure/exp_corps/our_crate = iterating_choice - var/datum/radial_menu_choice/option = new - option.image = image(icon = initial(our_crate.icon), icon_state = initial(our_crate.icon_state)) - option.info = span_boldnotice("[initial(our_crate.loadout_desc)]") - - options[our_crate] = option - - sort_list(options) - - return options diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm index e28866ea8a0..25e4a580628 100644 --- a/modular_skyrat/modules/cargo/code/packs.dm +++ b/modular_skyrat/modules/cargo/code/packs.dm @@ -128,7 +128,7 @@ /obj/item/clothing/suit/armor/vest/alt, /obj/item/clothing/suit/armor/vest/alt) crate_name = "armor crate" - + /datum/supply_pack/security/helmets name = "Helmets Crate" desc = "Contains three standard-issue brain buckets. Requires Security access to open." @@ -222,7 +222,7 @@ name = "Gas Miner Delivery Beacon Crate" desc = "Contains a single gas miner delivery beacon, for the ordering of one gas miner." access = ACCESS_ATMOSPHERICS - contains = list(/obj/item/gas_miner_beacon) + contains = list(/obj/item/summon_beacon/gas_miner) cost = CARGO_CRATE_VALUE * 50 crate_name = "gas miner delivery beacon crate" crate_type = /obj/structure/closet/crate/secure/engineering diff --git a/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm b/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm index 3ca79b78dc4..4d2f7a97d7c 100644 --- a/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm +++ b/modular_skyrat/modules/exp_corps/code/expeditionary_trooper.dm @@ -47,7 +47,7 @@ box = /obj/item/storage/box/survival/expeditionary_corps - backpack_contents = list(/obj/item/advanced_choice_beacon/exp_corps) + backpack_contents = list(/obj/item/summon_beacon/vanguard) id = /obj/item/card/id/advanced/silver/exp_corps id_trim = /datum/id_trim/job/expeditionary_trooper diff --git a/modular_skyrat/modules/modular_items/code/gas_miner_beacon.dm b/modular_skyrat/modules/modular_items/code/gas_miner_beacon.dm deleted file mode 100644 index 0c64e9a2a3f..00000000000 --- a/modular_skyrat/modules/modular_items/code/gas_miner_beacon.dm +++ /dev/null @@ -1,107 +0,0 @@ -/obj/item/gas_miner_beacon - name = "gas miner beacon" - desc = "Once a gas miner type is selected, delivers a gas miner to the target location." - icon = 'icons/obj/device.dmi' - icon_state = "gangtool-blue" - inhand_icon_state = "radio" - w_class = WEIGHT_CLASS_SMALL - /// How many charges the beacon has left - var/uses = 1 - /// A list of allowed areas that a miner can be spawned in - var/static/list/allowed_areas = list( - /area/station/engineering/atmos, - /area/station/engineering/atmospherics_engine, - ) - /// A list of possible gas miners available to spawn - var/static/list/miners = list( - /obj/machinery/atmospherics/miner/carbon_dioxide, - /obj/machinery/atmospherics/miner/n2o, - /obj/machinery/atmospherics/miner/nitrogen, - /obj/machinery/atmospherics/miner/oxygen, - /obj/machinery/atmospherics/miner/plasma, - ) - /// The currently selected gas miner, if any - var/obj/machinery/atmospherics/miner/selected_miner = null - -/obj/item/gas_miner_beacon/examine() - . = ..() - . += span_warning("Caution: Only works in atmospherics areas.") - . += span_notice("Currently selected: [selected_miner ? selected_miner.name : "None"].") - -/obj/item/gas_miner_beacon/attack_self(mob/user) - if(!can_use_beacon(user)) - return - show_options(user) - -/obj/item/gas_miner_beacon/proc/can_use_beacon(mob/living/user) - if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return TRUE - else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) - return FALSE - -/obj/item/gas_miner_beacon/proc/generate_display_names() - var/list/miner_list = list() - for(var/obj/machinery/atmospherics/miner/iterated_miner as anything in miners) - miner_list[initial(iterated_miner.name)] = iterated_miner - return miner_list - -/obj/item/gas_miner_beacon/proc/show_options(mob/user) - var/list/display_names = generate_display_names() - if(!length(display_names)) - return - var/choice = tgui_input_list(user, "Choose a miner", "Miner selection", display_names) - if(isnull(choice)) - return - if(isnull(display_names[choice])) - return - if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return - selected_miner = display_names[choice] - -/obj/item/gas_miner_beacon/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - . = ..() - if(!selected_miner) - balloon_alert(user, "no miner selected!") - return - var/turf/target_turf = get_turf(target) - var/area/target_area = get_area(target) - if(!target_turf || !target_area || !is_type_in_list(target_area, allowed_areas)) - balloon_alert(user, "can't call here!") - return - - var/confirmed = tgui_alert(user, "Are you sure you want to call it here?", "Confirmation", list("Yes", "No")) - if(confirmed != "Yes") - return - - podspawn(list( - "target" = get_turf(target), - "path" = /obj/structure/closet/supplypod/podspawn/no_return, - "style" = STYLE_CENTCOM, - "spawn" = selected_miner, - )) - - if(ishuman(user)) - var/mob/living/carbon/human/human_user = user - if(istype(human_user.ears, /obj/item/radio/headset)) - to_chat(user, span_notice("You hear something crackle in your ears for a moment before a voice speaks. \ - \"Please stand by for a message from Central Command. Message as follows: \ - [span_bold("Request received. Your miner is inbound, please stand back from the landing site.")] \ - Message ends.\"")) - - uses-- - if(!uses) - qdel(src) - else - balloon_alert(user, "[uses] use[uses > 1 ? "s" : ""] left!") - -/obj/structure/closet/supplypod/podspawn/no_return - bluespace = FALSE - -/obj/item/storage/box/gas_miner_beacons - name = "box of gas miner delivery beacons" - desc = "Contains two beacons for delivery of atmospheric gas miners." - -/obj/item/storage/box/gas_miner_beacons/PopulateContents() - new /obj/item/gas_miner_beacon(src) - new /obj/item/gas_miner_beacon(src) diff --git a/modular_skyrat/modules/modular_items/code/summon_beacon.dm b/modular_skyrat/modules/modular_items/code/summon_beacon.dm new file mode 100644 index 00000000000..171e417c04f --- /dev/null +++ b/modular_skyrat/modules/modular_items/code/summon_beacon.dm @@ -0,0 +1,252 @@ +/obj/item/summon_beacon + name = "summoner beacon" + desc = "Summons a thing. Probably shouldn't use this one, though." + icon = 'icons/obj/device.dmi' + icon_state = "gangtool-blue" + inhand_icon_state = "radio" + w_class = WEIGHT_CLASS_SMALL + + /// How many uses the beacon has left + var/uses = 1 + + /// A list of allowed areas that the atom can be spawned in + var/list/allowed_areas = list( + /area, + ) + + /// A list of possible atoms available to spawn + var/list/selectable_atoms = list( + /obj/item/summon_beacon, + ) + + /// The currently selected atom, if any + var/atom/selected_atom = null + + /// Descriptor of what area it should work in + var/area_string = "any" + + /// If the supply pod should stay or not + var/supply_pod_stay = FALSE + +/obj/item/summon_beacon/examine() + . = ..() + . += span_warning("Caution: Only works in [area_string].") + . += span_notice("Currently selected: [selected_atom ? selected_atom.name : "None"].") + +/obj/item/summon_beacon/attack_self(mob/user) + if(!can_use_beacon(user)) + return + if(length(selectable_atoms) == 1) + selected_atom = selectable_atoms[1] + return + show_options(user) + +/obj/item/summon_beacon/proc/can_use_beacon(mob/living/user) + if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return TRUE + else + playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + return FALSE + +/obj/item/summon_beacon/proc/generate_display_names() + var/list/atom_list = list() + for(var/atom/iterated_atom as anything in selectable_atoms) + atom_list[initial(iterated_atom.name)] = iterated_atom + return atom_list + +/obj/item/summon_beacon/proc/show_options(mob/user) + var/list/radial_build = get_available_options() + if(!radial_build) + return + + selected_atom = show_radial_menu(user, src, radial_build, radius = 40, tooltips = TRUE) + +/obj/item/summon_beacon/proc/get_available_options() + var/list/options = list() + for(var/iterating_choice in selectable_atoms) + var/obj/our_object = iterating_choice + var/datum/radial_menu_choice/option = new + option.image = image(icon = initial(our_object.icon), icon_state = initial(our_object.icon_state)) + option.info = span_boldnotice("[initial(our_object.desc)]") + + options[our_object] = option + + sort_list(options) + + return options + +/obj/item/summon_beacon/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + . = ..() + if(!selected_atom) + balloon_alert(user, "no choice selected!") + return + var/turf/target_turf = get_turf(target) + var/area/target_area = get_area(target) + if(!target_turf || !target_area || !is_type_in_list(target_area, allowed_areas)) + balloon_alert(user, "can't call here!") + return + + var/confirmed = tgui_alert(user, "Are you sure you want to call [selected_atom.name] here?", "Confirmation", list("Yes", "No")) + if(confirmed != "Yes") + return + + podspawn(list( + "target" = get_turf(target), + "path" = supply_pod_stay ? /obj/structure/closet/supplypod/podspawn/no_return : /obj/structure/closet/supplypod/podspawn, + "style" = STYLE_CENTCOM, + "spawn" = selected_atom, + )) + + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + if(istype(human_user.ears, /obj/item/radio/headset)) + to_chat(user, span_notice("You hear something crackle in your ears for a moment before a voice speaks. \ + \"Please stand by for a message from Central Command. Message as follows: \ + [span_bold("Request received. Pod inbound, please stand back from the landing site.")] \ + Message ends.\"")) + + uses-- + if(!uses) + qdel(src) + else + balloon_alert(user, "[uses] use[uses > 1 ? "s" : ""] left!") + +// Misc stuff here + +/obj/structure/closet/supplypod/podspawn/no_return + bluespace = FALSE + +/obj/item/storage/box/gas_miner_beacons + name = "box of gas miner delivery beacons" + desc = "Contains two beacons for delivery of atmospheric gas miners." + +/obj/item/storage/box/gas_miner_beacons/PopulateContents() + new /obj/item/summon_beacon/gas_miner(src) + new /obj/item/summon_beacon/gas_miner(src) + + +// Actual beacons start here + +/obj/item/summon_beacon/gas_miner + name = "gas miner beacon" + desc = "Once a gas miner type is selected, delivers a gas miner to the target location." + + allowed_areas = list( + /area/station/engineering/atmos, + /area/station/engineering/atmospherics_engine, + ) + + selectable_atoms = list( + /obj/machinery/atmospherics/miner/carbon_dioxide, + /obj/machinery/atmospherics/miner/n2o, + /obj/machinery/atmospherics/miner/nitrogen, + /obj/machinery/atmospherics/miner/oxygen, + /obj/machinery/atmospherics/miner/plasma, + ) + + area_string = "atmospherics" + supply_pod_stay = TRUE + +/obj/item/summon_beacon/command_drobe + name = "command outfitting beacon" + desc = "Delivers a command outfitting station to the target location." + + allowed_areas = list( + /area/station/command/bridge, + /area/station/command/heads_quarters/captain, + /area/station/command/heads_quarters/hop, + ) + + selectable_atoms = list( + /obj/machinery/vending/access/command, + ) + + area_string = "the bridge" + +/obj/item/summon_beacon/borgi + name = "E-N beacon" + desc = "Delivers a lovable borgi to the target location." + + allowed_areas = list( + /area/station/science/robotics, + ) + + selectable_atoms = list( + /mob/living/simple_animal/pet/dog/corgi/borgi, + ) + + area_string = "robotics" + +/obj/item/summon_beacon/poppy + name = "engineering possum beacon" + desc = "Delivers the engineering possum, Poppy, to the target location." + + allowed_areas = list( + /area/station/engineering, + ) + + selectable_atoms = list( + /mob/living/simple_animal/pet/poppy, + ) + + area_string = "engineering" + +/obj/item/summon_beacon/bumbles + name = "Bumbles beacon" + desc = "Delivers hydreponics' bee, Bumbles, to the target location." + + allowed_areas = list( + /area/station/service/hydroponics, + ) + + selectable_atoms = list( + /mob/living/simple_animal/pet/bumbles, + ) + + area_string = "hydroponics" + +/obj/item/summon_beacon/markus + name = "cargo corgi beacon" + desc = "Delivers Markus, the mascot of cargo, to the target location." + + allowed_areas = list( + /area/station/cargo, + ) + + selectable_atoms = list( + /mob/living/simple_animal/pet/dog/markus, + ) + + area_string = "cargo" + +/obj/item/summon_beacon/secmed + name = "security medic locker beacon" + desc = "Delivers a security medic's locker to the target location." + + allowed_areas = list( + /area/station/security/medical, + ) + + selectable_atoms = list( + /obj/structure/closet/secure_closet/security_medic, + ) + + area_string = "the medical ward of security" + +/obj/item/summon_beacon/vanguard + name = "vanguard operatives supply beacon" + desc = "Used to request your job supplies, use in hand to do so!" + + allowed_areas = list( + /area/awaymission, + /area/station/command/gateway, + ) + + selectable_atoms = list( + /obj/structure/closet/crate/secure/exp_corps/marksman, + /obj/structure/closet/crate/secure/exp_corps/pointman, + /obj/structure/closet/crate/secure/exp_corps/field_medic, + /obj/structure/closet/crate/secure/exp_corps/combat_tech, + ) + + area_string = "the gateway chamber" diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm b/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm index 04f5073e057..74ae0bf4ff2 100644 --- a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm +++ b/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm @@ -57,7 +57,10 @@ suit = /obj/item/clothing/suit/armor/vest/peacekeeper/security_medic l_hand = /obj/item/storage/medkit/brute head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic - backpack_contents = list(/obj/item/storage/box/gunset/firefly = 1) + backpack_contents = list( + /obj/item/storage/box/gunset/firefly = 1, + /obj/item/summon_beacon/secmed = 1, + ) backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/sec @@ -68,6 +71,10 @@ id_trim = /datum/id_trim/job/security_medic +/obj/effect/landmark/start/security_officer/Initialize(mapload) + . = ..() + new /obj/effect/landmark/start/security_medic(get_turf(src)) + /obj/effect/landmark/start/security_medic name = "Security Medic" icon_state = "Security Medic" diff --git a/tgstation.dme b/tgstation.dme index 3dadfa429ac..8414c02dcd1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4878,7 +4878,6 @@ #include "modular_skyrat\modules\admin\code\manage_player_ranks.dm" #include "modular_skyrat\modules\admin\code\sooc.dm" #include "modular_skyrat\modules\admin\code\smites\pie.dm" -#include "modular_skyrat\modules\advanced_choice_beacons\code\advanced_choice_beacon.dm" #include "modular_skyrat\modules\advanced_shuttles\code\areas.dm" #include "modular_skyrat\modules\advanced_shuttles\code\closet.dm" #include "modular_skyrat\modules\advanced_shuttles\code\computer.dm" @@ -5648,7 +5647,6 @@ #include "modular_skyrat\modules\modular_items\code\ciggies.dm" #include "modular_skyrat\modules\modular_items\code\cross.dm" #include "modular_skyrat\modules\modular_items\code\designs.dm" -#include "modular_skyrat\modules\modular_items\code\gas_miner_beacon.dm" #include "modular_skyrat\modules\modular_items\code\goosenade.dm" #include "modular_skyrat\modules\modular_items\code\kinetic_crusher.dm" #include "modular_skyrat\modules\modular_items\code\makeshift.dm" @@ -5657,6 +5655,7 @@ #include "modular_skyrat\modules\modular_items\code\pastries.dm" #include "modular_skyrat\modules\modular_items\code\ranged_analyzer.dm" #include "modular_skyrat\modules\modular_items\code\recipes_misc.dm" +#include "modular_skyrat\modules\modular_items\code\summon_beacon.dm" #include "modular_skyrat\modules\modular_items\code\tailoring.dm" #include "modular_skyrat\modules\modular_items\code\thieving_gloves.dm" #include "modular_skyrat\modules\modular_items\lewd_items\code\arousal_system.dm"