diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm index f39a42d5b65..b91f809f718 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm @@ -521,7 +521,7 @@ /turf/open/floor/iron, /area/ruin/syndicate_lava_base/main) "dD" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/disposaloutlet{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm index 5af93052516..2f228146d32 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm @@ -206,7 +206,7 @@ pixel_x = -5; pixel_y = -3 }, -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/fakelattice/passthru, /obj/machinery/light/small/red/directional/north, @@ -379,7 +379,7 @@ /area/ruin/space/has_grav) "wH" = ( /obj/effect/decal/cleanable/robot_debris/limb, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav) @@ -388,7 +388,7 @@ pixel_x = -16; pixel_y = -9 }, -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav) @@ -633,7 +633,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav) "MQ" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index ce142f2f294..117f1ebe611 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -872,7 +872,7 @@ dir = 8 }, /obj/structure/bed/dogbed, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /mob/living/basic/pet/syndifox, /turf/open/floor/wood, /area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral) @@ -7051,7 +7051,7 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/east{ pixel_x = 4 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/skyrat/interdynefob/cargo) "GS" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index 3b2ac79b265..8540add912e 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -3521,7 +3521,7 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/port_tarkon/garden) "mq" = ( -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/port_tarkon/aichamber) "mr" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm index eae8b1f5a76..d4bc980f9d3 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/waypointstation.dmm @@ -282,7 +282,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "pJ" = ( -/obj/effect/decal/cleanable/xenoblood/xgibs, +/obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "pO" = ( @@ -448,7 +448,7 @@ /turf/open/floor/carpet/royalblue/airless, /area/ruin/space/has_grav/waypoint) "yn" = ( -/obj/effect/decal/cleanable/xenoblood/xgibs, +/obj/effect/decal/cleanable/blood/gibs/xeno, /obj/structure/alien/weeds, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) @@ -468,7 +468,7 @@ /area/ruin/space/has_grav/waypoint) "zu" = ( /obj/effect/decal/cleanable/xenoblood/xgibs/limb, -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "zx" = ( @@ -477,7 +477,7 @@ /area/ruin/space/has_grav/waypoint) "zy" = ( /mob/living/basic/alien/drone, -/obj/effect/decal/cleanable/xenoblood, +/obj/effect/decal/cleanable/blood/xeno, /obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/waypoint) @@ -504,7 +504,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "Al" = ( -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "AC" = ( @@ -721,7 +721,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) "JU" = ( -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /obj/structure/alien/weeds, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/waypoint) diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_ashwalker_fortress.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_ashwalker_fortress.dmm index 3b3c3b5ecbd..328f93ba40c 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_ashwalker_fortress.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_ashwalker_fortress.dmm @@ -1904,7 +1904,7 @@ /area/ruin/unpowered/ash_walkers) "zY" = ( /obj/effect/mapping_helpers/no_lava, -/obj/effect/decal/cleanable/blood/trails, +/obj/effect/decal/cleanable/blood/trail_holder, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "Ad" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f85cbb424fe..21f32c09a7b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5513,7 +5513,7 @@ /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/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/port/aft) "aBX" = ( @@ -24129,7 +24129,7 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "bPP" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bPQ" = ( @@ -32201,7 +32201,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/fore) "cET" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -42962,7 +42962,7 @@ /area/station/maintenance/abandon_cafeteria) "iTx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron, /area/station/cargo/warehouse) "iTH" = ( @@ -43416,7 +43416,7 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "jgZ" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/plating, @@ -44583,7 +44583,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/closet/crate/preopen, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron, /area/station/cargo/warehouse) "jPh" = ( @@ -45551,7 +45551,7 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "koo" = ( -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/lab) @@ -55042,7 +55042,7 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "qCr" = ( @@ -57804,7 +57804,7 @@ /turf/open/floor/iron/white, /area/station/science/ordnance) "sjo" = ( -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating, /area/station/maintenance/aft) "sjA" = ( @@ -61798,7 +61798,7 @@ /area/station/maintenance/port/aft) "uMG" = ( /obj/structure/chair/stool/directional/west, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/checker, /area/station/science/lab) @@ -66741,7 +66741,7 @@ /area/station/security/execution/transfer) "xKh" = ( /obj/structure/cable, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d74b963c331..63f7f3e67fa 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1713,8 +1713,8 @@ /area/station/engineering/atmos) "aBB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/robot_debris, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -2729,7 +2729,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -4336,7 +4336,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/machinery/camera/directional/south, /obj/item/radio/intercom/directional/south, /obj/machinery/byteforge, @@ -5459,7 +5459,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/station/hallway/secondary/entry) @@ -7066,7 +7066,7 @@ /area/station/security/prison/garden) "cqT" = ( /obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/suit_storage_unit/industrial/loader, @@ -7239,7 +7239,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "ctu" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/misc/asteroid/airless, /area/station/hallway/secondary/entry) "ctv" = ( @@ -12507,7 +12507,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "eji" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/turf_decal/siding/purple{ dir = 8 }, @@ -14317,7 +14317,7 @@ /turf/open/floor/wood/tile, /area/station/service/library) "eOs" = ( -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /turf/closed/wall/r_wall/rust, /area/station/service/chapel/dock) "eOt" = ( @@ -24629,7 +24629,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -25922,7 +25922,7 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "ipg" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -32105,7 +32105,7 @@ /obj/item/flashlight/flare, /obj/item/flashlight/flare, /obj/item/stock_parts/power_store/cell/high, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -34769,7 +34769,7 @@ /area/station/maintenance/port/greater) "lfu" = ( /obj/machinery/netpod, -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /obj/machinery/airalarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/station/cargo/bitrunning/den) @@ -35408,7 +35408,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, @@ -35732,7 +35732,7 @@ /area/station/service/kitchen) "luk" = ( /obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -36341,7 +36341,7 @@ /area/station/maintenance/aft) "lDK" = ( /obj/effect/decal/remains/robot, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/iron/dark, /area/station/service/chapel/storage) "lDS" = ( @@ -38118,7 +38118,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/item/stack/cable_coil/cut, /turf/open/floor/plating, /area/mine/eva/abandoned) @@ -51007,7 +51007,7 @@ /area/station/medical/chemistry) "qyn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, @@ -53132,7 +53132,7 @@ "riX" = ( /obj/effect/decal/cleanable/robot_debris/limb, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/effect/decal/cleanable/robot_debris/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58386,7 +58386,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/landmark/start/bitrunner, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/bitrunning/den) "sNe" = ( @@ -66523,7 +66523,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "vqe" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67352,7 +67352,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/mapping_helpers/broken_floor, @@ -68741,7 +68741,7 @@ /area/station/service/bar) "vVq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 39f0a415b9e..d60f8d73855 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -13950,7 +13950,7 @@ /obj/structure/sign/poster/random/directional/east, /obj/effect/spawner/random/trash/hobo_squat, /obj/effect/decal/cleanable/plastic, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -30054,7 +30054,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "iHX" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -33849,7 +33849,7 @@ /area/station/hallway/secondary/command) "jIc" = ( /obj/structure/cable, -/obj/effect/decal/cleanable/oil, +/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/effect/landmark/blobstart, @@ -35457,7 +35457,7 @@ "kgN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs/limb, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) "kgR" = ( @@ -38401,7 +38401,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "kUc" = ( -/obj/effect/decal/cleanable/xenoblood, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/engine, /area/station/science/xenobiology) "kUd" = ( @@ -71256,7 +71256,7 @@ }, /area/station/medical/medbay/lobby) "tOS" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -79623,7 +79623,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light_switch/directional/south, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/spider/stickyweb, /obj/structure/cable, /turf/open/floor/iron/smooth, diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index d16f6cbbb66..1c06a712d64 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -15324,7 +15324,7 @@ /turf/open/floor/carpet, /area/station/cargo/office) "fkJ" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/plating, /area/station/maintenance/fore/greater) @@ -17631,7 +17631,7 @@ /area/station/science/genetics) "fYx" = ( /obj/structure/sign/poster/official/random/directional/north, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating/rust, /area/station/biodome/fore) "fYF" = ( @@ -25010,7 +25010,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "iGQ" = ( -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/misc/asteroid, /area/station/maintenance/central/greater) "iHt" = ( @@ -25438,7 +25438,7 @@ /turf/open/floor/engine/cult, /area/station/service/library) "iPU" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/misc/asteroid/airless, /area/station/asteroid) "iPY" = ( @@ -30262,7 +30262,7 @@ /turf/open/floor/iron/white/smooth_large, /area/station/service/hydroponics) "kwM" = ( -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "kwP" = ( @@ -30323,7 +30323,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "kxO" = ( -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31251,7 +31251,7 @@ /area/station/maintenance/central/greater) "kMW" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/greater) @@ -35656,7 +35656,7 @@ id = "maintwarehouse"; name = "Privacy Shutters Control" }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/broken_flooring/corner/directional/south, /turf/open/floor/plating, /area/station/maintenance/fore/greater) @@ -35685,7 +35685,7 @@ /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 4 }, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/greater) @@ -42133,7 +42133,7 @@ /turf/open/floor/iron/dark/herringbone, /area/station/engineering/atmos/hfr_room) "orQ" = ( -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "osa" = ( @@ -47322,7 +47322,7 @@ /turf/open/floor/iron/white/corner, /area/station/commons/storage/art) "qjM" = ( -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 1 @@ -48364,7 +48364,7 @@ /area/station/maintenance/central/greater) "qBz" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "qBA" = ( @@ -49265,7 +49265,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) "qRv" = ( -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51397,7 +51397,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/misc/asteroid, @@ -52601,7 +52601,7 @@ /obj/item/ai_module/toy_ai, /obj/effect/decal/cleanable/robot_debris/old, /obj/effect/decal/cleanable/robot_debris/limb, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /obj/structure/broken_flooring/plating/directional/east, /turf/open/floor/circuit/off, /area/station/tcommsat/server) @@ -53588,7 +53588,7 @@ /area/station/biodome/aft) "snN" = ( /obj/item/radio/intercom/directional/south, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/rust, /area/station/maintenance/disposal) "snO" = ( @@ -54192,7 +54192,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/plating, /area/station/biodome/aft) "szh" = ( @@ -55740,7 +55740,7 @@ /area/station/engineering/storage/tech) "tbg" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "tbi" = ( @@ -60346,7 +60346,7 @@ /turf/open/floor/wood, /area/station/command/bridge) "uIr" = ( -/obj/effect/decal/cleanable/robot_debris, +/obj/effect/decal/cleanable/blood/gibs/robot_debris, /turf/open/floor/plating, /area/station/service/janitor) "uIs" = ( @@ -61732,7 +61732,7 @@ /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "vjs" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "vju" = ( @@ -67806,7 +67806,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "xjd" = ( -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/misc/asteroid, /area/station/maintenance/port/central) "xjh" = ( @@ -68113,7 +68113,7 @@ /area/station/maintenance/port/central) "xpe" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "xph" = ( @@ -70430,7 +70430,7 @@ /turf/open/floor/plating/airless, /area/station/solars/port/aft) "ycX" = ( -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/plating, /area/station/biodome/aft) "ydb" = ( diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 22c6a4b4c11..3643c0a9d09 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -6753,7 +6753,7 @@ }, /area/centcom/holding/cafe/park) "esx" = ( -/obj/effect/decal/cleanable/xenoblood, +/obj/effect/decal/cleanable/blood/xeno, /obj/structure/alien/weeds, /turf/open/misc/dirt/planet, /area/centcom/holding/cafe/park) diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 0d98999b6da..f9f1f26c2c6 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -48788,7 +48788,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/cargo/warehouse) @@ -54211,7 +54211,7 @@ "oSl" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/clown_chamber) @@ -64732,7 +64732,7 @@ dir = 4 }, /obj/structure/falsewall, -/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/blood/oil/slippery, /turf/open/floor/plating, /area/station/maintenance/clown_chamber) "rKY" = ( diff --git a/_maps/shuttles/cargo_biodome.dmm b/_maps/shuttles/cargo_biodome.dmm index 3fff79cfa9f..8081a72a1c3 100644 --- a/_maps/shuttles/cargo_biodome.dmm +++ b/_maps/shuttles/cargo_biodome.dmm @@ -4,7 +4,7 @@ /turf/open/floor/plating/airless, /area/shuttle/supply) "b" = ( -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/iron/dark/textured_edge, /area/shuttle/supply) "c" = ( @@ -92,7 +92,7 @@ /turf/template_noop, /area/template_noop) "F" = ( -/obj/effect/decal/cleanable/oil/streak, +/obj/effect/decal/cleanable/blood/splatter/oil, /turf/open/floor/fake_iron_sand, /area/shuttle/supply) "H" = ( @@ -120,7 +120,7 @@ /turf/open/floor/iron/dark/textured_edge, /area/shuttle/supply) "W" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/fake_iron_sand, /area/shuttle/supply) "X" = ( diff --git a/_maps/shuttles/skyrat/whiteship_blueshift.dmm b/_maps/shuttles/skyrat/whiteship_blueshift.dmm index 102f390916e..17785378df4 100644 --- a/_maps/shuttles/skyrat/whiteship_blueshift.dmm +++ b/_maps/shuttles/skyrat/whiteship_blueshift.dmm @@ -70,7 +70,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "aU" = ( @@ -368,7 +368,7 @@ /area/shuttle/abandoned) "dN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /obj/structure/alien/weeds, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) @@ -1761,7 +1761,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "qj" = ( @@ -2106,7 +2106,7 @@ /area/shuttle/abandoned/medbay) "tb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "tc" = ( @@ -2149,7 +2149,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 8 }, -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "ts" = ( @@ -3967,7 +3967,7 @@ "Mj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/xenoblood/xgibs/limb, -/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/effect/decal/cleanable/blood/splatter/xeno, /turf/open/floor/iron/dark, /area/shuttle/abandoned/cargo) "Mn" = ( diff --git a/_maps/skyrat/lazy_templates/deathmatch/deep_space.dmm b/_maps/skyrat/lazy_templates/deathmatch/deep_space.dmm index d0d59455a92..5e044d8611c 100644 --- a/_maps/skyrat/lazy_templates/deathmatch/deep_space.dmm +++ b/_maps/skyrat/lazy_templates/deathmatch/deep_space.dmm @@ -662,7 +662,7 @@ /area/deathmatch) "vz" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/iron/herringbone, /area/deathmatch) "vB" = ( diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index 47b1929ec64..9fc5adbee7e 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -95,7 +95,7 @@ /// Has E-N been emagged already? var/emagged = FALSE /// A list of the things dropped when it dies - var/static/list/borgi_drops = list(/obj/effect/decal/cleanable/oil/slippery) + var/static/list/borgi_drops = list(/obj/effect/decal/cleanable/blood/oil/slippery) /// The threshold of HP before the borgi attacks non-friends var/rage_hp = 30 /// The chance to spark (on life) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm index e437177a3cf..68718e9dd84 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm @@ -108,7 +108,7 @@ attack_verb_continuous = "slashes" attack_verb_simple = "slash" attack_sound = 'sound/items/weapons/bladeslice.ogg' - loot = list(/obj/effect/decal/cleanable/robot_debris) + loot = list(/obj/effect/decal/cleanable/blood/gibs/robot_debris) /mob/living/simple_animal/hostile/cult/horror name = "Malformed Cultist" @@ -343,7 +343,7 @@ bubble_icon = "machine" speech_span = SPAN_ROBOT del_on_death = 1 - loot = list(/obj/effect/decal/cleanable/robot_debris) + loot = list(/obj/effect/decal/cleanable/blood/gibs/robot_debris) /mob/living/simple_animal/hostile/evilborg/heavy name = "Malfunctioning Heavy Cyborg"