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

LIMBSTUMPS

Browse Source
This commit is contained in:
Aurorablade
2016-02-09 18:32:40 -05:00
parent 3b90cb703a
commit eca3edfec3
7 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_internal.dm
+5 -5
View File
@@ -266,23 +266,23 @@ datumvars//note i am putting External in robolimbs.
/obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
if(overloaded)//ensure the implant isn't broken
owner.visible_message("<span class='warning'>The implant doesn't respond. It seems to be broken...</span>")
owner << "<span class='warning'>The implant doesn't respond. It seems to be broken...</span>"
return
if(out)//check if the owner has the item out already
owner.unEquip(holder, 1)//if he does, take it away. then,
holder.loc = null//stash it in nullspace
out = 0//and set this to clarify the item isn't out.
owner.visible_message("<span class='notice'>You retract [holder].</span>")
owner.visible_message("<span class='notice'>[owner] retracts [holder].</span>","<span class='notice'>You retract [holder].</span>")
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
else//if he doesn't have the item out
if(owner.put_in_hands(holder))//put it in his hands.
lasthand = owner.get_active_hand()
out = 1
owner.visible_message("<span class='notice'>You extend [holder]!</span>")
owner.visible_message("<span class='notice'>[owner] extends [holder]!</span>","<span class='notice'>You extend [holder]!</span>")
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
else//if this fails to put the item in his hands,
holder.loc = null//keep it in nullspace
owner.visible_message("<span class='warning'>You can't extend [holder] if you can't use your hands!</span>")
owner << "<span class='warning'>You can't extend [holder] if you can't use your hands!</span>"
/obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed...
if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then...
@@ -291,7 +291,7 @@ datumvars//note i am putting External in robolimbs.
owner.unEquip(holder, 1)//if he does, take it away.
holder.loc = null
out = 0
owner.visible_message("<span class='notice'>[holder] forcibly retracts into your arm.</span>")
owner.visible_message("<span class='notice'>[holder] forcibly retracts into [owner]'s arm.</span>")
owner.visible_message("<span class='danger'>A loud bang comes from [owner]...</span>")
playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1)
owner << "<span class='warning'>You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?</span>"
code/modules/surgery/organs/organ_external.dm
+2 -2
View File
@@ -76,7 +76,7 @@
//qdel(O)
return ..()
/*
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
switch(stage)
if(0)
@@ -110,7 +110,7 @@
user.visible_message("<span class='danger'><b>[user]</b> fishes around fruitlessly in [src] with [W].")
return
..()
*/
/obj/item/organ/external/update_health()
damage = min(max_damage, (brute_dam + burn_dam))