diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm index 5b3efc37d68..79c97570802 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm @@ -24,7 +24,7 @@ /area/ruin/bughabitat) "bu" = ( /obj/effect/spawner/random/food_or_drink/snack, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/fakebasalt, /area/ruin/bughabitat) "bQ" = ( @@ -140,7 +140,7 @@ /turf/open/floor/plastic, /area/ruin/bughabitat) "ot" = ( -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /obj/item/seeds/soya, /turf/open/floor/fakebasalt, /area/ruin/bughabitat) @@ -363,7 +363,7 @@ /area/ruin/bughabitat) "RJ" = ( /obj/structure/window/reinforced/spawner/directional/east, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/fakebasalt, /area/ruin/bughabitat) "RR" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent/commsoffice_cheap.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent/commsoffice_cheap.dmm index c43f60ec550..462f5b486aa 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent/commsoffice_cheap.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent/commsoffice_cheap.dmm @@ -112,7 +112,7 @@ /area/ruin/comms_agent) "U" = ( /obj/structure/closet/crate, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /obj/effect/spawner/random/engineering/tool, /obj/effect/spawner/random/engineering/tool, /obj/effect/spawner/random/engineering/tool, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 4f36c39e6ad..09fcc995760 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -11,7 +11,7 @@ pixel_y = -12 }, /obj/effect/decal/cleanable/insectguts, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) "aP" = ( @@ -143,7 +143,7 @@ name = "antique cleaver"; desc = "A huge knife for chopping up and slicing meat. Years of service has scarred its metal and worn grooves into the handle, but its blade is well-maintained and very sharp." }, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) "gI" = ( @@ -559,7 +559,7 @@ /obj/item/trash/popcorn/caramel{ pixel_y = -6 }, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) "zK" = ( @@ -890,8 +890,8 @@ /obj/item/dog_bone{ pixel_y = -6 }, -/mob/living/basic/cockroach, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) "KT" = ( diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm index fc94b80d68b..568f2e9194f 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm @@ -314,7 +314,7 @@ /obj/item/restraints/handcuffs/cable/zipties/used, /obj/item/toy/brokenradio, /obj/effect/spawner/random/engineering/tool, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/squat) "rq" = ( diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm index b7c9cf52c7b..38c3d2cf070 100644 --- a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm @@ -3217,7 +3217,7 @@ /turf/open/floor/wood, /area/ruin/space/has_grav/hauntedtradingpost/public) "BS" = ( -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm index 482652c6734..29db691e5af 100644 --- a/_maps/RandomZLevels/museum.dmm +++ b/_maps/RandomZLevels/museum.dmm @@ -6011,7 +6011,7 @@ /turf/closed/indestructible/reinforced/titanium/nodiagonal, /area/awaymission/museum) "Yg" = ( -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/plating, /area/awaymission/museum) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 92e91471017..2c6a186ae24 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -69,12 +69,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"aaX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/cockroach, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "aaY" = ( /obj/effect/landmark/start/hangover/closet, /obj/structure/sign/nanotrasen{ @@ -221,6 +215,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) +"acy" = ( +/obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/curtain/bounty{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den) "acD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1175,14 +1179,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"aoA" = ( -/obj/item/exodrone, -/obj/machinery/exodrone_launcher, -/obj/effect/turf_decal/box, -/obj/effect/decal/cleanable/blood/oil/slippery, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/plating, -/area/station/cargo/drone_bay) "aoB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -1245,14 +1241,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"ape" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) "apf" = ( /obj/machinery/mech_bay_recharge_port{ dir = 8 @@ -1370,13 +1358,6 @@ dir = 10 }, /area/station/service/chapel) -"aqE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random/structure/crate, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/maintenance/department/eva/abandoned) "aqF" = ( /obj/structure/table, /obj/item/paper_bin, @@ -1694,6 +1675,13 @@ }, /turf/open/floor/plating, /area/station/tcommsat/server) +"atx" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/station/science/ordnance/bomb) "atG" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -2203,6 +2191,14 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"aAe" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "aAh" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2287,11 +2283,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"aBy" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "aBz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2574,17 +2565,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"aFB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "aFE" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, /area/station/command/teleporter) -"aFH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "aFU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -3053,6 +3042,12 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"aLb" = ( +/obj/machinery/netpod, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "aLv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3835,6 +3830,16 @@ /obj/structure/mirror/directional/north, /turf/open/floor/wood, /area/station/hallway/secondary/service) +"aVG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "aVO" = ( /obj/machinery/door/window/left/directional/east{ name = "Coffin Storage"; @@ -4133,11 +4138,6 @@ dir = 6 }, /area/station/service/chapel) -"aYR" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/office) "aYU" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -5019,6 +5019,11 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"bjW" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/plating, +/area/station/maintenance/department/crew_quarters/bar) "bkd" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -5032,6 +5037,15 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"bkh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) "bkj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5840,6 +5854,11 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white/telecomms, /area/station/tcommsat/server) +"bvE" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "bvI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, @@ -6029,13 +6048,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) -"bxp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/shard, -/obj/effect/decal/cleanable/glass, -/mob/living/basic/cockroach, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "byn" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -6151,6 +6163,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"bzO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/plating, +/area/station/service/theater/abandoned) "bzU" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6334,14 +6354,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/medical/medbay) -"bBt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/mob/living/basic/cockroach, -/turf/open/floor/plating, -/area/station/maintenance/fore) "bBz" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -8224,13 +8236,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/maintenance/department/science/xenobiology) -"bWD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/mob/living/basic/cockroach, -/turf/open/floor/wood, -/area/station/service/library/abandoned) "bWH" = ( /obj/item/stack/sheet/glass{ amount = 20; @@ -8453,16 +8458,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) -"bZe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/glass, -/obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/cockroach, -/turf/open/floor/iron, -/area/station/medical/abandoned) "bZz" = ( /obj/structure/table/wood, /obj/item/folder, @@ -9478,17 +9473,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/circuits) -"cme" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron, -/area/station/maintenance/disposal) "cmi" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/leavy/style_random, @@ -10193,12 +10177,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"cwt" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/storage) "cwv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10860,6 +10838,16 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron, /area/station/science/ordnance) +"cDS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/iron, +/area/station/medical/abandoned) "cDT" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -10962,14 +10950,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) -"cFs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "cFz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11287,6 +11267,15 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) +"cJO" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "cJX" = ( /obj/structure/table/reinforced, /obj/machinery/status_display/evac/directional/west, @@ -12411,11 +12400,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel/storage) -"cYT" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/maintenance/port) "cYW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13352,11 +13336,6 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"dlo" = ( -/obj/effect/decal/cleanable/blood/gibs/robot_debris/down, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "dlp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13692,6 +13671,11 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/station/engineering/main) +"dqY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/science/research/abandoned) "dra" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15227,10 +15211,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"dKx" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/maintenance/department/crew_quarters/bar) "dKC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16343,6 +16323,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"dYJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "dYL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16500,6 +16487,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"eaJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/checker, +/area/station/engineering/supermatter/room) "eaO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17001,6 +16996,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/storage) +"eif" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "eio" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -17009,11 +17013,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/bar) -"eit" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/cockroach, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den) "eiw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17428,6 +17427,12 @@ dir = 1 }, /area/station/engineering/supermatter/room) +"epK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "epU" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -18308,6 +18313,13 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +"eAM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/spawner/random/structure/crate, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/department/eva/abandoned) "eAO" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -21077,6 +21089,13 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/service/library/abandoned) +"fjK" = ( +/obj/effect/decal/cleanable/blood/oil/slippery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/fore) "fjP" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -24701,6 +24720,16 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"gdT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/bot, +/obj/machinery/mineral/stacking_unit_console{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal) "gee" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -25251,6 +25280,12 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) +"gkO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/science/research/abandoned) "gkP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/pdapainter/supply, @@ -27820,12 +27855,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"gQh" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/storage) "gQk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28060,15 +28089,6 @@ /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"gTq" = ( -/obj/effect/decal/cleanable/blood/gibs/robot_debris/old, -/obj/effect/spawner/random/engineering/tank, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/science) "gTr" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/bot, @@ -28209,12 +28229,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/circuits) -"gUE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "gUF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -28866,6 +28880,12 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"heg" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/storage) "hek" = ( /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -29509,6 +29529,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/captain/private) +"hno" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "hnq" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -29525,6 +29553,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) +"hnv" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/maintenance/department/crew_quarters/bar) "hnx" = ( /obj/structure/table, /obj/structure/sign/nanotrasen{ @@ -29832,6 +29864,17 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"hsl" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/maintenance/disposal) "hsm" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/computer/mecha{ @@ -30140,10 +30183,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/security/execution/transfer) -"hww" = ( -/mob/living/basic/cockroach, -/turf/open/floor/wood, -/area/station/service/library/abandoned) "hwB" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/siding/white/corner{ @@ -31136,6 +31175,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/office) +"hLc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil/slippery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science/research/abandoned) "hLe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -32852,13 +32899,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) -"iga" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "igb" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/wood, @@ -33785,6 +33825,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/tools) +"isG" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/light/broken/directional/north, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 1 + }, +/turf/open/floor/iron/smooth_half, +/area/station/maintenance/port/aft) "isH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -34374,6 +34422,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/station/maintenance/port) +"iAW" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/station/maintenance/port) "iAY" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -34758,6 +34810,11 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/service/electronic_marketing_den) +"iGa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science/xenobiology) "iGd" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -37509,6 +37566,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) +"jnO" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/medical/pharmacy) "jnY" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, /obj/machinery/meter, @@ -37520,12 +37584,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/pumproom) -"joa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/science/research/abandoned) "joc" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -39415,6 +39473,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) +"jLZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/cargo/sorting) "jMa" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -39466,10 +39531,6 @@ /obj/item/gps, /turf/open/floor/iron, /area/station/commons/storage/primary) -"jMM" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "jMQ" = ( /obj/effect/landmark/start/hangover, /obj/item/kirbyplants/random, @@ -40985,19 +41046,6 @@ /obj/effect/landmark/observer_start, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kfL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "kfQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -41340,14 +41388,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"kjC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/cockroach, -/turf/open/floor/plating, -/area/station/service/theater/abandoned) "kjG" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -41710,16 +41750,6 @@ }, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"koB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "koJ" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -43000,6 +43030,14 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/large, /area/station/medical/virology) +"kHh" = ( +/obj/item/exodrone, +/obj/machinery/exodrone_launcher, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/blood/oil/slippery, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) "kHk" = ( /obj/structure/chair/office, /obj/effect/landmark/start/librarian, @@ -43228,6 +43266,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"kKP" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "kKW" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -43331,14 +43374,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"kMg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/checker, -/area/station/engineering/supermatter/room) "kMh" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/decal/cleanable/dirt, @@ -43875,15 +43910,6 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) -"kUg" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/port) "kUn" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown{ @@ -44021,10 +44047,6 @@ "kVP" = ( /turf/closed/wall, /area/station/hallway/secondary/service) -"kVT" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/station/maintenance/port) "kVZ" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/effect/decal/cleanable/dirt, @@ -47282,6 +47304,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos/mix) +"lKh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/construction) "lKl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -47537,12 +47569,6 @@ "lMZ" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) -"lNc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "lNd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47836,6 +47862,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port) +"lRI" = ( +/obj/item/book/bible, +/obj/structure/altar/of_gods, +/turf/open/floor/iron/grimy, +/area/station/service/chapel) "lSh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -48133,14 +48164,6 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/warehouse) -"lXl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/oil/slippery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/science/research/abandoned) "lXm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -49005,6 +49028,11 @@ }, /turf/open/floor/iron, /area/station/security/office) +"mig" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den) "miv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49757,6 +49785,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"mtZ" = ( +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/wood, +/area/station/service/library/abandoned) "mub" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/trimline/dark_red/filled/line{ @@ -49966,11 +49998,6 @@ }, /turf/open/floor/plating, /area/station/medical/pharmacy) -"mwA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/science/xenobiology) "mwK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50778,6 +50805,10 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"mGn" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "mGq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -51757,28 +51788,6 @@ /obj/machinery/barsign/all_access/directional/north, /turf/open/floor/iron/dark, /area/station/service/abandoned_gambling_den) -"mSY" = ( -/obj/effect/decal/cleanable/blood/splatter/oil, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ - pixel_x = 5 - }, -/obj/machinery/camera/autoname/directional/south, -/obj/item/toy/figure/bitrunner{ - pixel_x = -6 - }, -/obj/structure/sign/poster/official/random/directional/south, -/obj/machinery/firealarm/directional/west{ - pixel_y = -4 - }, -/obj/machinery/light_switch/directional/west{ - pixel_y = 6 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/cargo/bitrunning/den) "mSZ" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/medical/general, @@ -52843,13 +52852,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/blue, /area/station/medical/psychology) -"niV" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "niZ" = ( /obj/structure/cable, /obj/machinery/door/airlock/public/glass{ @@ -53207,14 +53209,6 @@ /obj/item/soap/homemade, /turf/open/floor/iron/white, /area/station/security/prison/toilet) -"nnZ" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "nob" = ( /obj/structure/chair{ dir = 1; @@ -53877,6 +53871,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"nxo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) "nxs" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/lattice, @@ -53902,6 +53906,10 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"nxQ" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) "nxR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55078,6 +55086,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"nMS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/sign/warning/xeno_mining/directional/south, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science/xenobiology) "nMT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -55264,14 +55278,6 @@ dir = 1 }, /area/station/engineering/lobby) -"nOZ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "nPa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57016,6 +57022,12 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"omp" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/storage) "omv" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -58608,14 +58620,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -"oKn" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/cockroach, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den) "oKr" = ( /turf/closed/wall, /area/station/security/checkpoint/supply) @@ -58981,6 +58985,14 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, /area/station/medical/storage) +"oOO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) "oPc" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -59084,12 +59096,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"oQw" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "oQJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59417,16 +59423,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"oUe" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/curtain/bounty{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den) "oUh" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 @@ -59828,14 +59824,6 @@ /obj/structure/flora/bush/leavy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) -"pbn" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "pbp" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -59890,6 +59878,14 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"pbO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/plating, +/area/station/maintenance/fore) "pbP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59970,6 +59966,13 @@ }, /turf/open/floor/iron, /area/station/security/prison) +"pcB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/wood, +/area/station/service/library/abandoned) "pcC" = ( /obj/structure/table/wood, /obj/item/coin/antagtoken, @@ -60816,21 +60819,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"plP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/science) "plQ" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -61656,13 +61644,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/fore) -"pyd" = ( -/obj/effect/decal/cleanable/blood/oil/slippery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/fore) "pyh" = ( /obj/structure/chair/office, /obj/structure/sign/poster/random/directional/north, @@ -62507,6 +62488,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/herringbone, /area/station/cargo/miningoffice) +"pGX" = ( +/obj/effect/decal/cleanable/blood/gibs/robot_debris/down, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "pHa" = ( /obj/structure/lattice, /obj/structure/sign/warning/directional/west, @@ -64346,13 +64332,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"qbj" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/station/science/ordnance/bomb) "qbp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -64887,15 +64866,6 @@ }, /turf/open/floor/plating, /area/station/service/theater/abandoned) -"qje" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "qjh" = ( /obj/effect/landmark/start/chemist, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -64928,6 +64898,13 @@ "qjO" = ( /turf/open/floor/plating, /area/station/maintenance/port/fore) +"qjW" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/reflector/single, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "qkb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -65671,6 +65648,12 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/bitrunning/den) +"qui" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) "qul" = ( /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/wood, @@ -66248,6 +66231,13 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"qBx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "qBF" = ( /obj/machinery/status_display/ai/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66874,6 +66864,13 @@ /obj/effect/turf_decal/tile/green/full, /turf/open/floor/iron/large, /area/station/medical/virology) +"qJG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "qJI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -66952,6 +66949,14 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/toilet/locker) +"qKG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/iron/dark, +/area/station/service/abandoned_gambling_den) "qKH" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -67282,11 +67287,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall, /area/station/commons/fitness/recreation) -"qOr" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "qOB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67887,11 +67887,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"qYn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/science/research/abandoned) "qYo" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -68022,6 +68017,12 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"raj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "ram" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, @@ -68597,6 +68598,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"rii" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/science) "riq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, @@ -69640,16 +69656,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"rvu" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/engineering/tracking_beacon, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/construction) "rvG" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -70750,6 +70756,13 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) +"rJO" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "rJQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ @@ -71194,13 +71207,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"rOU" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/reflector/single, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "rOV" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -71875,13 +71881,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"rWa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/cargo/sorting) "rWo" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -71959,6 +71958,14 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) +"rXi" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "rXr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72643,10 +72650,6 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"sfE" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) "sfH" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral{ @@ -73886,6 +73889,18 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"sws" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Freezers"; + name = "engineering camera"; + network = list("ss13","engine") + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "swD" = ( /obj/machinery/power/emitter, /obj/effect/decal/cleanable/dirt, @@ -74055,6 +74070,28 @@ dir = 8 }, /area/station/engineering/lobby) +"syw" = ( +/obj/effect/decal/cleanable/blood/splatter/oil, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = 5 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/item/toy/figure/bitrunner{ + pixel_x = -6 + }, +/obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/firealarm/directional/west{ + pixel_y = -4 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/bitrunning/den) "syE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -74232,13 +74269,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/barber) -"sAi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/sign/warning/xeno_mining/directional/north, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/science/xenobiology) "sAm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -74732,6 +74762,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"sHk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/sign/warning/xeno_mining/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science/xenobiology) "sHl" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -76356,16 +76393,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/medbay) -"tcd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/bot, -/obj/machinery/mineral/stacking_unit_console{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal) "tce" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/radio/intercom/directional/north, @@ -76646,6 +76673,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) +"tgp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mob_spawn/cockroach, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "tgq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77856,6 +77889,19 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"twX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) "txc" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -79636,6 +79682,23 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"tTJ" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) "tTM" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -80274,6 +80337,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) +"ubK" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "ubL" = ( /obj/structure/table, /obj/item/book/manual/chef_recipes, @@ -80381,6 +80451,14 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/large, /area/station/security/processing) +"ucI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "ucT" = ( /obj/machinery/camera/directional/west{ c_tag = "Chapel - Fore Port"; @@ -80892,13 +80970,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"ujT" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/medical/pharmacy) "ujU" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" @@ -80997,12 +81068,6 @@ }, /turf/open/floor/plating, /area/station/engineering/transit_tube) -"ulE" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "ulH" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, @@ -81083,12 +81148,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"umv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/mob/living/basic/cockroach, -/turf/open/floor/iron/grimy, -/area/station/commons/vacant_room/office) "umz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -81406,15 +81465,6 @@ }, /turf/open/floor/iron, /area/station/commons/toilet/locker) -"uqI" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "uqJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82862,6 +82912,11 @@ }, /turf/open/floor/iron/dark/corner, /area/station/commons/fitness/recreation) +"uIj" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/maintenance/port) "uIq" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, @@ -83717,6 +83772,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"uRN" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "uRV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -84044,12 +84105,6 @@ }, /turf/open/floor/carpet, /area/station/command/bridge) -"uWm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/sign/warning/xeno_mining/directional/south, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/science/xenobiology) "uWI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -84409,11 +84464,6 @@ dir = 8 }, /area/station/service/chapel) -"vba" = ( -/obj/effect/mapping_helpers/burnt_floor, -/mob/living/basic/cockroach, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/bar) "vbb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -85835,18 +85885,6 @@ }, /turf/open/floor/iron/checker, /area/station/service/hydroponics/garden/abandoned) -"vuG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Freezers"; - name = "engineering camera"; - network = list("ss13","engine") - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "vuJ" = ( /obj/structure/chair/office/light{ dir = 8 @@ -86263,6 +86301,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/service/chapel/storage) +"vzh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "vzt" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -87214,6 +87258,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"vLW" = ( +/obj/effect/decal/cleanable/blood/gibs/robot_debris/old, +/obj/effect/spawner/random/engineering/tank, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/science) "vMd" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, @@ -87986,12 +88039,6 @@ /obj/structure/sign/warning/vacuum/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"vWQ" = ( -/obj/machinery/netpod, -/obj/effect/decal/cleanable/blood/gibs/robot_debris, -/obj/structure/sign/poster/contraband/random/directional/south, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/bitrunning/den) "vWR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -88535,14 +88582,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"weM" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/light/broken/directional/north, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 1 - }, -/turf/open/floor/iron/smooth_half, -/area/station/maintenance/port/aft) "weO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -89833,11 +89872,6 @@ /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"wtH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "wtS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91017,13 +91051,6 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/chapel) -"wHH" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "wHQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/west, @@ -91829,23 +91856,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/maintenance/port) -"wTL" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/effect/decal/cleanable/blood/oil, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/bitrunning/den) "wTN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -93927,6 +93937,11 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"xwj" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/office) "xwo" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/lattice, @@ -94563,11 +94578,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/science/xenobiology) -"xDd" = ( -/obj/item/book/bible, -/obj/structure/altar/of_gods, -/turf/open/floor/iron/grimy, -/area/station/service/chapel) "xDf" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -94951,16 +94961,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/engineering/atmos) -"xHw" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "xHx" = ( /obj/structure/chair/wood{ dir = 4 @@ -110906,7 +110906,7 @@ aad tnB tnB pPf -qbj +atx itR mcA pqX @@ -116021,7 +116021,7 @@ gCt ozA pJz gCt -sfE +nxQ gCt gCt nCi @@ -116515,7 +116515,7 @@ mZr lin ciB gbF -iga +rJO cGh tBX vAC @@ -116529,7 +116529,7 @@ pgG wzW vQq eIy -uWm +nMS nCi rIb rIb @@ -116539,7 +116539,7 @@ etv uhb uhb nCi -sAi +sHk lqa vBO uGn @@ -117030,7 +117030,7 @@ bHg haw tqa gnw -pbn +aAe mWF jcg jcg @@ -117056,7 +117056,7 @@ uhb jPZ tmr nCi -mwA +iGa hHF guA nCi @@ -117276,7 +117276,7 @@ aCy gAw gpy feO -rOU +qjW mHg ntd wvl @@ -117536,7 +117536,7 @@ ntd ntd sAm rVD -jMM +mGn gAw jPd ehD @@ -118347,7 +118347,7 @@ jiX blc rCc rCc -aaX +tgp rCc tkj bNr @@ -118598,7 +118598,7 @@ rTW vlS rTW oVW -oUe +acy jET kot ntq @@ -118818,7 +118818,7 @@ aaa gAw lLU ntd -jMM +mGn sAm mHg hQK @@ -119018,7 +119018,7 @@ elx gqR uuC qCA -koB +aVG lzp fTC vQU @@ -119073,7 +119073,7 @@ iBR dEL iBR gAw -nOZ +hno rsq qSL dPB @@ -119346,7 +119346,7 @@ sHT sHT pOf pOf -oQw +raj sLe nbI pTC @@ -119844,7 +119844,7 @@ swR aHE uVh gAw -qje +cJO fbA bmf oLd @@ -120104,7 +120104,7 @@ gAw unL cel oLd -ulE +uRN fvE dIm gmx @@ -120120,7 +120120,7 @@ oDl sMw cCY hsB -kMg +eaJ iKH pTC uKY @@ -120358,7 +120358,7 @@ xev qpG kaS gAw -vuG +sws jKg iho uRx @@ -120398,7 +120398,7 @@ sfN rnS mAt mSP -oKn +qKG bfz bsY vOk @@ -120408,7 +120408,7 @@ tuq grz urh pxb -eit +mig egk nCI nCI @@ -121332,7 +121332,7 @@ feK vlA ecH rVx -xHw +nxo dYj kba rGb @@ -122203,7 +122203,7 @@ nEc nJc pjS nVQ -lXl +hLc qjy qjy qjy @@ -122978,7 +122978,7 @@ kGQ bGz nzb aeQ -qYn +dqY jOV nEc qYo @@ -123130,7 +123130,7 @@ pdn cpw aEb nBW -kfL +twX dPi fbg cIn @@ -123218,10 +123218,10 @@ sZC tSq jDd dYx -dlo +pGX epA jUx -qOr +kKP pra nuM gFP @@ -123478,7 +123478,7 @@ bEU xxa wEI iGw -gTq +vLW wEI wEI nmX @@ -123717,7 +123717,7 @@ xSC wmO mHm tIK -gQh +omp wKF aLx pTC @@ -123747,7 +123747,7 @@ nEc nEc iYE fux -joa +gkO bqo pmE nEc @@ -124480,7 +124480,7 @@ kwL pTC xDV aJN -nnZ +rXi swD baw fii @@ -125766,7 +125766,7 @@ pTC jVS nED gCG -cYT +uIj tZu pTC rrU @@ -126295,7 +126295,7 @@ jto gcr vcB ccY -kVT +iAW vcB xao tDE @@ -126336,7 +126336,7 @@ ihO sIn iRk hQx -bWD +pcB vyC daz bAz @@ -126731,7 +126731,7 @@ oYs wIu uVe fam -bxp +qJG dlz jWG oYs @@ -127088,7 +127088,7 @@ elq oXg bWH jDd -plP +rii jUx wEI wEI @@ -127367,7 +127367,7 @@ fiq kVH vLq xHr -hww +mtZ wiA scU qQM @@ -127379,7 +127379,7 @@ kSl wRT wRT ber -aqE +eAM lRg qYo efQ @@ -127832,7 +127832,7 @@ pTC tCn vlM eaC -kUg +bkh eHn pTC tuj @@ -129101,7 +129101,7 @@ lan dvG cOX nym -gUE +epK aXV bIk ozE @@ -129849,7 +129849,7 @@ oYs ttQ dCs tYE -umv +qui rJy gqA pSt @@ -129874,7 +129874,7 @@ dvG abL dYH mFo -gUE +epK dvL orY xJe @@ -130446,7 +130446,7 @@ kzc vhq wxw qQM -weM +isG vDL cUk qQM @@ -130700,7 +130700,7 @@ ctU fYa cpv kzc -ape +oOO vLB qQM lIY @@ -135490,7 +135490,7 @@ hJP kRv qAV xiG -vba +bjW cIX jEF edg @@ -136005,7 +136005,7 @@ qAV qAV qAV qAV -dKx +hnv loi nal gOR @@ -136061,7 +136061,7 @@ orH hiV mvS rQj -ujT +jnO mql mHA pgy @@ -136089,7 +136089,7 @@ qEf aVw ycR aaM -uqI +eif wKq tgN lLO @@ -136603,7 +136603,7 @@ ako gMX iNj gLI -wHH +dYJ vdU iGr dBn @@ -137801,7 +137801,7 @@ tHg vVu wWt hqK -aYR +xwj rve pCy hoC @@ -138048,7 +138048,7 @@ fqi wVQ uCt jdL -aoA +kHh ieI rEA jbe @@ -138145,7 +138145,7 @@ ako hbO dRy aaM -niV +ubK vnB uue jdf @@ -139071,7 +139071,7 @@ wlT szg brZ bzl -lNc +vzh fCA utQ lDi @@ -139822,7 +139822,7 @@ aeF jdL vkN iql -pyd +fjK ozQ gJB aBM @@ -140081,7 +140081,7 @@ htg mtu mGq pjk -bBt +pbO pjk mGq pjk @@ -140376,7 +140376,7 @@ jcy kGo rII esq -rWa +jLZ cam xhW dWz @@ -140883,7 +140883,7 @@ oSv wqo mcl dbx -cwt +heg jIa cNf ohH @@ -141151,7 +141151,7 @@ qbd gHq lJw tYI -mSY +syw hXg lDY tpZ @@ -141638,7 +141638,7 @@ jdL gMt jdL vNo -cFs +ucI wyh mLD dbx @@ -141665,7 +141665,7 @@ vXy kuj cjO hrz -wTL +tTJ hXg uoz tpZ @@ -141922,7 +141922,7 @@ axc hXg vuc sYn -vWQ +aLb hXg uoz tpZ @@ -142405,7 +142405,7 @@ pYG pYG kic kic -cme +hsl jap kic fXt @@ -143302,7 +143302,7 @@ rMa sDJ rMa iVt -xDd +lRI slr oQM xlC @@ -143976,7 +143976,7 @@ aaa gME rYR hYO -aFH +qBx gME aaa aaa @@ -144201,7 +144201,7 @@ aac aad kic yhv -tcd +gdT qCr ocO kqQ @@ -146065,7 +146065,7 @@ irl dth rYA hpt -aBy +bvE rYA bGN bGN @@ -148410,12 +148410,12 @@ wEM uen iYg klE -bZe +cDS tHd ujU ehy cfR -rvu +lKh uPq mIc iFL @@ -149711,7 +149711,7 @@ waI iEa nbc kKl -kjC +bzO gdr aii lXx @@ -150467,7 +150467,7 @@ nXH fFU cgf jlD -wtH +aFB dor nXH bzU diff --git a/_maps/minigame/basketball/greytide_worldwide.dmm b/_maps/minigame/basketball/greytide_worldwide.dmm index 3c9ce6ad692..f62e06681ce 100644 --- a/_maps/minigame/basketball/greytide_worldwide.dmm +++ b/_maps/minigame/basketball/greytide_worldwide.dmm @@ -603,7 +603,7 @@ /area/centcom/basketball) "Ql" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating, /area/centcom/basketball) "QC" = ( @@ -624,7 +624,7 @@ /turf/open/floor/plating, /area/centcom/basketball) "SF" = ( -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/plating, /area/centcom/basketball) "Tc" = ( diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index 798dfc02225..f87c81c38cb 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -41,10 +41,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/shuttle/escape) -"cr" = ( -/obj/effect/decal/cleanable/blood/splatter/oil, -/turf/open/floor/glass/reinforced, -/area/shuttle/escape) "cX" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/mineral/titanium/tiled, @@ -113,6 +109,14 @@ /obj/effect/decal/cleanable/leaper_sludge, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) +"fl" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/glass/reinforced, +/area/shuttle/escape) "fn" = ( /obj/structure/table, /obj/item/storage/medkit/regular{ @@ -193,18 +197,21 @@ "ig" = ( /turf/open/floor/glass/reinforced, /area/shuttle/escape) -"iD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/spawner/random/structure/crate, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/shuttle/escape) "iU" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/escape) +"jp" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/mob_spawn/cockroach, +/obj/item/reagent_containers/syringe/contraband{ + pixel_x = -4; + pixel_y = -16 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "jt" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/glass/reinforced, @@ -251,24 +258,16 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/mineral/titanium, /area/shuttle/escape) -"lI" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/table, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -4 - }, -/obj/item/rag{ - pixel_x = 3; - pixel_y = 12 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "lN" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) +"lO" = ( +/obj/effect/decal/cleanable/blood/splatter/oil, +/turf/open/floor/glass/reinforced, +/area/shuttle/escape) "mp" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /obj/structure/table, @@ -305,14 +304,6 @@ }, /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/escape) -"oC" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/gibs/robot_debris, -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/turf/open/floor/glass/reinforced, -/area/shuttle/escape) "oL" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -354,17 +345,6 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/glass/reinforced, /area/shuttle/escape) -"pn" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/mob/living/basic/cockroach, -/obj/item/reagent_containers/syringe/contraband{ - pixel_x = -4; - pixel_y = -16 - }, -/turf/open/floor/mineral/titanium/white, -/area/shuttle/escape) "pw" = ( /obj/structure/rack, /obj/item/crowbar, @@ -495,6 +475,18 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/escape) +"xn" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/table, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -4 + }, +/obj/item/rag{ + pixel_x = 3; + pixel_y = 12 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape) "xo" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -711,6 +703,14 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/shuttle/escape) +"Ip" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/glass/reinforced, +/area/shuttle/escape) "Iv" = ( /obj/item/restraints/handcuffs/cable, /turf/open/floor/mineral/plastitanium/red/airless, @@ -885,14 +885,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) -"Uh" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/glass/reinforced, -/area/shuttle/escape) "UG" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -969,6 +961,14 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"Yv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/random/structure/crate, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/shuttle/escape) "ZA" = ( /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/mineral/titanium/white, @@ -1102,7 +1102,7 @@ dM dM hF yn -iD +Yv gz fG LX @@ -1125,7 +1125,7 @@ rZ AR qd Ju -pn +jp qB rZ ZT @@ -1156,7 +1156,7 @@ LX Ve pj Bm -lI +xn by LX rZ @@ -1227,7 +1227,7 @@ mU mp ig Kh -Uh +Ip mU nQ nQ @@ -1248,8 +1248,8 @@ nQ nQ mU IN -cr -oC +lO +fl mU nQ nQ diff --git a/_maps/shuttles/emergency_fame.dmm b/_maps/shuttles/emergency_fame.dmm index 919a8651b37..088944a2a28 100644 --- a/_maps/shuttles/emergency_fame.dmm +++ b/_maps/shuttles/emergency_fame.dmm @@ -879,7 +879,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "Or" = ( -/mob/living/basic/cockroach, +/obj/effect/mob_spawn/cockroach, /turf/open/floor/fakebasalt, /area/shuttle/escape/brig) "Ow" = ( diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index e4fe95aad41..3111593da9d 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -432,6 +432,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" /// hnnnnnnnggggg..... you're pretty good.... #define TRAIT_NICE_SHOT "nice_shot" +/// trait added if mob is killed with an anti pest reagent +#define TRAIT_BUGKILLER_DEATH "bugkiller_death" /// prevents the damage done by a brain tumor #define TRAIT_TUMOR_SUPPRESSED "brain_tumor_suppressed" /// Prevents hallucinations from the hallucination brain trauma (RDS) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index acd6fd97416..c9a2f5cd8f7 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -196,6 +196,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BORN_MONKEY" = TRAIT_BORN_MONKEY, "TRAIT_BOT_PATH_HUD" = TRAIT_BOT_PATH_HUD, "TRAIT_BOXING_READY" = TRAIT_BOXING_READY, + "TRAIT_BUGKILLER_DEATH" = TRAIT_BUGKILLER_DEATH, "TRAIT_BRAINWASHING" = TRAIT_BRAINWASHING, "TRAIT_BRAWLING_KNOCKDOWN_BLOCKED" = TRAIT_BRAWLING_KNOCKDOWN_BLOCKED, "TRAIT_BYPASS_EARLY_IRRADIATED_CHECK" = TRAIT_BYPASS_EARLY_IRRADIATED_CHECK, diff --git a/code/datums/elements/bugkiller_reagent.dm b/code/datums/elements/bugkiller_reagent.dm index d2c25926e96..f6a09989335 100644 --- a/code/datums/elements/bugkiller_reagent.dm +++ b/code/datums/elements/bugkiller_reagent.dm @@ -69,6 +69,8 @@ if(owner.stat == DEAD || QDELETED(owner)) return + ADD_TRAIT(owner, TRAIT_BUGKILLER_DEATH, REF(src)) + if(isbasicmob(owner)) var/mob/living/basic/basic_owner = owner basic_owner.basic_mob_flags &= ~DEL_ON_DEATH diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index 7377331ecdc..8ae1de04e9e 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -162,6 +162,7 @@ loot = list( // This spawner will scatter garbage around a dirty site. /obj/effect/spawner/random/trash/garbage = 6, /mob/living/basic/cockroach = 5, + /mob/living/basic/cockroach/bloodroach = 1, /obj/effect/decal/cleanable/garbage = 4, /obj/effect/decal/cleanable/vomit/old = 3, /obj/effect/spawner/random/trash/cigbutt = 2, @@ -171,7 +172,7 @@ if(mapload) var/turf/location = get_turf(loc) if(location.initial_gas_mix != OPENTURF_DEFAULT_ATMOS && location.initial_gas_mix != OPENTURF_DIRTY_ATMOS) - loot -= /mob/living/basic/cockroach + loot -= list(/mob/living/basic/cockroach, /mob/living/basic/cockroach/bloodroach) return ..() /obj/effect/spawner/random/trash/moisture diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index ccfd185f6f0..5b29921438a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1121,6 +1121,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /mob/living/basic/ant, /mob/living/basic/butterfly, /mob/living/basic/cockroach, + /mob/living/basic/cockroach/bloodroach, /mob/living/basic/spider/growing/spiderling, /mob/living/basic/bee, /obj/effect/decal/cleanable/ants, diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm index 7f24648a9e5..16a455de0cf 100644 --- a/code/modules/events/scrubber_overflow.dm +++ b/code/modules/events/scrubber_overflow.dm @@ -116,7 +116,7 @@ else if (prob(danger_chance)) dispensed_reagent.add_reagent(get_overflowing_reagent(dangerous = TRUE), reagents_amount) new /mob/living/basic/cockroach(get_turf(vent)) - new /mob/living/basic/cockroach(get_turf(vent)) + new /mob/living/basic/cockroach/bloodroach(get_turf(vent)) else dispensed_reagent.add_reagent(get_overflowing_reagent(dangerous = FALSE), reagents_amount) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 1aec7399c9a..180054fa7a1 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -77,6 +77,7 @@ var/static/list/mob_list = list( /mob/living/basic/butterfly, /mob/living/basic/cockroach, + /mob/living/basic/cockroach/bloodroach, /mob/living/basic/spider/maintenance, /mob/living/basic/mouse, /mob/living/basic/snail, diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index a988e736936..89fd3361a06 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -225,7 +225,7 @@ new /obj/item/dnainjector/wackymut(src) if(91) for(var/i in 1 to 30) - new /mob/living/basic/cockroach(src) + new /mob/living/basic/cockroach/bloodroach(src) if(92) new /obj/item/katana(src) if(93) diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm b/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm index d21322424cf..76e3153e4e0 100644 --- a/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm +++ b/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm @@ -344,7 +344,7 @@ valid_mobs += possible_mob if (!length(valid_mobs)) //Just in case there aren't any animals on the station, this will leave you with a terrible option to possess if you feel like it //i found it funny that in the file for a giant angel beast theres a cockroach - new /mob/living/basic/cockroach(get_step(src,dir)) + new /mob/living/basic/cockroach/bloodroach(get_step(src,dir)) return var/mob/living/picked_mob = pick(valid_mobs) diff --git a/code/modules/mob/living/basic/vermin/cockroach/cockroach.dm b/code/modules/mob/living/basic/vermin/cockroach/cockroach.dm index 394abd5b87e..4a8ece69b14 100644 --- a/code/modules/mob/living/basic/vermin/cockroach/cockroach.dm +++ b/code/modules/mob/living/basic/vermin/cockroach/cockroach.dm @@ -38,6 +38,8 @@ var/minion_path = /mob/living/basic/cockroach/sewer /// Command list given to minionised cockroaches var/list/minion_commands + /// Cockroach death drops + var/static/list/death_drops = list(/obj/effect/decal/cleanable/insectguts) /mob/living/basic/cockroach/Initialize(mapload) var/turf/our_turf = get_turf(src) @@ -48,8 +50,7 @@ minimum_survivable_temperature = 140 // 40kelvin below icebox temp add_atom_colour("#66ccff", FIXED_COLOUR_PRIORITY) . = ..() - var/static/list/roach_drops = list(/obj/effect/decal/cleanable/insectguts) - AddElement(/datum/element/death_drops, roach_drops) + AddElement(/datum/element/death_drops, death_drops) AddElement(/datum/element/swabable, cockroach_cell_line, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7) AddComponent( \ /datum/component/squashable, \ @@ -91,6 +92,32 @@ minion_path = null ai_controller = /datum/ai_controller/basic_controller/cockroach/aggro +/mob/living/basic/cockroach/bloodroach + name = "bloodroach" + desc = "This cockroach has gorged itself on maintenance blood, and has a glistening red sheen to its fatty carapace. Incredibly disgusting." + icon_state = "bloodroach" + icon_dead = "bloodroach_no_animation" + health = 3 + maxHealth = 3 // Wow!! + var/static/list/blood_drops = list(/obj/effect/decal/cleanable/blood/gibs/old) + +/mob/living/basic/cockroach/bloodroach/Initialize(mapload) + . = ..() + // Overriding the static drops of parent + AddElement(/datum/element/death_drops, blood_drops) + +/mob/living/basic/cockroach/bloodroach/death(gibbed) + if(HAS_TRAIT(src, TRAIT_BUGKILLER_DEATH)) + return ..() + // explode into a pile of blood if not pest controlled + for(var/turf/messy_turf in view(src, 2)) + new /obj/effect/decal/cleanable/blood(messy_turf) + for(var/mob/living/mob_in_turf in messy_turf) + mob_in_turf.visible_message(span_danger("[mob_in_turf] is splattered with blood!"), span_userdanger("You're splattered with blood!")) + mob_in_turf.add_blood_DNA(list("Non-human DNA" = random_human_blood_type())) + playsound(mob_in_turf, 'sound/effects/splat.ogg', 50, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE) + return ..() + /// Roach with a spiky hat, like a caltrop /mob/living/basic/cockroach/hauberoach name = "hauberoach" diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index eb864c8df1d..20bbb0a2eba 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -364,3 +364,14 @@ //don't use this in subtypes, just add 1000 brute yourself. that being said, this is a type that has 1000 brute. it doesn't really have a home anywhere else, it just needs to exist /obj/effect/mob_spawn/corpse/human/damaged brute_damage = 1000 + +/obj/effect/mob_spawn/cockroach + name = "Cockroach Spawner" + desc = "A spawner for cockroaches, the most common vermin in the station. Small chance to spawn a bloodroach." + mob_type = /mob/living/basic/cockroach + var/bloodroach_chance = 1 // 1% chance to spawn a bloodroach + +/obj/effect/mob_spawn/cockroach/Initialize(mapload) + if(prob(bloodroach_chance)) + mob_type = /mob/living/basic/cockroach/bloodroach + return ..() diff --git a/icons/mob/simple/animal.dmi b/icons/mob/simple/animal.dmi index 5c419b03cb8..ed63ab39ad7 100644 Binary files a/icons/mob/simple/animal.dmi and b/icons/mob/simple/animal.dmi differ