mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 17:13:46 +01:00
The sleepy pen, hypospray and RSG will now all do initial chemical reactions when they inject a chemical (#21722)
* fuck it we ball * I hate math * Updates people, updates (also jimkil review) * okay this should work better * Will it work?
This commit is contained in:
@@ -127,9 +127,12 @@
|
||||
|
||||
if(reagents.total_volume && M.reagents)
|
||||
transfered = reagents.trans_to(M, 50)
|
||||
|
||||
to_chat(user, "<span class='warning'>You sneakily stab [M] with the pen.</span>")
|
||||
add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered from pen containing [english_list(contained)].")
|
||||
for(var/datum/reagent/R as anything in reagents.reagent_list)
|
||||
if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
|
||||
return TRUE
|
||||
reagents.reaction(M, REAGENT_INGEST, 0.1)
|
||||
return TRUE
|
||||
|
||||
|
||||
|
||||
@@ -264,8 +264,13 @@
|
||||
if(blocked != INFINITY)
|
||||
if(M.can_inject(null, FALSE, hit_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
|
||||
..()
|
||||
for(var/datum/reagent/R as anything in reagents.reagent_list)
|
||||
if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
return TRUE
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
return 1
|
||||
reagents.reaction(M, REAGENT_INGEST, 0.1)
|
||||
return TRUE
|
||||
else
|
||||
blocked = INFINITY
|
||||
target.visible_message("<span class='danger'>[src] was deflected!</span>", \
|
||||
@@ -273,7 +278,7 @@
|
||||
..(target, blocked, hit_zone)
|
||||
reagents.set_reacting(TRUE)
|
||||
reagents.handle_reactions()
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/obj/item/projectile/bullet/dart/metalfoam
|
||||
|
||||
|
||||
@@ -46,7 +46,10 @@
|
||||
var/contained = english_list(injected)
|
||||
|
||||
add_attack_logs(user, M, "Injected with [src] containing ([contained])", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
|
||||
|
||||
for(var/datum/reagent/R as anything in reagents.reagent_list)
|
||||
if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
|
||||
return TRUE
|
||||
reagents.reaction(M, REAGENT_INGEST, 0.1)
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/hypospray/on_reagent_change()
|
||||
|
||||
Reference in New Issue
Block a user