shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2

Browse Source 
Robotic limbs 2 : Threshhold Boogaloo
This commit is contained in:
silicons
2020-10-11 17:33:00 -07:00
committed by GitHub
parent 9e536c26ca 365b2804d8
commit 29b7b49fe9
43 changed files with 208 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/hypospray.dm
+4 -2
View File
@@ -391,10 +391,12 @@
if(!affecting)
to_chat(user, "<span class='warning'>The limb is missing!</span>")
return
if(affecting.status != BODYPART_ORGANIC)
if(!affecting.is_organic_limb())
to_chat(user, "<span class='notice'>Medicine won't work on a robotic limb!</span>")
return
else if(!affecting.is_organic_limb(FALSE) && mode != HYPO_INJECT)
to_chat(user, "<span class='notice'>Biomechanical limbs can only be treated via their integrated injection port, not via spraying!</span>")
return
//Always log attemped injections for admins
var/contained = vial.reagents.log_list()
log_combat(user, L, "attemped to inject", src, addition="which had [contained]")
code/modules/reagents/reagent_containers/medspray.dm
+3 -1
View File
@@ -46,9 +46,11 @@
return
if(!L.can_inject(user, TRUE, user.zone_selected, FALSE, TRUE)) //stopped by clothing, like patches
return
if(affecting.status != BODYPART_ORGANIC)
if(!affecting.is_organic_limb())
to_chat(user, "<span class='notice'>Medicine won't work on a robotic limb!</span>")
return
else if(!affecting.is_organic_limb(FALSE))
to_chat(user, "<span class='notice'>Medical sprays won't work on a biomechanical limb!</span>")
if(L == user)
L.visible_message("<span class='notice'>[user] attempts to [apply_method] [src] on [user.p_them()]self.</span>")
code/modules/reagents/reagent_containers/patch.dm
+3 -1
View File
@@ -19,8 +19,10 @@
return
if(!L.can_inject(user, TRUE, user.zone_selected, FALSE, TRUE)) //stopped by clothing, not by species immunity.
return
if(affecting.status != BODYPART_ORGANIC)
if(!affecting.is_organic_limb())
to_chat(user, "<span class='notice'>Medicine won't work on a robotic limb!</span>")
else if(!affecting.is_organic_limb(FALSE))
to_chat(user, "<span class='notice'>Medical patches won't work on a biomechanical limb!</span>")
return
..()