Custodial Additions (#13612)

This commit is contained in:
SleepyGemmy
2022-06-09 12:46:14 +02:00
committed by GitHub
parent 3d9a17098c
commit 85298bc510
36 changed files with 513 additions and 290 deletions
@@ -1,7 +1,7 @@
/* Closets for specific jobs
* Contains:
* Bartender
* Janitor
* Chef
* Lawyer
*/
@@ -56,44 +56,6 @@
new /obj/item/clothing/head/hairnet(src)
new /obj/item/clothing/head/hairnet(src)
/*
* Janitor
*/
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
icon_door = "mixed"
/obj/structure/closet/jcloset/fill()
new /obj/item/clothing/head/softcap/nt/custodian(src)
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/clothing/head/softcap/idris/custodian(src)
new /obj/item/clothing/under/rank/janitor/idris(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/softcap/custodian(src)
new /obj/item/clothing/head/bandana/janitor(src)
new /obj/item/clothing/head/beret/janitor(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/flashlight(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/device/lightreplacer(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/storage/belt/janitor(src)
new /obj/item/storage/box/lights/mixed(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/reagent_containers/glass/rag(src)
new /obj/item/soap/nanotrasen(src)
new /obj/item/reagent_containers/glass/rag/advanced(src)
new /obj/item/device/gps/janitor(src)
/*
* Lawyer
*/
@@ -109,4 +71,4 @@
new /obj/item/clothing/under/lawyer/purple(src)
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -32,11 +32,15 @@
/obj/structure/closet/l3closet/janitor
name = "level 3 biohazard custodial gear closet"
desc = "It's a storage unit for level 3 biohazard custodial gear."
icon_state = "bio_jan"
/obj/structure/closet/l3closet/janitor/fill()
new /obj/item/clothing/suit/bio_suit/janitor(src)
new /obj/item/clothing/head/bio_hood/janitor(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/watertank/janitor(src)
/obj/structure/closet/l3closet/scientist
icon_state = "bio_scientist"
@@ -0,0 +1,36 @@
// Custodian
/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"
/obj/structure/closet/secure_closet/custodial/fill()
new /obj/item/clothing/head/softcap/nt/custodian(src)
new /obj/item/clothing/head/softcap/idris/custodian(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/clothing/under/rank/janitor/idris(src)
new /obj/item/clothing/gloves/black(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/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)
new /obj/item/grenade/chem_grenade/cleaner(src)
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)
+16
View File
@@ -12,6 +12,8 @@
climbable = TRUE
flags = OPENCONTAINER
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
@@ -31,6 +33,20 @@
myspray = new /obj/item/reagent_containers/spray/cleaner(src)
myreplacer = new /obj/item/device/lightreplacer(src)
mybucket = new /obj/structure/mopbucket(src)
for(signs, signs < 4, signs++)
new /obj/item/clothing/suit/caution(src)
update_icon()
/obj/structure/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(/decl/reagent/water, mybucket.bucketsize)