cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should fix #8710

Browse Source
This commit is contained in:
Zuhayr
2015-04-01 17:27:06 -07:00
parent c3eb6102b4
commit 294a1ff1f1
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/organs/organ_external.dm
View File

@@ -640,8 +640,8 @@ Note that amputating the affected organ does in fact remove the infection from t
wounds.Cut() wounds.Cut()
if(parent) if(parent)
var/datum/wound/W var/datum/wound/W
if(max_damage < 50) if(clean || max_damage < 50)
W = new/datum/wound/lost_limb/small(max_damage) W = new/datum/wound/lost_limb/small(max_damage/2)
else else
W = new/datum/wound/lost_limb(max_damage) W = new/datum/wound/lost_limb(max_damage)
parent.children -= src parent.children -= src
@@ -930,6 +930,7 @@ Note that amputating the affected organ does in fact remove the infection from t
gendered_icon = 1 gendered_icon = 1
cannot_amputate = 1 cannot_amputate = 1
parent_organ = null parent_organ = null
encased = "ribcage"
/obj/item/organ/external/groin /obj/item/organ/external/groin
name = "lower body" name = "lower body"
@@ -1051,6 +1052,7 @@ Note that amputating the affected organ does in fact remove the infection from t
joint = "jaw" joint = "jaw"
amputation_point = "neck" amputation_point = "neck"
gendered_icon = 1 gendered_icon = 1
encased = "skull"
/obj/item/organ/external/head/removed() /obj/item/organ/external/head/removed()
if(owner) if(owner)

2
code/modules/surgery/organs_internal.dm
View File

@@ -357,7 +357,7 @@
user << "\red \The [target] already has [o_a][O.organ_tag]." user << "\red \The [target] already has [o_a][O.organ_tag]."
return 2 return 2
if(O && affected.name == O.parent_organ) if(O && affected.limb_name == O.parent_organ)
organ_compatible = 1 organ_compatible = 1
else else
user << "\red \The [O.organ_tag] [o_do] normally go in \the [affected.name]." user << "\red \The [O.organ_tag] [o_do] normally go in \the [affected.name]."