mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
[MIRROR] Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode (#5920)
* Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode (#59216) Also removed useless local var from /obj/item/extinguisher/proc/AttemptRefill * Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode Co-authored-by: norill <norill@wp.pl>
This commit is contained in:
@@ -133,11 +133,8 @@
|
||||
|
||||
/obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user)
|
||||
if(istype(target, tanktype) && target.Adjacent(user))
|
||||
var/safety_save = safety
|
||||
safety = TRUE
|
||||
if(reagents.total_volume == reagents.maximum_volume)
|
||||
to_chat(user, "<span class='warning'>\The [src] is already full!</span>")
|
||||
safety = safety_save
|
||||
return TRUE
|
||||
var/obj/structure/reagent_dispensers/W = target //will it work?
|
||||
var/transferred = W.reagents.trans_to(src, max_water, transfered_by = user)
|
||||
@@ -148,7 +145,6 @@
|
||||
R.cooling_temperature = cooling_power
|
||||
else
|
||||
to_chat(user, "<span class='warning'>\The [W] is empty!</span>")
|
||||
safety = safety_save
|
||||
return TRUE
|
||||
else
|
||||
return FALSE
|
||||
|
||||
@@ -268,12 +268,12 @@
|
||||
return
|
||||
|
||||
/obj/item/extinguisher/mini/nozzle/afterattack(atom/target, mob/user)
|
||||
if(AttemptRefill(target, user))
|
||||
return
|
||||
if(nozzle_mode == EXTINGUISHER)
|
||||
..()
|
||||
return
|
||||
var/Adj = user.Adjacent(target)
|
||||
if(Adj)
|
||||
AttemptRefill(target, user)
|
||||
if(nozzle_mode == RESIN_LAUNCHER)
|
||||
if(Adj)
|
||||
return //Safety check so you don't blast yourself trying to refill your tank
|
||||
|
||||
Reference in New Issue
Block a user