mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-16 01:23:41 +01:00
Rework spray bottles and tools based on them somewhat. (#29977)
* Rework spray bottles and tools based on them somewhat. Consolidate spray adjustment functions. Change method of preventing spray amount adjustment. Standardize most spray amounts at 10u/2 tiles and 5u/1 tile. Should fix the following issues: https://github.com/ParadiseSS13/Paradise/issues/29930 https://github.com/ParadiseSS13/Paradise/issues/28964 * Adjust spray rework based on review comments Change `adjustable` var to boolean Change `adjust_verb` to `adjust_action` Tie spray transfer amount to tile reach
This commit is contained in:
@@ -122,7 +122,6 @@
|
||||
return INITIALIZE_HINT_QDEL
|
||||
tank = loc
|
||||
reagents = tank.reagents //This mister is really just a proxy for the tank's reagents
|
||||
RegisterSignal(src, COMSIG_ACTIVATE_SELF, TYPE_PROC_REF(/datum, signal_cancel_activate_self))
|
||||
return ..()
|
||||
|
||||
/obj/item/reagent_containers/spray/mister/Destroy()
|
||||
@@ -170,20 +169,13 @@
|
||||
item_state = "misterjani"
|
||||
spray_maxrange = 4
|
||||
spray_currentrange = 4
|
||||
spray_minrange = 2
|
||||
amount_per_transfer_from_this = 10
|
||||
possible_transfer_amounts = null
|
||||
|
||||
/obj/item/watertank/janitor/make_noz()
|
||||
return new /obj/item/reagent_containers/spray/mister/janitor(src)
|
||||
|
||||
/obj/item/reagent_containers/spray/mister/janitor/activate_self(mob/user)
|
||||
if(..())
|
||||
return FINISH_ATTACK
|
||||
|
||||
amount_per_transfer_from_this = (amount_per_transfer_from_this == 5 ? 10 : 5)
|
||||
spray_currentrange = (spray_currentrange == 2 ? spray_maxrange : 2)
|
||||
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>")
|
||||
|
||||
//ATMOS FIRE FIGHTING BACKPACK
|
||||
|
||||
#define EXTINGUISHER 0
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
desc = "If you can see this, make an issue report on GitHub. Something has gone wrong!"
|
||||
icon = 'icons/mob/alien.dmi'
|
||||
icon_state = "borg-default"
|
||||
spray_maxrange = 3
|
||||
spray_currentrange = 3
|
||||
|
||||
/obj/item/reagent_containers/spray/alien/smoke
|
||||
name = "smokescreen module"
|
||||
|
||||
Reference in New Issue
Block a user