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

[modular] fixes runtimes with the hypospray mkii on injection (#8736)

Browse Source 
* fixes runtimes

* eh

* Update modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
Seris02
2021-10-10 15:28:15 +01:00
committed by GitHub
co-authored by Tom
parent 01dfc3e519
commit e20788cbb4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm
+6 -6
View File
@@ -41,7 +41,7 @@
//Can you hotswap vials? - now all hyposprays can!
var/quickload = TRUE
//Does it go through hardsuits?
var/penetrates = FALSE
var/penetrates = null
/obj/item/hypospray/mkii/CMO
name = "hypospray mk.II deluxe"
@@ -152,7 +152,7 @@
spray_wait = COMBAT_WAIT_SPRAY
spray_self = COMBAT_SELF_INJECT
inject_self = COMBAT_SELF_SPRAY
penetrates = TRUE
penetrates = INJECT_CHECK_PENETRATE_THICK
to_chat(user, "You overcharge [src]'s control circuit.")
obj_flags |= EMAGGED
return TRUE
@@ -172,7 +172,7 @@
return
var/mob/living/injectee = target
if(!injectee.reagents || !injectee.can_inject(user, TRUE, user.zone_selected, penetrates))
if(!injectee.reagents || !injectee.can_inject(user, user.zone_selected, penetrates))
return
if(iscarbon(injectee))
@@ -194,9 +194,9 @@
var/fp_verb = mode == HYPO_SPRAY ? "spray" : "inject"
if(injectee != user)
injectee.visible_message(span_danger("[user] is trying to [fp_verb] [injectee] with [src]!</span>"), \
span_userdanger("is trying to [fp_verb] you with [src]!"))
if(!do_mob(user, injectee, inject_wait, extra_checks = CALLBACK(injectee, /mob/living/proc/can_inject, user, FALSE, user.zone_selected, penetrates)))
injectee.visible_message(span_danger("[user] is trying to [fp_verb] [injectee] with [src]!"), \
span_userdanger("[user] is trying to [fp_verb] you with [src]!"))
if(!do_mob(user, injectee, inject_wait, extra_checks = CALLBACK(injectee, /mob/living/proc/can_inject, user, user.zone_selected, penetrates)))
return
if(!vial.reagents.total_volume)
return