From 67f4b2b9814610a3a47b3acf57e6973540b9b005 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Thu, 16 Oct 2025 13:36:35 +0200 Subject: [PATCH] Custodial Cart Fixes (#21480) When crafted from steel, the custodial cart previously started with several custodial supplies. This should fix that and should replace existing variants around the map with filled versions. --- code/game/objects/structures/carts/janicart.dm | 17 ----------------- code/modules/cargo/items/custodial.dm | 2 +- html/changelogs/JanitorCartFix.yml | 6 ++++++ .../abandoned_industrial_station.dmm | 4 ++-- maps/away/away_site/hivebot_hub/hivebot_hub.dmm | 2 +- .../konyang/point_verdant/point_verdant.dmm | 2 +- maps/away/away_site/magshield/magshield.dmm | 2 +- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 2 +- maps/away/ships/golden_deep/golden_deep.dmm | 2 +- .../ships/heph/heph_security/heph_security.dmm | 2 +- maps/away/ships/iac/iac_rescue_ship.dmm | 2 +- maps/away/ships/idris/idris_cruiser.dmm | 2 +- maps/away/ships/xanu/xanu_frigate.dmm | 2 +- maps/away/ships/yacht/yacht.dmm | 2 +- maps/sccv_horizon/sccv_horizon.dmm | 6 +++--- .../submaps/ops_warehouse_small_storage.dmm | 2 +- 16 files changed, 23 insertions(+), 34 deletions(-) create mode 100644 html/changelogs/JanitorCartFix.yml diff --git a/code/game/objects/structures/carts/janicart.dm b/code/game/objects/structures/carts/janicart.dm index 620f03e73e0..c06fdf9956a 100644 --- a/code/game/objects/structures/carts/janicart.dm +++ b/code/game/objects/structures/carts/janicart.dm @@ -33,14 +33,7 @@ // No trashbag and no light replacer, this is inside the custodian's locker. /obj/structure/cart/storage/janitorialcart/Initialize() . = ..() - mymop = new /obj/item/mop(src) - myspray = new /obj/item/reagent_containers/spray/cleaner(src) - mybucket = new /obj/structure/mopbucket(src) - - for(signs, signs < 4, signs++) - new /obj/item/clothing/suit/caution(src) - update_icon() // Full Variant @@ -63,17 +56,7 @@ // Has everything as well as water in the mop bucket. /obj/structure/cart/storage/janitorialcart/full/water/Initialize() . = ..() - mybag = new /obj/item/storage/bag/trash(src) - mymop = new /obj/item/mop(src) - myspray = new /obj/item/reagent_containers/spray/cleaner(src) - myreplacer = new /obj/item/device/lightreplacer(src) - - mybucket = new /obj/structure/mopbucket(src) mybucket.reagents.add_reagent(/singleton/reagent/water, mybucket.bucketsize) - - for(signs, signs < 4, signs++) - new /obj/item/clothing/suit/caution(src) - update_icon() /obj/structure/cart/storage/janitorialcart/New() diff --git a/code/modules/cargo/items/custodial.dm b/code/modules/cargo/items/custodial.dm index 20d6e15835d..9666367023d 100644 --- a/code/modules/cargo/items/custodial.dm +++ b/code/modules/cargo/items/custodial.dm @@ -145,7 +145,7 @@ description = "The ultimate in custodial carts. Has space for water, mops, signs, trash bags, and more." price = 190 items = list( - /obj/structure/cart/storage/janitorialcart + /obj/structure/cart/storage/janitorialcart/full ) access = ACCESS_JANITOR container_type = "crate" diff --git a/html/changelogs/JanitorCartFix.yml b/html/changelogs/JanitorCartFix.yml new file mode 100644 index 00000000000..4b5fdb0062e --- /dev/null +++ b/html/changelogs/JanitorCartFix.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed crafting a janitorial cart also gave several janitorial supplies with it." diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm index aeac9fea22d..1726f42245b 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm @@ -2510,7 +2510,7 @@ /turf/simulated/floor/reinforced/airless, /area/abandoned_industrial_station/exterior) "ig" = ( -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/custodial, @@ -15846,7 +15846,7 @@ /area/abandoned_industrial_station/service) "Yn" = ( /obj/effect/floor_decal/industrial/outline/custodial, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/random/dirt_75, diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm index 248fa1534d8..056a4a01827 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm @@ -834,7 +834,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /turf/simulated/floor/airless, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm index 6177a1442e0..0a055f23fda 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm @@ -6460,7 +6460,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "dwp" = ( -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/effect/floor_decal/corner_wide/black{ diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm index 6f05894e251..12aeb7c3c35 100644 --- a/maps/away/away_site/magshield/magshield.dmm +++ b/maps/away/away_site/magshield/magshield.dmm @@ -3088,7 +3088,7 @@ /turf/template_noop, /area/magshield/east) "ji" = ( -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /turf/simulated/floor/airless, diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index fe18805fc1c..ae86a8d2cf1 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -11176,7 +11176,7 @@ /obj/machinery/alarm/south{ req_one_access = list(204) }, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/item/reagent_containers/glass/bucket, diff --git a/maps/away/ships/golden_deep/golden_deep.dmm b/maps/away/ships/golden_deep/golden_deep.dmm index 45dd42b54a5..ace5ba051d0 100644 --- a/maps/away/ships/golden_deep/golden_deep.dmm +++ b/maps/away/ships/golden_deep/golden_deep.dmm @@ -6779,7 +6779,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/item/reagent_containers/glass/bucket, diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 74fa5314c7c..c53b323e06c 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -2391,7 +2391,7 @@ dir = 8; icon_state = "tube_empty" }, -/obj/structure/cart/storage/janitorialcart, +/obj/structure/cart/storage/janitorialcart/full, /turf/simulated/floor, /area/heph_security_ship/thrusterport) "pM" = ( diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index 58bc08e2f2e..5dfc21e1a2f 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -6893,7 +6893,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/iac_shuttle) "pGN" = ( -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index 12868450302..822b3dd248b 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -7667,7 +7667,7 @@ /turf/simulated/floor/tiled, /area/ship/idris_cruiser/corridor/dockingarm/port) "BK" = ( -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /obj/item/reagent_containers/glass/bucket, diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm index 252c3f80f49..d29be953f93 100644 --- a/maps/away/ships/xanu/xanu_frigate.dmm +++ b/maps/away/ships/xanu/xanu_frigate.dmm @@ -12027,7 +12027,7 @@ /area/ship/xanu_frigate/corridor/aft) "Pj" = ( /obj/effect/floor_decal/corner/purple/full, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 8 }, /obj/machinery/power/apc/west, diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm index 90830caaa2b..0eed67f9723 100644 --- a/maps/away/ships/yacht/yacht.dmm +++ b/maps/away/ships/yacht/yacht.dmm @@ -728,7 +728,7 @@ /turf/simulated/floor/wood/yew, /area/shuttle/yacht/living) "cl" = ( -/obj/structure/cart/storage/janitorialcart, +/obj/structure/cart/storage/janitorialcart/full, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/yew, /area/shuttle/yacht/living) diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 508141818e7..820cf02beed 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -18527,7 +18527,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/outline/custodial, -/obj/structure/cart/storage/janitorialcart, +/obj/structure/cart/storage/janitorialcart/full, /turf/simulated/floor/tiled, /area/horizon/service/custodial) "cDE" = ( @@ -68325,7 +68325,7 @@ dir = 4 }, /obj/machinery/firealarm/east, -/obj/structure/cart/storage/janitorialcart{ +/obj/structure/cart/storage/janitorialcart/full{ dir = 4 }, /turf/simulated/floor/tiled, @@ -105567,7 +105567,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/outline/custodial, -/obj/structure/cart/storage/janitorialcart, +/obj/structure/cart/storage/janitorialcart/full, /turf/simulated/floor/tiled, /area/horizon/service/custodial) "oUb" = ( diff --git a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm index 3b56db98a3b..f96ec168bf1 100644 --- a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm +++ b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm @@ -81,7 +81,7 @@ /turf/template_noop, /area/template_noop) "bv" = ( -/obj/structure/cart/storage/janitorialcart, +/obj/structure/cart/storage/janitorialcart/full, /turf/template_noop, /area/template_noop) "bw" = (