Janitor QOL (#17594)

* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
This commit is contained in:
Kugamo
2022-04-22 05:39:21 -05:00
committed by GitHub
parent a0d14de10f
commit 7189ae5d65
13 changed files with 126 additions and 32 deletions
@@ -419,7 +419,7 @@
/obj/item/storage/bag/trash/cyborg,
/obj/item/mop/advanced/cyborg,
/obj/item/lightreplacer/cyborg,
/obj/item/holosign_creator,
/obj/item/holosign_creator/janitor,
/obj/item/extinguisher/mini
)
emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube, /obj/item/restraints/handcuffs/cable/zipties/cyborg)
@@ -283,7 +283,6 @@
/obj/item/reagent_containers/glass/beaker/drugs/meth
list_reagents = list("methamphetamine" = 10)
/obj/item/reagent_containers/glass/bucket
desc = "It's a bucket."
name = "bucket"
@@ -317,6 +316,10 @@
reagents.clear_reagents()
/obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params)
if(istype(D, /obj/item/mop))
var/obj/item/mop/m = D
m.wet_mop(src, user)
return
if(isprox(D))
to_chat(user, "You add [D] to [src].")
qdel(D)
@@ -32,13 +32,13 @@
category = list("Janitorial")
/datum/design/holosign
name = "Holographic Sign Projector"
desc = "A holograpic projector used to project various warning signs."
name = "Janitorial Holographic Sign Projector"
desc = "A holograpic projector used to project wet warning signs."
id = "holosign"
req_tech = list("programming" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/holosign_creator
build_path = /obj/item/holosign_creator/janitor
category = list("Janitorial")
/datum/design/light_replacer
+1 -1
View File
@@ -296,7 +296,7 @@
/obj/item/organ/internal/cyberimp/arm/janitorial
name = "janitorial toolset implant"
desc = "A set of janitorial tools hidden behind a concealed panel on the user's arm"
contents = newlist(/obj/item/mop/advanced, /obj/item/soap, /obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/safety)
contents = newlist(/obj/item/mop/advanced, /obj/item/soap, /obj/item/lightreplacer, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/safety)
origin_tech = "materials=3;engineering=4;biotech=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
action_icon_state = list(/datum/action/item_action/organ_action/toggle = "janibelt")