cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Custodial Cart Fixes (#21480)

Browse Source 
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.
This commit is contained in:
Casper3667
2025-10-16 11:36:35 +00:00
committed by GitHub
parent e764307cba
commit 67f4b2b981
16 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/carts/janicart.dm
-17
View File
@@ -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()
code/modules/cargo/items/custodial.dm
+1 -1
View File
@@ -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"
html/changelogs/JanitorCartFix.yml
+6
View File
@@ -0,0 +1,6 @@
author: TheGreyWolf
delete-after: True
changes:
- bugfix: "Fixed crafting a janitorial cart also gave several janitorial supplies with it."
maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
+2 -2
View File
@@ -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,
maps/away/away_site/hivebot_hub/hivebot_hub.dmm
+1 -1
View File
@@ -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,
maps/away/away_site/konyang/point_verdant/point_verdant.dmm
+1 -1
View File
@@ -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{
maps/away/away_site/magshield/magshield.dmm
+1 -1
View File
@@ -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,
maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
+1 -1
View File
@@ -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,
maps/away/ships/golden_deep/golden_deep.dmm
+1 -1
View File
@@ -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,
maps/away/ships/heph/heph_security/heph_security.dmm
+1 -1
View File
@@ -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" = (
maps/away/ships/iac/iac_rescue_ship.dmm
+1 -1
View File
@@ -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,
maps/away/ships/idris/idris_cruiser.dmm
+1 -1
View File
@@ -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,
maps/away/ships/xanu/xanu_frigate.dmm
+1 -1
View File
@@ -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,
maps/away/ships/yacht/yacht.dmm
+1 -1
View File
@@ -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)
maps/sccv_horizon/sccv_horizon.dmm
+3 -3
View File
@@ -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" = (
maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm
+1 -1
View File
@@ -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" = (