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

Makes organ removal/attachment right again (#5192)

Browse Source 
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
This commit is contained in:
Aronai Sieyes
2018-04-25 12:03:10 -07:00
committed by Atermonera
parent debef5a5fe
commit a849010ab1
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+2
View File
@@ -1189,6 +1189,8 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.organs -= src
victim.organs_by_name[organ_tag] = null // Remove from owner's vars.
status |= ORGAN_CUT_AWAY //Checked during surgeries to reattach it
//Robotic limbs explode if sabotaged.
if(is_robotic && sabotaged)
victim.visible_message(
code/modules/surgery/limb_reattach.dm
+3 -6
View File
@@ -84,7 +84,7 @@
/datum/surgery_step/limb/connect/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/E = target.get_organ(target_zone)
return E && !E.is_stump() && (E.status & ORGAN_DESTROYED)
return E && !E.is_stump() && (E.status & ORGAN_CUT_AWAY)
/datum/surgery_step/limb/connect/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/E = target.get_organ(target_zone)
@@ -95,11 +95,8 @@
var/obj/item/organ/external/E = target.get_organ(target_zone)
user.visible_message("<span class='notice'>[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>", \
"<span class='notice'>You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>")
E.status &= ~ORGAN_DESTROYED
if(E.children)
for(var/obj/item/organ/external/C in E.children)
C.status &= ~ORGAN_DESTROYED
target.update_icons_body(FALSE)
E.status &= ~ORGAN_CUT_AWAY
target.update_icons_body()
target.updatehealth()
target.UpdateDamageIcon()