cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Janitorial equipment tweaks and cleaners availability (#20037)

Browse Source 
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
This commit is contained in:
Henri215
2023-02-03 13:10:51 -06:00
committed by GitHub
parent e6ba11ac43
commit c4667311e7
15 changed files with 47 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/spray.dm
+30 -1
View File
@@ -112,9 +112,27 @@
//space cleaner
/obj/item/reagent_containers/spray/cleaner
name = "space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
desc = "Your standard spritz cleaner bottle designed to keep ALL of your workplaces spotless."
spray_maxrange = 2
spray_currentrange = 2
amount_per_transfer_from_this = 10
list_reagents = list("cleaner" = 250)
/obj/item/reagent_containers/spray/cleaner/attack_self(mob/user)
amount_per_transfer_from_this = (amount_per_transfer_from_this == 5 ? 10 : 5)
spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1)
to_chat(user, "<span class='notice'>You [amount_per_transfer_from_this == 5 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
/obj/item/reagent_containers/spray/cleaner/advanced
name = "advanced space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
icon_state = "adv_cleaner"
item_state = "adv_cleaner"
volume = 500
spray_maxrange = 3
spray_currentrange = 3
list_reagents = list("cleaner" = 500)
/obj/item/reagent_containers/spray/cleaner/safety
desc = "BLAM!-brand non-foaming space cleaner! This spray bottle can only accept space cleaner."
@@ -131,12 +149,23 @@
/obj/item/reagent_containers/spray/cleaner/drone
name = "space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
spray_maxrange = 3
spray_currentrange = 3
amount_per_transfer_from_this = 5
volume = 50
list_reagents = list("cleaner" = 50)
/obj/item/reagent_containers/spray/cleaner/drone/cyborg_recharge(coeff, emagged)
reagents.check_and_add("cleaner", volume, 3 * coeff)
/obj/item/reagent_containers/spray/cyborg_lube
name = "lube spray"
list_reagents = list("lube" = 250)
/obj/item/reagent_containers/spray/cyborg_lube/cyborg_recharge(coeff, emagged)
if(emagged)
reagents.check_and_add("lube", volume, 2 * coeff)
//spray tan
/obj/item/reagent_containers/spray/spraytan
name = "spray tan"