diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm index 985115586f4..ffa76bff094 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm @@ -145,7 +145,7 @@ }, /area/ruin/unpowered/buried_library) "aO" = ( -/mob/living/simple_animal/pet/fox, +/mob/living/basic/pet/fox, /turf/open/floor/wood{ initial_gas_mix = "ICEMOON_ATMOS" }, @@ -327,7 +327,7 @@ /area/ruin/unpowered/buried_library) "cA" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/pet/fox, +/mob/living/basic/pet/fox, /turf/open/floor/wood{ initial_gas_mix = "ICEMOON_ATMOS" }, @@ -394,7 +394,7 @@ /obj/structure/fluff/paper{ dir = 1 }, -/mob/living/simple_animal/pet/fox, +/mob/living/basic/pet/fox, /turf/open/floor/wood{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index afc1547ea1b..a99c0b174a5 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -67,6 +67,19 @@ /obj/machinery/camera/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos/project) +"acE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/closet/crate{ + name = "Outdated Weaponry" + }, +/obj/effect/spawner/random/armory/barrier_grenades, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/plating, +/area/station/ai_monitored/security/armory) "acF" = ( /turf/closed/wall/rust, /area/station/engineering/atmos/project) @@ -14493,6 +14506,15 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/pumproom) +"fIm" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "fIr" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/small, @@ -22700,15 +22722,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/engineering/break_room) -"iAt" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/machinery/airalarm/directional/west, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "iAy" = ( /obj/structure/table, /obj/item/clothing/shoes/sneakers/orange{ @@ -23413,19 +23426,6 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"iNK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/closet/crate{ - name = "Outdated Weaponry" - }, -/obj/effect/spawner/random/armory/barrier_grenades, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/plating, -/area/station/ai_monitored/security/armory) "iNL" = ( /obj/machinery/door/airlock/wood{ desc = "Sessions held every Friday."; @@ -26639,13 +26639,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/cargo/storage) -"jWb" = ( -/obj/machinery/light/cold/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/pdapainter/medbay, -/turf/open/floor/wood/parquet, -/area/station/command/heads_quarters/cmo) "jWd" = ( /obj/structure/cable, /obj/item/kirbyplants/random/fullysynthetic, @@ -26866,12 +26859,6 @@ dir = 1 }, /area/station/hallway/primary/central/fore) -"jZs" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/captain/private) "jZI" = ( /obj/item/storage/backpack/duffelbag/sec{ pixel_y = 12 @@ -36327,6 +36314,15 @@ /obj/effect/spawner/random/trash, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"npQ" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/radio/intercom/directional/west, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "npS" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -38917,6 +38913,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons) +"ooG" = ( +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 8 + }, +/obj/machinery/light/cold/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "ooK" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -41643,15 +41648,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) -"pon" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/radio/intercom/directional/west, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "pox" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49032,6 +49028,16 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"rBP" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "rBQ" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/small, @@ -51107,18 +51113,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/kitchen/small, /area/station/maintenance/aft) -"skO" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 1 - }, -/obj/structure/rack, -/obj/machinery/light/cold/directional/south, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/obj/item/gun/energy/e_gun/dragnet, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "skP" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -54399,6 +54393,32 @@ dir = 1 }, /area/station/engineering/atmos) +"toP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/storage/wallet/random{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hop) "toT" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/window/reinforced/spawner/directional/west, @@ -54602,14 +54622,6 @@ /obj/structure/sign/warning/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"trK" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "trS" = ( /obj/effect/decal/cleanable/glass, /obj/structure/grille, @@ -58737,6 +58749,18 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"uJr" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 1 + }, +/obj/structure/rack, +/obj/machinery/light/cold/directional/south, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/obj/item/gun/energy/e_gun/dragnet, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "uJD" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -58847,15 +58871,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/hallway/secondary/spacebridge) -"uLE" = ( -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 8 - }, -/obj/machinery/light/cold/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "uLO" = ( /obj/item/stack/sheet/cardboard{ amount = 14 @@ -60642,16 +60657,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"voX" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "vpb" = ( /obj/machinery/door/airlock/hatch{ name = "Tool Supply Corridor" @@ -64084,32 +64089,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"wqi" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/storage/wallet/random{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/machinery/requests_console/directional/north{ - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/plating, -/area/station/command/heads_quarters/hop) "wqj" = ( /turf/closed/wall, /area/station/commons/toilet/restrooms) @@ -67521,6 +67500,12 @@ "xnE" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/entry) +"xnG" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) "xnQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68135,6 +68120,13 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"xvt" = ( +/obj/machinery/light/cold/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/pdapainter/medbay, +/turf/open/floor/wood/parquet, +/area/station/command/heads_quarters/cmo) "xvv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70336,6 +70328,14 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"xYe" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "xYj" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -84377,10 +84377,10 @@ qVP blb xkt bCr -trK -iAt -pon -voX +xYe +fIm +npQ +rBP fQo syk bKE @@ -85147,12 +85147,12 @@ rui qVP blb xkt -uLE +ooG mVt gJa huN jBr -skO +uJr syk nDx iLc @@ -85405,7 +85405,7 @@ qVP blb xkt kJp -iNK +acE xkt ntf uMT @@ -93323,7 +93323,7 @@ qoD pLr qoD uVT -wqi +toP iwv iLC iLC @@ -99059,7 +99059,7 @@ xqg pKS bkY lVP -jWb +xvt wgL hgF pVK @@ -101553,7 +101553,7 @@ xRH gcz lHW jOU -jZs +xnG wSZ lFg xqC diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2b5117719c7..ed0070df914 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -579,13 +579,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/checkpoint/customs/fore) -"agn" = ( -/obj/structure/bed/dogbed/renault, -/obj/machinery/newscaster/directional/south, -/mob/living/simple_animal/pet/fox/renault, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/captain) "ago" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -860,17 +853,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"alc" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 3 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "ale" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -1660,6 +1642,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) +"asJ" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) "asO" = ( /obj/machinery/porta_turret/ai, /obj/structure/sign/nanotrasen{ @@ -1814,19 +1809,6 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) -"auu" = ( -/obj/structure/table/glass, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay" - }, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "aux" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, @@ -2091,6 +2073,15 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"awX" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/bodycontainer/morgue/beeper_off, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "axa" = ( /obj/item/radio/intercom/prison/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -2951,6 +2942,21 @@ }, /turf/open/floor/iron, /area/station/security/range) +"aIP" = ( +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Secure Morgue Trays"; + req_access = list("morgue_secure") + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "aIV" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, @@ -3630,12 +3636,6 @@ dir = 1 }, /area/station/service/bar) -"aRd" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "aRr" = ( /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) @@ -4203,6 +4203,19 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port) +"bae" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/machinery/airalarm/directional/west, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "baf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6692,6 +6705,16 @@ }, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) +"bFE" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "bFS" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/structure/cable, @@ -6861,6 +6884,21 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"bGL" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 10 + }, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "bGM" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -6945,17 +6983,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"bHZ" = ( -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/machinery/smartfridge/organ, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "bIa" = ( /obj/effect/turf_decal/trimline/blue/end{ dir = 4 @@ -7894,14 +7921,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/science/xenobiology) -"bSI" = ( -/obj/structure/mannequin/skeleton, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "bSN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -8278,6 +8297,19 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/glass, /area/station/maintenance/space_hut/observatory) +"bWU" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "bWW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8992,6 +9024,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/ai_upload) +"chl" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "chn" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/decal/cleanable/dirt, @@ -9940,6 +9979,14 @@ dir = 8 }, /area/station/hallway/primary/port) +"csM" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 9 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "csR" = ( /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, @@ -10030,14 +10077,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/main) -"cuj" = ( -/obj/structure/chair/office/tactical{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/morgue) "cul" = ( /obj/machinery/plate_press, /obj/structure/sign/warning/electric_shock/directional/east, @@ -10421,12 +10460,6 @@ }, /turf/open/floor/glass, /area/station/maintenance/space_hut/observatory) -"czq" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "czy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, @@ -10983,6 +11016,15 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"cFu" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "cFz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11697,14 +11739,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/circuits) -"cPx" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "cPD" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12545,15 +12579,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron, /area/station/engineering/atmos) -"dbL" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "dbO" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -12739,21 +12764,6 @@ /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/carpet/green, /area/station/commons/lounge) -"dej" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "den" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -13053,14 +13063,6 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/station/engineering/atmos/project) -"djk" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "djn" = ( /obj/structure/table/wood, /obj/item/toy/talking/codex_gigas, @@ -14364,17 +14366,6 @@ "dzw" = ( /turf/closed/wall/r_wall, /area/station/security/brig) -"dzD" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "dzJ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/east, @@ -14970,19 +14961,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/lobby) -"dJd" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "dJw" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -15702,6 +15680,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) +"dRX" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "dSj" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/landmark/event_spawn, @@ -16080,20 +16066,6 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/medbay) -"dYb" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/computer/operating{ - dir = 4 - }, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "dYj" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/hfr_room) @@ -16452,6 +16424,17 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) +"ecX" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "eda" = ( /obj/structure/chair/sofa/bench{ dir = 8 @@ -16620,6 +16603,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) +"eeV" = ( +/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "eeZ" = ( /obj/item/exodrone, /obj/machinery/exodrone_launcher, @@ -16642,17 +16632,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/medical/abandoned) -"eff" = ( -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "efg" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -16786,6 +16765,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"ehB" = ( +/obj/structure/chair/office/tactical{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) "ehD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/iron, @@ -16873,12 +16860,6 @@ }, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den/gaming) -"eiT" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "eiU" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -16943,6 +16924,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"ejI" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/medical) "ejL" = ( /obj/structure/sign/warning/no_smoking/directional/east, /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -18509,15 +18498,6 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"eFy" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/bodycontainer/morgue/beeper_off, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "eFz" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -18642,6 +18622,16 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"eGZ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/mapping_helpers/dead_body_placer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "eHi" = ( /obj/machinery/status_display/evac/directional/south, /obj/machinery/light/small/directional/south, @@ -18930,14 +18920,6 @@ }, /turf/open/floor/iron, /area/station/science/research/abandoned) -"eKD" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 5 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "eKL" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -19062,11 +19044,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"eLR" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/dark_blue/filled/line, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "eLY" = ( /obj/machinery/door/window/right/directional/west{ name = "Bar Delivery"; @@ -20130,24 +20107,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) -"eYz" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/medical/morgue) "eYG" = ( /obj/machinery/shower/directional/west{ name = "emergency shower" @@ -20226,6 +20185,12 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/sorting) +"eZc" = ( +/obj/effect/turf_decal/trimline/neutral/warning, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "eZe" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/structure/sign/poster/official/cleanliness/directional/west, @@ -20260,6 +20225,14 @@ dir = 8 }, /area/station/science/auxlab/firing_range) +"eZy" = ( +/obj/structure/mannequin/skeleton, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "eZz" = ( /obj/structure/chair/office{ dir = 8 @@ -20864,6 +20837,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"fhX" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/structure/closet/secure_closet/armory2, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/rubbershot, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "fih" = ( /obj/structure/noticeboard/directional/east, /obj/machinery/camera/directional/east{ @@ -21679,6 +21662,13 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"fsR" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "fsY" = ( /obj/effect/turf_decal/delivery/white{ color = "#52B4E9" @@ -23068,6 +23058,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"fMd" = ( +/obj/machinery/door/window/brigdoor/left/directional/south{ + req_access = list("morgue_secure"); + name = "Coroner's Office" + }, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "fMj" = ( /obj/machinery/mass_driver/chapelgun, /obj/structure/sign/warning/vacuum/external{ @@ -23461,6 +23461,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"fRi" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "fRn" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line, @@ -24285,22 +24293,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"gbv" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/table/reinforced, -/obj/machinery/computer/records/medical/laptop{ - dir = 4; - pixel_x = 3; - pixel_y = -1 - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "gby" = ( /obj/structure/table/wood, /obj/machinery/computer/records/medical/laptop, @@ -24665,6 +24657,17 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"gfs" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "gfu" = ( /obj/machinery/vending/assist, /obj/effect/turf_decal/bot, @@ -26925,18 +26928,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"gHF" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "gHH" = ( /obj/structure/cable, /obj/structure/closet/secure_closet/contraband/heads, @@ -27443,19 +27434,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"gOv" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/machinery/airalarm/directional/west, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "gOH" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -27650,17 +27628,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"gQN" = ( -/obj/item/reagent_containers/spray/cleaner, -/obj/item/pushbroom, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/structure/closet, -/obj/effect/turf_decal/trimline/dark_blue/filled/line, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "gQV" = ( /obj/structure/cable, /turf/open/floor/iron/grimy, @@ -28086,19 +28053,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"gWH" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/station/medical/morgue) "gWJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot_white/right, @@ -29897,21 +29851,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/medical/virology) -"hvX" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 10 - }, -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "hwa" = ( /obj/structure/chair{ dir = 1 @@ -29986,21 +29925,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) -"hwG" = ( -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Secure Morgue Trays"; - req_access = list("morgue_secure") - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "hwK" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -30030,12 +29954,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/rd) -"hwT" = ( -/obj/effect/landmark/start/coroner, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/morgue) "hwX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30585,14 +30503,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) -"hFQ" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "hFS" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -30922,16 +30832,6 @@ "hJz" = ( /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) -"hJA" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/light/dim/directional/south, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "hJG" = ( /turf/open/floor/iron/white/side{ dir = 1 @@ -31617,6 +31517,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"hTj" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "hTk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32258,6 +32167,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"ibc" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "ibh" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/l3closet/virology, @@ -32512,6 +32427,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"idi" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) "idj" = ( /obj/machinery/door/airlock/public/glass{ name = "Library Access" @@ -32948,19 +32871,6 @@ /obj/effect/turf_decal/siding/dark_red, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) -"iiW" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "ijm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -34069,6 +33979,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"ixB" = ( +/obj/machinery/duct, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/bot_white{ + color = "#74b2d3" + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) "ixE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/photocopier, @@ -34131,17 +34053,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"iyf" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "iyk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34315,6 +34226,11 @@ }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) +"iAr" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/dark_blue/filled/warning, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "iAt" = ( /obj/structure/bed{ dir = 4 @@ -34840,14 +34756,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"iIe" = ( -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/medical) "iIg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35969,6 +35877,20 @@ "iYi" = ( /turf/closed/wall, /area/station/commons/toilet/locker) +"iYk" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/computer/operating{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "iYp" = ( /obj/structure/cable, /obj/machinery/nuclearbomb/selfdestruct{ @@ -36467,6 +36389,14 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"jdz" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "jdB" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 @@ -38142,15 +38072,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/lobby) -"jyx" = ( -/obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "jyz" = ( /obj/structure/closet/radiation, /obj/machinery/light/small/directional/north, @@ -41541,6 +41462,15 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"knx" = ( +/obj/machinery/vending/wallmed/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/vending/wardrobe/coroner_wardrobe, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "knH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41812,13 +41742,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"krP" = ( -/obj/effect/turf_decal/siding/dark_red, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "krT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42109,6 +42032,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/commons/dorms) +"kvS" = ( +/obj/machinery/duct, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "kvW" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, @@ -42316,6 +42247,17 @@ /obj/structure/sign/warning/fire/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +"kyO" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "kyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/railing/corner, @@ -44014,16 +43956,6 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/plating, /area/station/service/kitchen/abandoned) -"kWb" = ( -/obj/machinery/door/window/brigdoor/left/directional/south{ - req_access = list("morgue_secure"); - name = "Coroner's Office" - }, -/obj/effect/turf_decal/siding/dark_blue, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "kWi" = ( /obj/effect/turf_decal/box/white/corners{ dir = 8 @@ -44142,15 +44074,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"kXu" = ( -/obj/machinery/vending/wallmed/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/vending/wardrobe/coroner_wardrobe, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/siding/dark_blue, -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "kXC" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -44370,6 +44293,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/library) +"laL" = ( +/obj/structure/table/glass, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Medbay" + }, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "laP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44687,6 +44623,22 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/station/command/corporate_showroom) +"lem" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/table/reinforced, +/obj/machinery/computer/records/medical/laptop{ + dir = 4; + pixel_x = 3; + pixel_y = -1 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "len" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -44798,6 +44750,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel) +"lfS" = ( +/obj/item/reagent_containers/spray/cleaner, +/obj/item/pushbroom, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/structure/closet, +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "lgc" = ( /obj/machinery/light_switch/directional/north{ pixel_x = 6 @@ -46193,6 +46156,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/command/gateway) +"lyS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "lyU" = ( /obj/effect/spawner/random/structure/closet_empty, /turf/open/floor/plating, @@ -47484,6 +47462,14 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/science) +"lNh" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "lNk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47506,6 +47492,15 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/blue, /area/station/commons/vacant_room/office) +"lNK" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "lNN" = ( /obj/structure/bed/dogbed/mcgriff, /mob/living/basic/pet/dog/pug/mcgriff, @@ -48424,15 +48419,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/orange, /area/station/commons/dorms) -"mcJ" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/light/dim/directional/north, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "mcS" = ( /obj/machinery/modular_computer/preset/id{ dir = 4 @@ -48938,6 +48924,13 @@ }, /turf/open/floor/iron/white/side, /area/station/security/medical) +"mjt" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mjz" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -49075,15 +49068,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space/basic, /area/space/nearstation) -"mmx" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "mmA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, @@ -50098,6 +50082,15 @@ /obj/machinery/incident_display/delam/directional/north, /turf/open/floor/wood, /area/station/engineering/break_room) +"mzQ" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mzV" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/bot, @@ -50826,6 +50819,17 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/dark, /area/station/medical/chemistry) +"mIl" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/machinery/smartfridge/organ, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mIs" = ( /turf/closed/wall, /area/station/command/gateway) @@ -51479,16 +51483,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) -"mQp" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/siding/dark_blue, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "mQt" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -52130,16 +52124,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"mZH" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "mZK" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -52406,6 +52390,12 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"nee" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "nei" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/evac/directional/east, @@ -52930,13 +52920,6 @@ dir = 4 }, /area/station/security/brig) -"nlZ" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/barrier_grenades, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "nma" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -54339,16 +54322,6 @@ /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, /area/space) -"nEW" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "nEY" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -54599,6 +54572,14 @@ }, /turf/open/floor/iron, /area/station/security/holding_cell) +"nIc" = ( +/obj/structure/bodycontainer/morgue/beeper_off, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "nIg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance_hatch{ @@ -54875,6 +54856,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"nMb" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "nMd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57481,6 +57475,13 @@ /obj/item/pen, /turf/open/floor/iron/white, /area/station/medical/virology) +"ovZ" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "owb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58774,16 +58775,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) -"oOv" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/mapping_helpers/dead_body_placer, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "oOw" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -59852,13 +59843,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room) -"pdP" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "pdT" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/coin, @@ -61974,14 +61958,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/maintenance/department/science) -"pEG" = ( -/obj/structure/bodycontainer/morgue/beeper_off, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "pEH" = ( /obj/machinery/door/poddoor/preopen{ id = "brigprison"; @@ -62480,6 +62456,11 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/science/breakroom) +"pJX" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "pKb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -62654,6 +62635,20 @@ /obj/structure/bookcase, /turf/open/floor/wood, /area/station/service/library/abandoned) +"pLN" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay - Morgue"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "pLR" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63814,6 +63809,14 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +"pYk" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "pYl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64943,6 +64946,23 @@ }, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den/gaming) +"qng" = ( +/obj/structure/table/glass, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -15; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/structure/sign/poster/official/cleanliness/directional/east, +/obj/machinery/vending/wallmed/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "qnr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65465,23 +65485,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"quH" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -15; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/structure/sign/poster/official/cleanliness/directional/east, -/obj/machinery/vending/wallmed/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "quQ" = ( /obj/item/kirbyplants/organic/plant21, /obj/effect/turf_decal/tile/yellow{ @@ -67765,14 +67768,6 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) -"qYZ" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 9 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "qZb" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -70631,6 +70626,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"rLU" = ( +/obj/structure/table/wood, +/obj/machinery/light/directional/north, +/obj/item/storage/secure/safe/directional/east, +/obj/item/storage/lockbox/loyalty, +/obj/item/storage/backpack/satchel/leather/withwallet{ + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "rLW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/delivery, @@ -70984,6 +70989,18 @@ }, /turf/closed/wall, /area/station/commons/vacant_room/office) +"rPL" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "rPN" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72162,6 +72179,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"sdL" = ( +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/medical) "sdO" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 @@ -72963,6 +72989,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/space/basic, /area/space/nearstation) +"spY" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/grunge{ + name = "Morgue" + }, +/turf/open/floor/iron, +/area/station/medical/morgue) "sqd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -73229,13 +73276,6 @@ dir = 10 }, /area/station/service/chapel) -"stB" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "stC" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -73507,18 +73547,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/main) -"swO" = ( -/obj/machinery/duct, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +"swL" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 3 }, -/obj/effect/turf_decal/bot_white{ - color = "#74b2d3" - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/iron/dark/smooth_half, -/area/station/medical/morgue) +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "swP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -73670,17 +73709,6 @@ }, /turf/open/floor/wood/large, /area/station/service/barber) -"sxO" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/bodycontainer/morgue/beeper_off{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "sxP" = ( /obj/machinery/computer/records/security, /obj/machinery/status_display/ai/directional/north, @@ -74377,16 +74405,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"sHx" = ( -/obj/structure/bodycontainer/morgue/beeper_off{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/warning, -/turf/open/floor/iron/dark/textured_half, -/area/station/medical/morgue) "sHC" = ( /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) @@ -76890,15 +76908,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"toR" = ( -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/medical) "toS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -77338,15 +77347,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) -"ttG" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "ttN" = ( /obj/effect/spawner/random/trash/mopbucket, /obj/structure/sink/kitchen{ @@ -77582,27 +77582,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) -"twq" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/grunge{ - name = "Morgue" - }, -/turf/open/floor/iron, -/area/station/medical/morgue) "twE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ @@ -78707,6 +78686,12 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"tLT" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "tLW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/fourcorners, @@ -79075,6 +79060,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"tPg" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/medical/morgue) "tPo" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /turf/open/floor/engine/vacuum, @@ -79132,15 +79128,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"tPX" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "tPY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81324,6 +81311,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"urZ" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "ush" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82385,6 +82383,16 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/maintenance/port) +"uFt" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "uFv" = ( /obj/structure/chair/pew, /turf/open/floor/iron/chapel{ @@ -82551,6 +82559,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) +"uIu" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "uIF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 4 @@ -83237,14 +83255,6 @@ }, /turf/open/floor/iron/white, /area/station/service/kitchen/abandoned) -"uQO" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/dark_red, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "uQY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84508,6 +84518,24 @@ }, /turf/open/floor/iron, /area/station/engineering/hallway) +"vhf" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "vhq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -85038,6 +85066,13 @@ /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +"voj" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "vop" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -85416,6 +85451,16 @@ /obj/structure/chair/office, /turf/open/floor/carpet/orange, /area/station/commons/dorms) +"vtI" = ( +/obj/structure/table/optable, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/bot_red, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "vtM" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -85649,6 +85694,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/maintenance/department/security) +"vwd" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "vwe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -86156,20 +86210,6 @@ }, /turf/open/floor/carpet/orange, /area/station/commons/dorms) -"vBM" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay - Morgue"; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "vBO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -86242,6 +86282,16 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) +"vCK" = ( +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/warning, +/turf/open/floor/iron/dark/textured_half, +/area/station/medical/morgue) "vCM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -87575,17 +87625,6 @@ /obj/structure/transit_tube/crossing/horizontal, /turf/open/space/basic, /area/space/nearstation) -"vVY" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/station/medical/morgue) "vWb" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -87615,6 +87654,14 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) +"vWC" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "vWM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum/directional/west, @@ -88705,13 +88752,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"wkN" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "wkP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -89016,14 +89056,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) -"wnE" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/station/medical/morgue) "wnF" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -89115,14 +89147,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wow" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "woB" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, @@ -89360,16 +89384,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"wqG" = ( -/obj/structure/table/wood, -/obj/machinery/light/directional/north, -/obj/item/storage/secure/safe/directional/east, -/obj/item/storage/lockbox/loyalty, -/obj/item/storage/backpack/satchel/leather/withwallet{ - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "wqQ" = ( /obj/item/radio/intercom/directional/east, /obj/structure/window/reinforced/spawner/directional/south, @@ -89864,15 +89878,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/engineering/break_room) -"wwI" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "wwN" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -90602,12 +90607,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/space/basic, /area/space/nearstation) -"wFK" = ( -/obj/effect/turf_decal/trimline/neutral/warning, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "wFP" = ( /obj/structure/table/wood, /obj/item/stack/rods{ @@ -90807,13 +90806,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"wIM" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "wJa" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine/vacuum, @@ -91126,6 +91118,15 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"wOT" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "wOU" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -91931,16 +91932,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/iron, /area/station/commons/vacant_room/office) -"xbk" = ( -/obj/structure/table/optable, -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/bot_red, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "xbp" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -92732,6 +92723,12 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/atmos) +"xlJ" = ( +/obj/effect/landmark/start/coroner, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) "xlK" = ( /obj/machinery/door/airlock/command/glass{ name = "Server Access" @@ -93452,11 +93449,6 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/iron, /area/station/maintenance/fore) -"xvC" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/dark_blue/filled/warning, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "xvE" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -95017,6 +95009,16 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/security/courtroom) +"xOp" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/light/dim/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "xOs" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -95405,6 +95407,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grimy, /area/station/service/lawoffice) +"xUb" = ( +/obj/structure/bed/dogbed/renault, +/obj/machinery/newscaster/directional/south, +/mob/living/basic/pet/fox/renault, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/captain) "xUi" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -95505,6 +95514,15 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"xVD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "xVI" = ( /obj/structure/rack, /obj/item/analyzer, @@ -95602,16 +95620,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/fore) -"xWI" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/obj/structure/closet/secure_closet/armory2, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/rubbershot, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "xWJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ dir = 4 @@ -96511,14 +96519,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) -"yiD" = ( -/obj/machinery/duct, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "yiE" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -133635,7 +133635,7 @@ lAv nAz jce lZx -wqG +rLU lbt iVT nuY @@ -135493,7 +135493,7 @@ aaM qYL qYL qYL -twq +spY qYL qYL bhw @@ -135749,11 +135749,11 @@ tgN lLO qYL tpf -iiW -dej -dbL -vBM -gOv +nMb +lyS +xVD +pLN +bae bhw esQ ooP @@ -136006,11 +136006,11 @@ geJ dMY qYL uwZ -wFK -tPX -vVY -aRd -pdP +eZc +cFu +tPg +nee +fsR jgl xBc grq @@ -136262,12 +136262,12 @@ vdU iGr dBn qYL -mcJ -wFK -tPX -hFQ -qYZ -gHF +wOT +eZc +cFu +jdz +csM +rPL bhw eUW sAI @@ -136520,11 +136520,11 @@ qQa rZe qYL uAV -wFK -oOv -swO -cPx -hJA +eZc +eGZ +ixB +lNh +xOp bhw roI hYf @@ -136776,12 +136776,12 @@ bjB uOu tzn qYL -iyf -dzD -tPX -wnE -eKD -ttG +ecX +urZ +cFu +idi +pYk +hTj bhw lHE tJV @@ -137033,11 +137033,11 @@ jqJ jqJ qeF qYL -dYb -gbv -hvX -gWH -wwI +iYk +lem +bGL +asJ +mzQ qYL bhw bhw @@ -137225,7 +137225,7 @@ gOU gOU vDo eBw -agn +xUb gOU fOw fBm @@ -137290,13 +137290,13 @@ jqJ jqJ dRQ qYL -xbk -cuj -mQp -stB -eLR -eFy -pEG +vtI +ehB +uFt +mjt +pJX +awX +nIc bhw xBc tHV @@ -137542,18 +137542,18 @@ ako crk kuU tOS -czq +tLT jqJ jqJ -wIM +voj qYL -bSI -hwT -kWb -yiD -xvC -hwG -dJd +eZy +xlJ +fMd +kvS +iAr +aIP +bWU bhw asH iXC @@ -137799,18 +137799,18 @@ ako xIV dRy aaM -eiT +ibc vnB uue -djk +vWC qYL -bHZ -eff -kXu -wkN -gQN -sxO -sHx +mIl +kyO +knx +ovZ +lfS +gfs +vCK bhw ljj tHV @@ -138069,7 +138069,7 @@ qYL bhw bhw bhw -eYz +vhf tHV nEa bgG @@ -148767,8 +148767,8 @@ mSe iCo nYt lET -iIe -uQO +ejI +dRX gmr dvh pWT @@ -149024,8 +149024,8 @@ mSe iuk uDZ lET -toR -krP +sdL +eeV mjr rSg rfG @@ -149282,7 +149282,7 @@ iCo spB lET lET -auu +laL uui rJR fcE @@ -149539,7 +149539,7 @@ iCo krO qyK lET -quH +qng xtf oTg pWT @@ -150330,7 +150330,7 @@ fqs fHX dEZ bLs -nlZ +chl uVJ lHb lHb @@ -150590,9 +150590,9 @@ bLs iRi nIV ale -nEW -mZH -alc +uIu +bFE +swL gFF pIX cdr @@ -150846,9 +150846,9 @@ sRd bLs aqW aEs -jyx -wow -mmx +vwd +fRi +lNK nmT dwU wtB @@ -151360,7 +151360,7 @@ aad bLs bLs gPh -xWI +fhX vhx gYv tdv diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 862a09d1de3..c622127fa47 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -852,12 +852,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"apL" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "apM" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -2425,6 +2419,22 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"aPS" = ( +/obj/machinery/button/door/directional/east{ + id = "armory"; + name = "Armory Shutters"; + pixel_x = -9; + pixel_y = 30; + req_access = list("armory") + }, +/obj/structure/rack, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) "aPV" = ( /obj/effect/spawner/random/trash/mess, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6379,6 +6389,14 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/mine/mechbay) +"bYg" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "bYm" = ( /obj/structure/chair/pew{ dir = 1 @@ -10612,6 +10630,17 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/robotics/lab) +"dkB" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north{ + layer = 2.9 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "dkK" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, @@ -10905,17 +10934,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"dpX" = ( -/obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "dqg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/secure_area/directional/south, @@ -15271,14 +15289,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"eLE" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/barrier_grenades, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory/upper) "eLS" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, @@ -27034,6 +27044,11 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"iFL" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "iFX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27790,15 +27805,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"iSd" = ( -/obj/structure/rack, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "iSf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31924,6 +31930,13 @@ }, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) +"kiY" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "kjw" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/camera/directional/south{ @@ -35390,11 +35403,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"lmo" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "lms" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -38564,22 +38572,6 @@ /obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"mqz" = ( -/obj/machinery/button/door/directional/east{ - id = "armory"; - name = "Armory Shutters"; - pixel_x = -9; - pixel_y = 30; - req_access = list("armory") - }, -/obj/structure/rack, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory/upper) "mqD" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood, @@ -40967,13 +40959,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"ngC" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "ngH" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ @@ -42671,19 +42656,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/iron/dark, /area/station/engineering/main) -"nFg" = ( -/obj/structure/table, -/obj/item/paper_bin/carbon{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/item/stamp/head/hop, -/obj/item/storage/wallet/random{ - pixel_x = 9 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "nFk" = ( /obj/effect/landmark/start/cyborg, /obj/structure/cable, @@ -42797,6 +42769,14 @@ }, /turf/open/floor/glass/reinforced, /area/station/engineering/atmos/pumproom) +"nGK" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory/upper) "nGQ" = ( /obj/machinery/flasher/directional/north{ id = "Cell 3" @@ -46591,6 +46571,19 @@ dir = 9 }, /area/station/science/lab) +"oPt" = ( +/obj/structure/table, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/stamp/head/hop, +/obj/item/storage/wallet/random{ + pixel_x = 9 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "oPv" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat/service"; @@ -49191,17 +49184,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"pHi" = ( -/obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/rubbershot, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "pHy" = ( /obj/structure/rack, /obj/item/clothing/mask/breath, @@ -57671,6 +57653,15 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"srX" = ( +/obj/structure/rack, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "srY" = ( /obj/machinery/deepfryer, /turf/open/floor/iron/cafeteria, @@ -64479,14 +64470,6 @@ /obj/structure/table, /turf/open/floor/iron, /area/station/cargo/office) -"uDt" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) "uDy" = ( /obj/item/book/bible, /obj/structure/cable, @@ -67552,6 +67535,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/xenobiology) +"vDx" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "vDy" = ( /obj/structure/sign/poster/official/safety_report/directional/west, /obj/effect/decal/cleanable/dirt, @@ -67810,6 +67799,17 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"vHM" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north{ + layer = 2.9 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/rubbershot, +/turf/open/floor/iron/dark/textured, +/area/station/ai_monitored/security/armory) "vHR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -167392,7 +167392,7 @@ dHw qhS jaW yiL -ngC +kiY oqb uBs uBs @@ -167649,7 +167649,7 @@ oZR oVY pez yiL -iSd +srX cxO xuA tuc @@ -168163,11 +168163,11 @@ mlX oVY pez yiL -apL +vDx cxO xuA -dpX -uDt +dkB +bYg yiL qLD bbY @@ -168680,7 +168680,7 @@ yiL agF tgP rGh -pHi +vHM wyF yiL szz @@ -233442,7 +233442,7 @@ oSC ovV hEC feJ -mqz +aPS pdK lyG apS @@ -233764,7 +233764,7 @@ rpu ybI nnR tuz -nFg +oPt bhK rAA cpm @@ -233960,7 +233960,7 @@ mgZ tDL lyG lok -eLE +nGK feJ uVu aKq @@ -239406,7 +239406,7 @@ tEd lpM eEC aTw -lmo +iFL hpe wwB mBX diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 90028b0a6f2..9a4bfcc2856 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6312,14 +6312,6 @@ /obj/structure/sign/warning/secure_area/directional/west, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"cuY" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "cuZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -7083,6 +7075,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/commons/dorms) +"cKN" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/item/storage/backpack/satchel/leather/withwallet{ + pixel_y = 4; + pixel_x = -1 + }, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "cLa" = ( /obj/structure/weightmachine, /obj/effect/turf_decal/tile/dark_red/half/contrasted, @@ -7872,14 +7875,6 @@ "daC" = ( /turf/open/floor/wood, /area/station/service/lawoffice) -"daO" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "daT" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, @@ -10134,6 +10129,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"dRX" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "dRY" = ( /obj/structure/chair/office, /obj/effect/landmark/start/hangover, @@ -14123,6 +14124,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/holding_cell) +"fnO" = ( +/obj/structure/rack, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "foP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14539,6 +14549,14 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) +"fys" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "fyz" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -18336,6 +18354,15 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"gTs" = ( +/obj/structure/rack, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "gTt" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) @@ -20054,15 +20081,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) -"hxF" = ( -/obj/structure/rack, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "hxV" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -20297,12 +20315,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"hBR" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "hBY" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -24872,6 +24884,14 @@ /obj/item/shard, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"jcc" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "jcd" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37756,16 +37776,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"nEL" = ( -/obj/structure/table/wood, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "nEZ" = ( /obj/machinery/plate_press, /obj/effect/turf_decal/bot, @@ -37853,17 +37863,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/station/commons/lounge) -"nHn" = ( -/obj/structure/table/wood, -/obj/structure/cable, -/obj/item/storage/backpack/satchel/leather/withwallet{ - pixel_y = 4; - pixel_x = -1 - }, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "nHB" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41181,16 +41180,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"oRT" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 - }, -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "oSc" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -44322,6 +44311,38 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) +"qaN" = ( +/obj/structure/table/wood, +/obj/machinery/button/ticket_machine{ + pixel_x = 32 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 6; + pixel_y = -34 + }, +/obj/machinery/button/door/directional/south{ + id = "hop"; + name = "Privacy Shutters Control"; + pixel_x = -6; + req_access = list("hop") + }, +/obj/item/paper_bin/carbon{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/stamp/head/hop{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "hopqueue"; + name = "Queue Shutters Control"; + pixel_x = -6; + pixel_y = -34; + req_access = list("hop") + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "qaP" = ( /obj/effect/turf_decal/plaque{ icon_state = "L3" @@ -49358,14 +49379,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"rRf" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/barrier_grenades, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "rRm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51447,14 +51460,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"sDw" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "sDC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55231,6 +55236,14 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/command/bridge) +"tTP" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "tTT" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -56854,15 +56867,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/main) -"uwg" = ( -/obj/structure/rack, -/obj/machinery/light/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "uwh" = ( /obj/structure/chair/comfy{ dir = 1 @@ -59487,6 +59491,16 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +"vsU" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "vth" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -59585,6 +59599,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"vuN" = ( +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 1; + pixel_y = -29 + }, +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "vuP" = ( /obj/item/target/syndicate, /obj/structure/training_machine, @@ -62585,19 +62609,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"wya" = ( -/obj/structure/rack, -/obj/machinery/requests_console/directional/north{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/bulletproof_armor, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "wyn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -63879,6 +63890,14 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) +"wXu" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "wXF" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/lesser) @@ -63948,38 +63967,6 @@ "wYB" = ( /turf/closed/wall, /area/station/hallway/secondary/service) -"wYG" = ( -/obj/structure/table/wood, -/obj/machinery/button/ticket_machine{ - pixel_x = 32 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = 6; - pixel_y = -34 - }, -/obj/machinery/button/door/directional/south{ - id = "hop"; - name = "Privacy Shutters Control"; - pixel_x = -6; - req_access = list("hop") - }, -/obj/item/paper_bin/carbon{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/stamp/head/hop{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "hopqueue"; - name = "Queue Shutters Control"; - pixel_x = -6; - pixel_y = -34; - req_access = list("hop") - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "wZe" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office" @@ -64023,6 +64010,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"wZO" = ( +/obj/structure/rack, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/bulletproof_armor, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "wZU" = ( /obj/structure/chair/office{ dir = 4 @@ -90709,7 +90709,7 @@ oIa pJR oXT sRT -nEL +vsU gaU flu jbd @@ -90969,7 +90969,7 @@ kfA rWH oOE aVd -nHn +cKN mig wMx cMQ @@ -92511,7 +92511,7 @@ pJR lJn psy htG -wYG +qaN pJR uwC ndS @@ -93498,7 +93498,7 @@ dxe wTO xxZ anl -uwg +gTs apJ lDe qGQ @@ -93755,7 +93755,7 @@ wrb uQK dPL aeq -wya +wZO apJ lDe qGQ @@ -94012,7 +94012,7 @@ aeq aeq aeq aeq -hBR +dRX riY aeq qid @@ -94266,8 +94266,8 @@ aaa aeq xCo dAr -rRf -cuY +tTP +fys tgy agc apM @@ -95037,10 +95037,10 @@ aaa aaa aeq wzF -sDw +jcc eew -hxF -daO +fnO +wXu kaC anl vDh @@ -97910,7 +97910,7 @@ jxv sqJ gPA lZM -oRT +vuN syo lSz vQe diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index bb75ee86607..ff9d9154681 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -7049,6 +7049,13 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, /area/station/command/meeting_room) +"bGV" = ( +/obj/machinery/door/window/brigdoor{ + dir = 1 + }, +/mob/living/basic/pet/fox, +/turf/open/floor/noslip, +/area/station/maintenance/floor1/port) "bHh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line{ @@ -7881,6 +7888,14 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port) +"bSJ" = ( +/obj/structure/rack, +/obj/item/storage/secure/safe/directional/east, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "bSV" = ( /obj/machinery/door/airlock/medical{ name = "Psychologist's Office" @@ -11058,13 +11073,6 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"cJf" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "cJh" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13110,14 +13118,6 @@ dir = 1 }, /area/station/cargo/office) -"dnI" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/cable, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "dnJ" = ( /obj/structure/railing{ dir = 4 @@ -15070,6 +15070,15 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/smooth_large, /area/station/service/bar) +"dNw" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/captain/private) "dNx" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering" @@ -22582,20 +22591,6 @@ dir = 4 }, /area/station/ai_monitored/command/storage/eva) -"fQG" = ( -/obj/structure/table/wood, -/obj/item/storage/backpack/satchel/leather/withwallet{ - pixel_y = 6; - pixel_x = -2 - }, -/obj/item/paper/fluff/ids_for_dummies, -/obj/machinery/light/small/directional/north, -/obj/machinery/newscaster/directional/north, -/obj/item/storage/crayons{ - pixel_x = 16 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "fQH" = ( /obj/structure/cable, /obj/machinery/door/window/brigdoor/left/directional/south{ @@ -26645,6 +26640,14 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/central) +"gSD" = ( +/obj/structure/rack, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "gSS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/light, @@ -26772,6 +26775,13 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"gUH" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "gUO" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/purple, @@ -27434,17 +27444,6 @@ /obj/machinery/light/directional/south, /turf/open/openspace, /area/station/service/library) -"hdK" = ( -/obj/structure/rack, -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "hdL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27941,15 +27940,6 @@ dir = 1 }, /area/station/hallway/floor1/aft) -"hkj" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/west, -/obj/structure/cable, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/captain/private) "hkk" = ( /obj/structure/railing{ dir = 4 @@ -30340,6 +30330,20 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/apartment2) +"hSp" = ( +/obj/structure/table/wood, +/obj/item/storage/backpack/satchel/leather/withwallet{ + pixel_y = 6; + pixel_x = -2 + }, +/obj/item/paper/fluff/ids_for_dummies, +/obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/north, +/obj/item/storage/crayons{ + pixel_x = 16 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "hSs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32076,6 +32080,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) +"ira" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "irf" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/side{ @@ -32684,6 +32695,13 @@ icon_state = "snow8" }, /area/station/hallway/floor2/fore) +"izj" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "izl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33422,14 +33440,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard/fore) -"iKy" = ( -/obj/structure/rack, -/obj/item/storage/secure/safe/directional/east, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "iKz" = ( /obj/structure/ladder, /obj/structure/disposalpipe/segment{ @@ -34981,6 +34991,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/robotics/lab) +"jeQ" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/south{ + c_tag = "Armory - Interior" + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/cable, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "jeR" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark/smooth_large, @@ -39901,13 +39921,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/lawoffice) -"kvk" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "kvw" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, @@ -42885,13 +42898,6 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/grass, /area/station/maintenance/floor3/starboard) -"lji" = ( -/obj/machinery/door/window/brigdoor{ - dir = 1 - }, -/mob/living/simple_animal/pet/fox, -/turf/open/floor/noslip, -/area/station/maintenance/floor1/port) "ljs" = ( /obj/machinery/flasher/portable, /obj/machinery/camera/directional/east{ @@ -52419,6 +52425,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/maintenance/floor2/starboard/aft) +"nzV" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/cable, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "nAb" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -56258,14 +56272,6 @@ "ozt" = ( /turf/open/openspace, /area/station/medical/psychology) -"ozE" = ( -/obj/structure/table/reinforced, -/obj/structure/sign/poster/official/random/directional/south, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/rubbershot, -/obj/effect/spawner/random/armory/rubbershot, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "ozF" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/east, @@ -57143,16 +57149,6 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"oMn" = ( -/obj/structure/table/reinforced, -/obj/machinery/camera/directional/south{ - c_tag = "Armory - Interior" - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/cable, -/obj/effect/spawner/random/armory/barrier_grenades, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "oMz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/directional/west, @@ -57566,14 +57562,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"oSf" = ( -/obj/structure/rack, -/obj/structure/sign/poster/official/random/directional/east, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "oSg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -62992,13 +62980,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/abandoned) -"qsN" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "qsP" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/status_display/ai/directional/east, @@ -82399,6 +82380,17 @@ /obj/machinery/door/window/right/directional/west, /turf/open/floor/grass, /area/station/security/courtroom) +"vCS" = ( +/obj/structure/rack, +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "vDf" = ( /obj/effect/spawner/random/trash/grille_or_waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -90265,6 +90257,14 @@ }, /turf/open/floor/wood, /area/station/service/kitchen/diner) +"xCR" = ( +/obj/structure/table/reinforced, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/armory/rubbershot, +/obj/effect/spawner/random/armory/rubbershot, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "xCS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -122887,7 +122887,7 @@ dyS xgH bvi eVk -lji +bGV xgH wVn xgH @@ -251880,7 +251880,7 @@ qrd qrd qrd iHm -fQG +hSp bQe twg pPf @@ -311243,7 +311243,7 @@ glw aNs gZJ per -hkj +dNw jvM nSV pHT @@ -321036,7 +321036,7 @@ sHY rDZ cbw lOp -kvk +ira dtX oOW qjr @@ -321293,7 +321293,7 @@ sHY xIP cbw lOp -qsN +izj cUd lXm kdh @@ -321550,11 +321550,11 @@ sHY hAP qtQ owC -cJf +gUH fCS mqB lOp -ozE +xCR iXF sPs ycM @@ -321807,11 +321807,11 @@ sHY cAt cbw xOY -dnI +nzV xDG qqE eLg -oMn +jeQ uXo sPs orf @@ -322321,9 +322321,9 @@ oDd dPH vuf nkr -oSf -iKy -hdK +gSD +bSJ +vCS gMo jOc iXF diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 514d26d25de..0c3106bb683 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -4895,15 +4895,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) -"aCO" = ( -/obj/structure/table/wood, -/obj/item/storage/backpack/satchel/leather/withwallet{ - pixel_y = 4 - }, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "aCR" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -5279,12 +5270,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"aFA" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/rubbershot, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "aFP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -10035,13 +10020,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"caF" = ( -/obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "caP" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -20281,6 +20259,17 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/cargo/office) +"fSR" = ( +/obj/machinery/door/airlock{ + name = "Barber Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/service/barber) "fSY" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen{ @@ -24400,6 +24389,11 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"hBS" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "hBV" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -24754,6 +24748,15 @@ "hJl" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) +"hJv" = ( +/obj/structure/table/wood, +/obj/item/storage/backpack/satchel/leather/withwallet{ + pixel_y = 4 + }, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "hJA" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/meter, @@ -26103,6 +26106,13 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"ikb" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "iko" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -26217,13 +26227,6 @@ }, /turf/open/floor/glass, /area/station/command/meeting_room) -"imB" = ( -/obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "ina" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -26954,17 +26957,6 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/airless, /area/station/asteroid) -"iAU" = ( -/obj/structure/rack, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/cable, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "iBa" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -36389,12 +36381,6 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"lTf" = ( -/obj/machinery/door/airlock{ - name = "Barber Storage" - }, -/turf/open/floor/plating, -/area/station/service/barber) "lTM" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 @@ -40315,11 +40301,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/office) -"npH" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "npX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -41259,6 +41240,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/virology) +"nIX" = ( +/obj/structure/rack, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "nJr" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -42842,14 +42831,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/service/library) -"olh" = ( -/obj/structure/rack, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "olw" = ( /obj/structure/industrial_lift/tram/white, /obj/structure/fluff/tram_rail, @@ -43202,6 +43183,12 @@ dir = 4 }, /area/station/command/gateway) +"otd" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/barrier_grenades, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "otf" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -43991,18 +43978,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"oMM" = ( -/obj/structure/rack, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Armory"; - network = list("ss13","Security") - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/cable, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron, -/area/station/ai_monitored/security/armory) "oMU" = ( /obj/structure/railing/corner{ dir = 4 @@ -48659,6 +48634,18 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"qwC" = ( +/obj/structure/rack, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Armory"; + network = list("ss13","Security") + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "qwH" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, @@ -49089,14 +49076,6 @@ "qEH" = ( /turf/closed/wall, /area/station/solars/port) -"qEM" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "qFf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -49489,6 +49468,12 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"qMd" = ( +/obj/machinery/door/airlock{ + name = "Barber Storage" + }, +/turf/open/floor/plating, +/area/station/service/barber) "qMf" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -52926,12 +52911,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"sab" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/barrier_grenades, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "saj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, @@ -54223,6 +54202,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"svh" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "svA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -57749,6 +57735,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"tGG" = ( +/obj/structure/rack, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron, +/area/station/ai_monitored/security/armory) "tHb" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -63125,6 +63122,12 @@ /obj/structure/sink/directional/west, /turf/open/floor/iron/freezer, /area/station/science/lower) +"vtr" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/rubbershot, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "vtP" = ( /obj/structure/fluff/tram_rail, /obj/structure/industrial_lift/tram, @@ -66243,17 +66246,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"wAY" = ( -/obj/machinery/door/airlock{ - name = "Barber Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/service/barber) "wBb" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /turf/open/floor/iron/white, @@ -67150,6 +67142,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"wUI" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "wUL" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/fax{ @@ -105596,13 +105596,13 @@ abM abM abM abM -wAY +fSR gpq tqd usz lML fFl -lTf +qMd eep eep mGw @@ -151863,7 +151863,7 @@ cCR aBV wHT lPd -aCO +hJv vBn eDZ sik @@ -153623,12 +153623,12 @@ aaa aaa aaa dEv -qEM +wUI trm epT hgn mKP -aFA +vtr dEv avP rZA @@ -153880,7 +153880,7 @@ dEv dEv dEv dEv -olh +nIX exx ouM iub @@ -154139,7 +154139,7 @@ gxf gxf dst xYC -imB +svh eIR iub hgn @@ -154395,9 +154395,9 @@ pvi yjm yjm hPs -iAU +tGG lAC -oMM +qwC aeX yjm oby @@ -154648,12 +154648,12 @@ aaa aaa aaa dEv -sab +otd uPZ eSj dst xYC -caF +ikb avf avg hgn @@ -158542,7 +158542,7 @@ xEo xEo nFZ jXU -npH +hBS xEo aaS aaS diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency_hugcage.dmm index 3bbb07ec162..596b9158149 100644 --- a/_maps/shuttles/emergency_hugcage.dmm +++ b/_maps/shuttles/emergency_hugcage.dmm @@ -27,7 +27,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape/brig) "cW" = ( -/mob/living/simple_animal/pet/fox, +/mob/living/basic/pet/fox, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dz" = ( diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm index 5c85d128bb9..ec4ef1863ad 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm @@ -3,3 +3,13 @@ /datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) + +// Prevents finding a target if a human is nearby +/datum/ai_planning_subtree/simple_find_target/not_while_observed + +/datum/ai_planning_subtree/simple_find_target/not_while_observed/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + for(var/mob/living/carbon/human/watcher in hearers(7, controller.pawn)) + if(watcher.stat != DEAD) + return + return ..() + diff --git a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm index 03d4cae546b..b9a63466d1f 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm @@ -169,3 +169,9 @@ emote_hear = list("buzzes.", "clacks.") emote_see = list("shakes their head.", "twitches their antennae.") speak = list("BZZZZT!", "CHTCHTCHT!", "Bzzz", "ChtChtCht") + +/datum/ai_planning_subtree/random_speech/fox + speech_chance = 1 + emote_hear = list("howls.", "barks.", "screams.") + emote_see = list("shakes their head.", "shivers.") + speak = list("Ack-Ack", "Ack-Ack-Ack-Ackawoooo", "Geckers", "Awoo", "Tchoff") diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index 799157a91c4..e12c2847351 100644 --- a/code/datums/memory/_memory.dm +++ b/code/datums/memory/_memory.dm @@ -263,6 +263,7 @@ /mob/living/basic/pet/dog/breaddog, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/basic/statue, /mob/living/basic/stickman, /mob/living/basic/stickman/dog, @@ -278,7 +279,6 @@ /mob/living/simple_animal/parrot, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/cak, - /mob/living/simple_animal/pet/fox, /obj/item/food/sausage/american, /obj/item/skub, ) diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm index 64f251f0c1c..b078b5c76ed 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm @@ -38,7 +38,7 @@ "i hope it was worth it", ) input_obj_or_mob = list( - /mob/living/simple_animal/pet/fox, + /mob/living/basic/pet/fox, ) output_organs = list( /obj/item/organ/internal/ears/fox, diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm index aed5cb78c92..b8a8f39fbc3 100644 --- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm +++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm @@ -12,10 +12,10 @@ spell_requirements = NONE possible_shapes = list( + /mob/living/basic/carp, /mob/living/basic/mouse, /mob/living/basic/pet/dog/corgi, - /mob/living/basic/carp, + /mob/living/basic/pet/fox, /mob/living/simple_animal/bot/secbot, - /mob/living/simple_animal/pet/fox, /mob/living/simple_animal/pet/cat, ) diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index b156ca85560..fc46350aaa3 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -22,7 +22,7 @@ /mob/living/basic/pet/dog/corgi/ian, /mob/living/basic/pet/dog/corgi/puppy/ian ), - JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault, + JOB_CAPTAIN = /mob/living/basic/pet/fox/renault, JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime, JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly, JOB_QUARTERMASTER = list( diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm index bd58abd984f..c624f05df61 100644 --- a/code/modules/cargo/packs/livestock.dm +++ b/code/modules/cargo/packs/livestock.dm @@ -133,9 +133,10 @@ desc = "The fox goes...? Contains one fox. Comes with a collar!"//what does the fox say cost = CARGO_CRATE_VALUE * 10 access_view = ACCESS_CAPTAIN - contains = list(/mob/living/simple_animal/pet/fox, - /obj/item/clothing/neck/petcollar, - ) + contains = list( + /mob/living/basic/pet/fox, + /obj/item/clothing/neck/petcollar, + ) crate_name = "fox crate" /datum/supply_pack/critter/goat diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index ba8522e93c9..4660636e94d 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -84,8 +84,8 @@ mobtype = list( /mob/living/basic/butterfly, /mob/living/basic/chick/permanent, + /mob/living/basic/pet/fox/docile, /mob/living/basic/rabbit, - /mob/living/simple_animal/pet/fox, ) mobtype += pick( /mob/living/basic/pet/dog/corgi, diff --git a/code/modules/mob/living/basic/pets/fox.dm b/code/modules/mob/living/basic/pets/fox.dm new file mode 100644 index 00000000000..578a64ba08d --- /dev/null +++ b/code/modules/mob/living/basic/pets/fox.dm @@ -0,0 +1,80 @@ +/* Foxes. +* +* Foxes are cowardly creatures that will hunt any small animals, but only when no one is looking. +*/ + +/mob/living/basic/pet/fox + name = "fox" + desc = "They're a fox." + icon = 'icons/mob/simple/pets.dmi' + icon_state = "fox" + icon_living = "fox" + icon_dead = "fox_dead" + speak_emote = list("geckers", "barks") + butcher_results = list(/obj/item/food/meat/slab = 3) + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "gently pushes aside" + response_disarm_simple = "gently push aside" + response_harm_continuous = "kicks" + response_harm_simple = "kick" + gold_core_spawnable = FRIENDLY_SPAWN + can_be_held = TRUE + held_state = "fox" + melee_damage_lower = 5 + melee_damage_upper = 5 + attack_verb_continuous = "bites" + attack_verb_simple = "bite" + attack_sound = 'sound/weapons/bite.ogg' + attack_vis_effect = ATTACK_EFFECT_BITE + ai_controller = /datum/ai_controller/basic_controller/fox + +/mob/living/basic/pet/fox/Initialize(mapload) + . = ..() + AddElement(/datum/element/pet_bonus, "pants and yaps happily!") + AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_CLAW) + AddElement(/datum/element/tiny_mob_hunter, MOB_SIZE_SMALL) + AddElement(/datum/element/ai_retaliate) + +/datum/ai_controller/basic_controller/fox + blackboard = list( + BB_BASIC_MOB_FLEEING = TRUE, + BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction, + BB_FLEE_TARGETTING_DATUM = new /datum/targetting_datum/basic/ignore_faction + ) + + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + planning_subtrees = list( + /datum/ai_planning_subtree/target_retaliate/to_flee, + /datum/ai_planning_subtree/flee_target/from_flee_key, + /datum/ai_planning_subtree/simple_find_target/not_while_observed, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + /datum/ai_planning_subtree/random_speech/fox, + ) + +// An AI controller for more docile foxes. +/datum/ai_controller/basic_controller/fox/docile + planning_subtrees = list( + /datum/ai_planning_subtree/target_retaliate/to_flee, + /datum/ai_planning_subtree/flee_target/from_flee_key, + /datum/ai_planning_subtree/random_speech/fox, + ) + +// Foxes will attack other station pets regardless of faction. +/datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction + +/datum/targetting_datum/basic/of_size/ours_or_smaller/ignore_faction/faction_check(mob/living/living_mob, mob/living/the_target) + return FALSE + +// The captain's fox, Renault +/mob/living/basic/pet/fox/renault + name = "Renault" + desc = "Renault, the Captain's trustworthy fox." + gender = FEMALE + gold_core_spawnable = NO_SPAWN + unique_pet = TRUE + +// A more docile subtype that won't attack other animals. +/mob/living/basic/pet/fox/docile + ai_controller = /datum/ai_controller/basic_controller/fox/docile diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 025b9363e84..9d69cf0eec9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1398,6 +1398,7 @@ /mob/living/basic/pet/dog/breaddog, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/basic/statue, /mob/living/basic/stickman, /mob/living/basic/stickman/dog, @@ -1413,7 +1414,6 @@ /mob/living/simple_animal/parrot, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/cak, - /mob/living/simple_animal/pet/fox, ) new_mob = new picked_animal(loc) diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm deleted file mode 100644 index 00a51c5f83f..00000000000 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ /dev/null @@ -1,43 +0,0 @@ -//Foxxy -/mob/living/simple_animal/pet/fox - name = "fox" - desc = "They're a fox." - icon = 'icons/mob/simple/pets.dmi' - icon_state = "fox" - icon_living = "fox" - icon_dead = "fox_dead" - speak = list("Ack-Ack","Ack-Ack-Ack-Ackawoooo","Geckers","Awoo","Tchoff") - speak_emote = list("geckers", "barks") - emote_hear = list("howls.","barks.") - emote_see = list("shakes their head.", "shivers.") - speak_chance = 1 - turns_per_move = 5 - butcher_results = list(/obj/item/food/meat/slab = 3) - response_help_continuous = "pets" - response_help_simple = "pet" - response_disarm_continuous = "gently pushes aside" - response_disarm_simple = "gently push aside" - response_harm_continuous = "kicks" - response_harm_simple = "kick" - gold_core_spawnable = FRIENDLY_SPAWN - can_be_held = TRUE - held_state = "fox" - ///In the case 'melee_damage_upper' is somehow raised above 0 - attack_verb_continuous = "bites" - attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' - attack_vis_effect = ATTACK_EFFECT_BITE - - footstep_type = FOOTSTEP_MOB_CLAW - -/mob/living/simple_animal/pet/fox/Initialize(mapload) - . = ..() - AddElement(/datum/element/pet_bonus, "pants and yaps happily!") - -//Captain fox -/mob/living/simple_animal/pet/fox/renault - name = "Renault" - desc = "Renault, the Captain's trustworthy fox." - gender = FEMALE - gold_core_spawnable = NO_SPAWN - unique_pet = TRUE diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 257015344ef..486d30e460b 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -645,12 +645,12 @@ /mob/living/basic/mouse, /mob/living/basic/pet/dog/corgi, /mob/living/basic/pet/dog/pug, + /mob/living/basic/pet/fox, /mob/living/simple_animal/crab, /mob/living/simple_animal/hostile/bear, /mob/living/simple_animal/hostile/bee, /mob/living/simple_animal/parrot/natural, /mob/living/simple_animal/pet/cat, - /mob/living/simple_animal/pet/fox, ) for(var/counter in 1 to rand(1, 25)) var/mobType = pick(valid_animals) diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index ff660b7aab4..c1778bc3b17 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -275,8 +275,6 @@ /mob/living/simple_animal/pet/cat/original, /mob/living/simple_animal/pet/cat/runtime, /mob/living/simple_animal/pet/cat/space, - /mob/living/simple_animal/pet/fox, - /mob/living/simple_animal/pet/fox/renault, /mob/living/simple_animal/pet/gondola, /mob/living/simple_animal/pet/gondola/gondolapod, /mob/living/simple_animal/pet/penguin, diff --git a/tgstation.dme b/tgstation.dme index 7a0aaf1e3d5..5dccbd2935f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4023,6 +4023,7 @@ #include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_loot.dm" #include "code\modules\mob\living\basic\lavaland\bileworm\bileworm_vileworm.dm" #include "code\modules\mob\living\basic\pets\dog.dm" +#include "code\modules\mob\living\basic\pets\fox.dm" #include "code\modules\mob\living\basic\pets\pet.dm" #include "code\modules\mob\living\basic\ruin_defender\stickman.dm" #include "code\modules\mob\living\basic\space_fauna\ant.dm" @@ -4243,7 +4244,6 @@ #include "code\modules\mob\living\simple_animal\friendly\cat.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" -#include "code\modules\mob\living\simple_animal\friendly\fox.dm" #include "code\modules\mob\living\simple_animal\friendly\gondola.dm" #include "code\modules\mob\living\simple_animal\friendly\penguin.dm" #include "code\modules\mob\living\simple_animal\friendly\pet.dm" diff --git a/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt b/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt new file mode 100644 index 00000000000..5fd7a1aa0f4 --- /dev/null +++ b/tools/UpdatePaths/Scripts/76662_simple_to_basic_foxes.txt @@ -0,0 +1 @@ +/mob/living/simple_animal/pet/fox/@SUBTYPES : /mob/living/basic/pet/fox/@SUBTYPES{@OLD}