From f48092a9c82c844be1549935447da7d3be709154 Mon Sep 17 00:00:00 2001 From: nevimer <77420409+nevimer@users.noreply.github.com> Date: Sun, 7 Sep 2025 13:23:44 -0400 Subject: [PATCH] updatepaths run maybe i should try building --- .../templates/IceBoxStation/iceboxstation_persistence.dmm | 2 +- .../automapper/templates/centcom/centcom_ferry_dock.dmm | 4 ++-- .../automapper/templates/lavaland/lavaland_persistence.dmm | 2 +- _maps/map_files/BoxStation/BoxStation.dmm | 4 ++-- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 4 ++-- _maps/map_files/biodome/biodome.dmm | 2 +- code/datums/elements/crusher_loot.dm | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm index f7395c19b5a..7253fdb752b 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm @@ -2970,7 +2970,7 @@ /turf/open/floor/iron/terracotta/small, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "gh" = ( -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/effect/turf_decal/siding/wood{ dir = 1 }, diff --git a/_maps/bubber/automapper/templates/centcom/centcom_ferry_dock.dmm b/_maps/bubber/automapper/templates/centcom/centcom_ferry_dock.dmm index aac932076dc..68fcd55690b 100644 --- a/_maps/bubber/automapper/templates/centcom/centcom_ferry_dock.dmm +++ b/_maps/bubber/automapper/templates/centcom/centcom_ferry_dock.dmm @@ -26,7 +26,7 @@ /area/centcom/central_command_areas/ferry) "ce" = ( /obj/machinery/airalarm/directional/east, -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) @@ -366,7 +366,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "Is" = ( -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm index 707ab1f095f..735fdfe842f 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm @@ -17277,7 +17277,7 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "Iv" = ( -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/effect/turf_decal/siding/wood{ dir = 1 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 063eb660de1..2d328e9fdb9 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -17457,7 +17457,7 @@ "blN" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /turf/open/floor/glass/reinforced, /area/station/command/bridge) "blQ" = ( @@ -44071,7 +44071,7 @@ }, /area/station/security/prison/safe) "fSb" = ( -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 341a86116d6..8b35115672c 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -21197,7 +21197,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/cargo/sorting) @@ -49664,7 +49664,7 @@ c_tag = "Cargo - Office"; name = "cargo camera" }, -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/structure/disposalpipe/segment{ dir = 4 }, diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index d061f23d396..6f1ae357239 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -2676,7 +2676,7 @@ /turf/open/floor/plating, /area/station/commons/storage/primary) "aSM" = ( -/obj/structure/filingcabinet/filingcabinet, +/obj/structure/filingcabinet/white, /obj/machinery/camera/directional/north{ c_tag = "Cargo - Shipping Office" }, diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm index a6aa071fb97..9e5c166374b 100644 --- a/code/datums/elements/crusher_loot.dm +++ b/code/datums/elements/crusher_loot.dm @@ -38,7 +38,7 @@ // SKYRAT EDIT START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = target.has_status_effect(/datum/status_effect/ashwalker_damage) // SKYRAT EDIT ADDITION var/damage_total = damage?.total_damage + ashie_damage?.total_damage // SKYRAT EDIT ADDITION - if(damage && prob((damage.damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. + if(damage && prob((damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. // SKYRAT EDIT END - ASHWALKER TROPHIES if(!islist(trophy_type)) make_path(target, trophy_type)