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

Custodial Oversight Fixes (#15041)

Browse Source
This commit is contained in:
SleepyGemmy
2022-11-08 16:34:10 +01:00
committed by GitHub
parent 468e302b25
commit 62a7bf40d0
7 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/service.dm
+8 -13
View File
@@ -1,9 +1,9 @@
// Custodian
// Custodial Locker
/obj/structure/closet/secure_closet/custodial
name = "custodial closet"
req_access = list(access_janitor)
desc = "It's a storage unit for a custodian's clothes and gear."
icon_state = "custodial"
req_access = list(access_janitor)
/obj/structure/closet/secure_closet/custodial/fill()
new /obj/item/clothing/head/softcap/nt/custodian(src)
@@ -13,7 +13,8 @@
new /obj/item/clothing/under/rank/janitor/idris(src)
new /obj/item/storage/box/janitorgloves(src)
new /obj/item/storage/belt/custodial(src)
new /obj/item/clothing/accessory/holster/utility/custodial/armpit/brown(src)
new /obj/item/clothing/accessory/holster/utility/custodial/hip(src)
new /obj/item/clothing/accessory/holster/utility/custodial/armpit(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/flashlight(src)
@@ -28,27 +29,21 @@
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/device/gps/janitor(src)
new /obj/item/taperoll/custodial(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/storage/box/lights/mixed(src)
new /obj/item/storage/box/mousetraps(src)
obj/structure/closet/secure_closet/custodial/offship
// Away Ship/Site Custodial Locker
/obj/structure/closet/secure_closet/custodial/offship
req_access = null
/obj/structure/closet/secure_closet/custodial/offship/fill()
new /obj/item/storage/box/janitorgloves(src)
new /obj/item/storage/belt/custodial(src)
new /obj/item/clothing/accessory/holster/utility/custodial/armpit/brown(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/flashlight(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/soap/nanotrasen(src)
new /obj/item/soap/red_soap(src)
new /obj/item/reagent_containers/glass/rag(src)
new /obj/item/reagent_containers/glass/rag/advanced(src)
new /obj/item/device/lightreplacer(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
@@ -60,4 +55,4 @@ obj/structure/closet/secure_closet/custodial/offship
new /obj/item/clothing/suit/caution(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/storage/box/lights/mixed(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/storage/box/mousetraps(src)
code/game/objects/structures/janicart.dm
+24 -7
View File
@@ -1,6 +1,6 @@
/obj/structure/janitorialcart
name = "janitorial cart"
desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!"
name = "custodial cart"
desc = "The ultimate in custodial carts. Has space for water, mops, signs, trash bags, and more."
desc_info = "Click and drag a mop bucket onto the cart to mount it\
</br>Alt+Click with a mop to put it away, a normal click will wet it in the bucket.\
</br>Alt+Click with a container, such as a bucket, to pour its contents into the mounted bucket. A normal click will toss it into the trash\
@@ -14,18 +14,33 @@
build_amt = 15
slowdown = 0
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/storage/bag/trash/mybag = null
var/obj/item/storage/bag/trash/mybag = null
var/obj/item/mop/mymop = null
var/obj/item/reagent_containers/spray/myspray = null
var/obj/item/device/lightreplacer/myreplacer = null
var/obj/structure/mopbucket/mybucket = null
var/signs = 0 //maximum capacity hardcoded below
var/has_items = 0//This is set true whenever the cart has anything loaded/mounted on it
var/signs = 0 //maximum capacity hardcoded below
var/has_items = FALSE //This is set true whenever the cart has anything loaded/mounted on it
var/driving
var/mob/living/pulling
// Regular Variant
// No trashbag and no light replacer, this is inside the custodian's locker.
/obj/structure/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
// Has everything.
/obj/structure/janitorialcart/full/Initialize()
. = ..()
mybag = new /obj/item/storage/bag/trash(src)
@@ -40,6 +55,8 @@
update_icon()
// Full with Water Variant
// Has everything as well as water in the mop bucket.
/obj/structure/janitorialcart/full/water/Initialize()
. = ..()
mybag = new /obj/item/storage/bag/trash(src)
@@ -407,4 +424,4 @@
if(istype(mover, /obj/item/projectile))
return prob(30)
else
return !density
return !density