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

Training Wheels Come Off (#12587)

Browse Source
This commit is contained in:
Fox McCloud
2019-10-15 19:22:42 -04:00
committed by variableundefined
parent a5d3b48947
commit 45bb5241f0
9 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bones.dm
+2 -5
View File
@@ -165,11 +165,8 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='notice'> [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>" , \
"<span class='notice'> You have mended the damaged bones in [target]'s [affected.name] with \the [tool].</span>" )
affected.status &= ~ORGAN_BROKEN
affected.status &= ~ORGAN_SPLINTED
affected.perma_injury = 0
target.handle_splints()
return 1
affected.mend_fracture()
return TRUE
/datum/surgery_step/finish_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
code/modules/surgery/organs/organ_external.dm
+9 -4
View File
@@ -625,12 +625,17 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/mend_fracture()
if(is_robotic())
return 0 //ORGAN_BROKEN doesn't have the same meaning for robot limbs
if(brute_dam > min_broken_damage)
return 0 //will just immediately fracture again
return FALSE //ORGAN_BROKEN doesn't have the same meaning for robot limbs
if(!(status & ORGAN_BROKEN))
return FALSE
status &= ~ORGAN_BROKEN
return 1
status &= ~ORGAN_SPLINTED
perma_injury = 0
if(owner)
owner.handle_splints()
return TRUE
/obj/item/organ/external/robotize(company, make_tough = 0, convert_all = 1)
..()