diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c7ef4a576d3..79f13da5414 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -679,12 +679,10 @@ }, /area/station/engineering/lobby) "amq" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/vending/wardrobe/coroner_wardrobe, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "amt" = ( /obj/structure/cable, /turf/open/floor/iron/chapel{ @@ -7501,12 +7499,7 @@ /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "cge" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/office/tactical{ - dir = 1 - }, -/obj/effect/landmark/start/coroner, +/obj/machinery/light/dim/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) "cgs" = ( @@ -8331,14 +8324,8 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) "csV" = ( -/obj/machinery/requests_console/auto_name/directional/south, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bodycontainer/morgue/beeper_off{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored/graveyard) "csZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -9489,11 +9476,8 @@ /turf/open/floor/iron/smooth, /area/station/security/brig/upper) "cJa" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/operating{ - dir = 8 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) "cJb" = ( @@ -9613,10 +9597,10 @@ /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) "cLf" = ( -/obj/effect/decal/cleanable/blood/bubblegum, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bed/medical/emergency, -/obj/machinery/iv_drip, +/obj/structure/rack, +/obj/item/shovel, +/obj/item/clothing/mask/gas/plaguedoctor, +/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/iron/dark, /area/station/medical/morgue) "cLo" = ( @@ -10107,6 +10091,13 @@ dir = 8 }, /area/station/command/heads_quarters/rd) +"cRN" = ( +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/obj/effect/landmark/start/coroner, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "cRO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall, @@ -12299,10 +12290,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "dzr" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/smartfridge/organ, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "graveyard" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/turf/open/floor/plating, /area/station/medical/morgue) "dzt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -12550,8 +12543,11 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "dDq" = ( -/obj/effect/decal/cleanable/blood/bubblegum, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/medical/morgue) "dDt" = ( @@ -13800,6 +13796,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/medical/morgue) "dZc" = ( @@ -14180,6 +14177,7 @@ "efo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/iv_drip, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) "efv" = ( @@ -15077,6 +15075,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) +"ese" = ( +/obj/structure/fence/cut/medium, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored/graveyard) "eso" = ( /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/iron/dark/telecomms, @@ -16209,6 +16211,10 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/service) +"eML" = ( +/obj/machinery/vending/wardrobe/coroner_wardrobe, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "eMO" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -18759,15 +18765,9 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "fDp" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/machinery/computer/records/medical/laptop{ - dir = 8; - pixel_y = 1 - }, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) "fDI" = ( /obj/structure/table/wood, /obj/machinery/computer/records/medical/laptop{ @@ -21103,9 +21103,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "goc" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, +/obj/machinery/smartfridge/organ, /turf/open/floor/iron/dark, /area/station/medical/morgue) "goq" = ( @@ -21885,9 +21884,8 @@ /turf/open/floor/plating, /area/station/maintenance/aft/greater) "gCG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/optable, -/obj/machinery/newscaster/directional/north, +/obj/structure/sign/warning/cold_temp/directional/north, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) "gCK" = ( @@ -22087,9 +22085,8 @@ /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) "gEX" = ( -/obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/dim/directional/east, /turf/open/floor/iron/dark, /area/station/medical/morgue) "gEZ" = ( @@ -23490,11 +23487,13 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "hai" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/decal/cleanable/blood/bubblegum, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "han" = ( /obj/structure/table, /obj/item/plate, @@ -24129,6 +24128,17 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/mine/laborcamp) +"hlQ" = ( +/obj/machinery/door/airlock/external, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "graveyard" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/turf/open/floor/plating, +/area/station/medical/morgue) "hlS" = ( /obj/structure/table, /obj/item/clothing/under/misc/burial, @@ -25397,6 +25407,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"hFN" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) "hFU" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -25720,6 +25734,12 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/brig/upper) +"hLh" = ( +/obj/structure/closet/crate/grave/filled, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "hLk" = ( /obj/structure/table, /obj/item/paper, @@ -26461,9 +26481,11 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "hWX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mapping_helpers/airlock/access/all/medical/coroner, +/obj/machinery/door/airlock/medical/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/medical/morgue) "hXm" = ( @@ -27479,6 +27501,12 @@ /obj/item/storage/bag/plants, /turf/open/floor/iron, /area/station/service/hydroponics) +"inP" = ( +/obj/effect/decal/cleanable/dirt, +/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) "inQ" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -28180,6 +28208,7 @@ "iyF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) "iyK" = ( @@ -29682,12 +29711,10 @@ /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "iWN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/dim/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/newscaster/directional/north, +/obj/item/surgery_tray/full/morgue, +/obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/medical/morgue) "iWO" = ( @@ -31677,6 +31704,12 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"jCM" = ( +/obj/structure/rack, +/obj/item/bouquet, +/obj/item/binoculars, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "jDc" = ( /obj/effect/spawner/random/vending/snackvend, /obj/structure/sign/departments/restroom/directional/south, @@ -31820,6 +31853,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/bar) +"jFA" = ( +/obj/effect/decal/cleanable/blood/bubblegum, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "jFJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -32656,9 +32693,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "jRm" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, +/obj/structure/mannequin/skeleton, /turf/open/floor/iron/dark, /area/station/medical/morgue) "jRt" = ( @@ -34077,6 +34112,13 @@ /obj/structure/dresser, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"klS" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "klX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/public/glass{ @@ -35766,10 +35808,13 @@ /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "kKa" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bodycontainer/morgue/beeper_off{ - dir = 1 - }, +/obj/item/clothing/under/costume/skeleton, +/obj/item/clothing/head/helmet/skull, +/turf/open/floor/plating, +/area/station/medical/morgue) +"kKk" = ( +/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) "kKn" = ( @@ -40366,6 +40411,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"meW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mfc" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -40619,6 +40670,14 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/fore) +"mkN" = ( +/obj/machinery/computer/records/medical/laptop{ + pixel_y = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mld" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -41168,16 +41227,8 @@ /turf/open/floor/iron, /area/mine/laborcamp) "mtt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/splatter, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored/graveyard) "mtI" = ( /turf/closed/wall, /area/station/science/robotics/lab) @@ -46352,12 +46403,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/cobweb, -/obj/item/radio/intercom/directional/north, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) "nTK" = ( @@ -47439,11 +47490,9 @@ /turf/open/floor/iron/large, /area/station/medical/treatment_center) "olO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/blood/footprints, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/obj/structure/fence, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored/graveyard) "olQ" = ( /obj/structure/sign/nanotrasen{ pixel_y = 32 @@ -48769,6 +48818,11 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/aft) +"oEH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "oEX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51098,15 +51152,7 @@ /turf/open/floor/iron, /area/station/service/bar) "poY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/door/window/brigdoor/left/directional/west{ - name = "Coroner's Office"; - req_access = list("morgue_secure") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/structure/window, /turf/open/floor/iron/dark, /area/station/medical/morgue) "ppc" = ( @@ -53294,7 +53340,11 @@ /turf/open/genturf, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "pWG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/small/dim/directional/east, /turf/open/floor/iron/dark, /area/station/medical/morgue) "pWY" = ( @@ -53482,6 +53532,13 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"qad" = ( +/obj/machinery/requests_console/auto_name/directional/south, +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "qai" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating/snowed/icemoon, @@ -54410,10 +54467,11 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "qnv" = ( -/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) +/obj/structure/closet/crate/grave, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "qnC" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/ce) @@ -57367,8 +57425,8 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "rcU" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/mannequin/skeleton, +/obj/structure/table/optable, +/obj/effect/decal/cleanable/xenoblood, /turf/open/floor/iron/dark, /area/station/medical/morgue) "rcY" = ( @@ -58160,6 +58218,9 @@ /obj/structure/closet/athletic_mixed, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"rpi" = ( +/turf/closed/wall/ice, +/area/icemoon/underground/explored/graveyard) "rpu" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -60262,6 +60323,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/laborcamp) +"rWh" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "rWn" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -61686,11 +61755,13 @@ /turf/open/floor/iron/dark/textured_large, /area/station/cargo/bitrunning/den) "srG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/tracks{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron/dark, /area/station/medical/morgue) "srM" = ( @@ -62643,6 +62714,11 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"sEI" = ( +/obj/machinery/light/small/dim/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/medical/morgue) "sEK" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze{ @@ -68453,6 +68529,14 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) +"uwd" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "uwj" = ( /obj/machinery/duct, /obj/structure/disposalpipe/segment, @@ -69565,6 +69649,12 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"uOz" = ( +/obj/structure/marker_beacon/yellow, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" + }, +/area/icemoon/underground/explored/graveyard) "uOE" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -71238,6 +71328,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/courtroom) +"vrr" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "vrw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -71906,8 +72003,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "vAO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/filingcabinet/chestdrawer, +/obj/structure/bodycontainer/morgue/beeper_off{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "vAP" = ( @@ -74829,14 +74927,11 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "wvL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/misc/dirt{ + initial_gas_mix = "ICEMOON_ATMOS" }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) +/area/icemoon/underground/explored/graveyard) "wvV" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) @@ -77508,6 +77603,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/plastic, /area/station/commons/dorms/laundry) +"xkT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "xkZ" = ( /obj/machinery/teleport/station, /obj/machinery/light/small/directional/east, @@ -78925,9 +79026,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage) "xFG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/surgery_tray/full/morgue, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "xFM" = ( @@ -181722,7 +181823,7 @@ xOd ubi psb xMq -xMq +iDt iDt iDt iDt @@ -181978,11 +182079,11 @@ exw bpa psb psb -xMq -xMq iDt iDt iDt +scw +iDt ioK jEA bja @@ -182235,11 +182336,11 @@ exw phl ubi psb -xMq -xMq -nfG -xMq -xMq +iDt +iDt +iDt +iDt +scw btU btU btU @@ -182492,11 +182593,11 @@ exw phl cem psb -xMq -xMq -xMq -xMq -xMq +iDt +iDt +nfG +iDt +scw btU kCR btU @@ -182749,10 +182850,10 @@ exw phl fuH psb -fuH -fuH -fuH -fuH +iDt +iDt +iDt +iDt btU btU sGf @@ -183006,10 +183107,10 @@ exw phl fuH psb -fuH -fuH -fuH -fuH +iDt +iDt +iDt +jCM btU idr qSe @@ -183263,10 +183364,10 @@ exw bpa psb psb -fuH -fuH -fuH -fuH +olO +olO +olO +rpi btU oYm kht @@ -183520,10 +183621,10 @@ fuH phl ubi psb -fuH -fuH -fuH -btU +csV +mtt +mtt +mtt btU btU btU @@ -183777,12 +183878,12 @@ pJq phl bdX psb -fuH -fuH -fuH +uwd +rWh +mtt +hFN btU nTA -kJm nyQ meL efo @@ -184034,12 +184135,12 @@ gSU phl hvi psb -fuH -fuH -fuH -btU -wvL -jnY +hLh +amq +rWh +mtt +ioK +waH cWJ dYX pps @@ -184291,12 +184392,12 @@ drw bpa psb psb -fuH -fuH -fuH -btU +uOz +amq +hai mtt -tHe +ioK +srG aCl tHe tHe @@ -184547,13 +184648,13 @@ fwB drw nbl psb -fuH -fuH -fuH -fuH -btU -iWN -ofm +qnv +amq +wvL +mtt +mtt +ioK +waH nHc nHc ofm @@ -184804,13 +184905,13 @@ tkY jKL rpJ psb -fuH -fuH -fuH -fuH -btU +uOz +amq +wvL +fDp +csV +ioK waH -qnv iyF xyG jnY @@ -185061,14 +185162,14 @@ fwB drw qEh psb -fuH -fuH -fuH -fuH +qnv +amq +wvL +btU +hlQ btU gfy -olO -dYr +inP xMv wav pWi @@ -185319,16 +185420,16 @@ drw cQV psb psb -fuH -fuH +uOz +wvL btU +sEI btU -amq poY hWX goc -hai -csV +btU +btU ako goJ jeI @@ -185576,15 +185677,15 @@ drw xxo gcB psb -fuH -fuH +hLh +hai btU dzr -rcU -srG -gEX +btU +xkT +kKk pWG -jRm +btU kKa ako wlF @@ -185833,8 +185934,8 @@ drw xxo cem psb -fuH -fuH +hai +csV btU gCG cge @@ -186090,12 +186191,12 @@ drw xxo fuH psb -fuH -fuH +olO +ese btU cJa -fDp -xFG +oEH +klS vAO jUB oXs @@ -186350,10 +186451,10 @@ jre fuH fuH btU -btU -btU -btU -btU +mkN +meW +xFG +qad jUB srM skU @@ -186606,11 +186707,11 @@ vTp jre fuH fuH -fuH -fuH -xMq -xMq -xMq +btU +iWN +cRN +jFA +jRm jUB ksH yaJ @@ -186863,11 +186964,11 @@ xwx jre fuH fuH -fuH -xMq -xMq -thA -xMq +btU +vrr +rcU +gEX +eML xDb jUB aVU @@ -187120,11 +187221,11 @@ jre jre fuH fuH -xMq -xMq -thA -thA -xMq +btU +btU +btU +btU +btU iYH qsG aqp diff --git a/code/datums/elements/gravedigger.dm b/code/datums/elements/gravedigger.dm new file mode 100644 index 00000000000..7f88e7072ce --- /dev/null +++ b/code/datums/elements/gravedigger.dm @@ -0,0 +1,48 @@ +/** + * Gravedigger element. Allows for graves to be dug from certain tiles + */ +/datum/element/gravedigger + element_flags = ELEMENT_BESPOKE + argument_hash_start_idx = 2 + + /// A list of turf types that can be used to dig a grave. + var/static/list/turfs_to_consider = typecacheof(list( + /turf/open/misc/asteroid, + /turf/open/misc/dirt, + /turf/open/misc/grass, + /turf/open/misc/basalt, + /turf/open/misc/ashplanet, + /turf/open/misc/snow, + /turf/open/misc/sandy_dirt, + )) + +/datum/element/gravedigger/Attach(datum/target) + . = ..() + + if(!isitem(target)) //Must be an item to use toolspeed variable. + return ELEMENT_INCOMPATIBLE + + RegisterSignal(target, COMSIG_ITEM_INTERACTING_WITH_ATOM_SECONDARY, PROC_REF(dig_checks)) + +/datum/element/gravedigger/Detach(datum/source, ...) + . = ..() + UnregisterSignal(source, COMSIG_ITEM_INTERACTING_WITH_ATOM_SECONDARY) + +/datum/element/gravedigger/proc/dig_checks(datum/source, mob/living/user, atom/interacting_with, list/modifiers) + SIGNAL_HANDLER + + if(!is_type_in_typecache(interacting_with, turfs_to_consider)) + return NONE + + if(locate(/obj/structure/closet/crate/grave) in interacting_with) + user.balloon_alert(user, "grave already present!") + return ITEM_INTERACT_BLOCKING + + user.balloon_alert(user, "digging grave...") + playsound(interacting_with, 'sound/effects/shovel_dig.ogg', 50, TRUE) + INVOKE_ASYNC(src, PROC_REF(perform_digging), user, interacting_with, source) + return ITEM_INTERACT_BLOCKING + +/datum/element/gravedigger/proc/perform_digging(mob/user, atom/dig_area, obj/item/our_tool) + if(our_tool.use_tool(dig_area, user, 10 SECONDS)) + new /obj/structure/closet/crate/grave/fresh(dig_area) //We don't get_turf for the location since this is guaranteed to be a turf at this point. diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 38855de366f..59ceb242887 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -287,3 +287,13 @@ /area/icemoon/underground/explored // ruins can't spawn here name = "Icemoon Underground" area_flags = UNIQUE_AREA + +/area/icemoon/underground/explored/graveyard + name = "Graveyard" + area_flags = UNIQUE_AREA + ambience_index = AMBIENCE_SPOOKY + icon = 'icons/area/areas_station.dmi' + icon_state = "graveyard" + +/area/icemoon/underground/explored/graveyard/chapel + name = "Chapel Graveyard" diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index 4b43757bb9c..aa295e1e834 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -50,9 +50,6 @@ if(has_floor_variance && prob(floor_variance)) icon_state = "[base_icon_state][rand(0,12)]" -/turf/open/misc/asteroid/burn_tile() - return - /turf/open/misc/asteroid/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 3c29a6a3945..19dbc76a32f 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -307,6 +307,14 @@ if(user.loc == src) to_chat(user, span_warning("You fail to dig yourself out of [src]!")) +/obj/structure/closet/crate/grave/fresh + name = "makeshift grave" + desc = "A hastily-dug grave. This is definitely not six feet deep, but it'll hold a body." + icon = 'icons/obj/storage/crates.dmi' + icon_state = "grave_fresh" + base_icon_state = "grave_fresh" + material_drop_amount = 0 + /obj/structure/closet/crate/grave/filled/lead_researcher name = "ominous burial mound" desc = "Even in a place filled to the brim with graves, this one shows a level of preperation and planning that fills you with dread." diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 4fdd997fcab..abf5ca77e18 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -143,6 +143,7 @@ effectiveness = 40, \ ) //it's sharp, so it works, but barely. + AddElement(/datum/element/gravedigger) /obj/item/shovel/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -223,6 +224,7 @@ /obj/item/trench_tool/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) + AddElement(/datum/element/gravedigger) /obj/item/trench_tool/examine(mob/user) . = ..() diff --git a/icons/area/areas_station.dmi b/icons/area/areas_station.dmi index 66098018f75..724073905b5 100644 Binary files a/icons/area/areas_station.dmi and b/icons/area/areas_station.dmi differ diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi index dc5c045aefa..0a8640860ec 100644 Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 5b05057000c..fd6bb29c707 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1439,6 +1439,7 @@ #include "code\datums\elements\frozen.dm" #include "code\datums\elements\gags_recolorable.dm" #include "code\datums\elements\give_turf_traits.dm" +#include "code\datums\elements\gravedigger.dm" #include "code\datums\elements\hat_wearer.dm" #include "code\datums\elements\haunted.dm" #include "code\datums\elements\high_fiver.dm"