cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverts #25805 and #25846: "Only one IV bag at a time " (#26578)

Browse Source 
* reverts 25805 and 25846

* re-adds iv_bag on_examine and stops apply_damage runtime when injection_target is being deleted
This commit is contained in:
chuga-git
2024-08-28 23:44:08 +00:00
committed by GitHub
parent ffc528ff8f
commit 656b46ac14
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/iv_bag.dm
+2 -7
View File
@@ -47,19 +47,17 @@
/obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
injection_target = target
ADD_TRAIT(injection_target, TRAIT_HAS_IV_BAG, UID())
RegisterSignal(injection_target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
START_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/proc/end_processing()
if(injection_target)
REMOVE_TRAIT(injection_target, TRAIT_HAS_IV_BAG, UID())
UnregisterSignal(injection_target, COMSIG_PARENT_EXAMINE)
injection_target = null
injection_target = null
STOP_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/process()
if(!injection_target)
if(QDELETED(injection_target))
end_processing()
return
@@ -115,9 +113,6 @@
else // Inserting the needle
if(!L.can_inject(user, TRUE))
return
if(HAS_TRAIT(target, TRAIT_HAS_IV_BAG))
to_chat(user, "<span class='warning'>[target] already [target.p_have()] another IV bag inserted into [target.p_them()]!</span>")
return
if(amount_per_transfer_from_this > 10) // We only want to be able to transfer 1, 5, or 10 units to people. Higher numbers are for transfering to other containers
to_chat(user, "<span class='warning'>The IV bag can only be used on someone with a transfer amount of 1, 5 or 10.</span>")
return