cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-26 02:17:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes (#6110)

Browse Source 
see commits

---------

Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-10-30 17:23:16 -07:00
committed by GitHub
co-authored by silicons
parent 7989e028f2
commit 9fe3589e93
23 changed files with 70 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/items/hypospray.dm
+9 -9
View File
@@ -158,27 +158,27 @@
block_flags |= (I.clothing_flags & (CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT))
// got all coverage, proceed.
var/delay = injection_time
if(block_flags & CLOTHING_THICK_MATERIAL)
if(block_flags & CLOTHING_INJECTION_PORT)
if(isnull(thick_add_time))
user.action_feedback(SPAN_WARNING("[src] is not compatible with injection ports!"), src)
return FALSE
delay += port_add_time
// todo: 'friendly name' so limbs can stay concealed of their true names while under clothing?
inject_message = SPAN_NOTICE("[user] starts to search for an injection port on [target]'s [limb.name].")
else if(block_flags & CLOTHING_THICK_MATERIAL)
if(isnull(thick_add_time))
user.action_feedback(SPAN_WARNING("[src] can't [inject_verb] through something that thick!"), src)
return FALSE
delay += thick_add_time
// todo: 'friendly name' so limbs can stay concealed of their true names while under clothing?
inject_message = SPAN_WARNING("[user] starts to dig [src] up against [target]'s [limb]!")
else if(block_flags & CLOTHING_INJECTION_PORT)
if(isnull(thick_add_time))
user.action_feedback(SPAN_WARNING("[src] is not compatible with injection ports!"), src)
return FALSE
delay += port_add_time
// todo: 'friendly name' so limbs can stay concealed of their true names while under clothing?
inject_message = SPAN_NOTICE("[user] starts to search for an injection port on [target]'s [limb].")
if(target.a_intent != INTENT_HELP)
if(isnull(resist_add_time))
user.action_feedback(SPAN_WARNING("[src] is not capable of aligning while [target] is resisting! (Non-help intent)"), src)
return FALSE
delay += resist_add_time
// todo: 'friendly name' so limbs can stay concealed of their true names while under clothing?
inject_message = SPAN_WARNING("[user] starts to intrusively align [src] up against [target]'s [limb]!")
inject_message = SPAN_WARNING("[user] starts to intrusively align [src] up against [target]'s [limb.name]!")
if(!silent)
user.visible_action_feedback(
target = target,