mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 15:14:27 +01:00
Fix for internal organ surgery
Fixes internal organ surgery, and some other places where the same problem would have cropped up
This commit is contained in:
@@ -503,7 +503,7 @@
|
||||
O.wounds = list()
|
||||
O.wound_update_accuracy = 1
|
||||
for(var/organ_name in H.internal_organs)
|
||||
var/datum/organ/internal/IO = H.internal_organs[organ_name]
|
||||
var/datum/organ/internal/IO = H.internal_organs_by_name[organ_name]
|
||||
IO.damage = 0
|
||||
IO.trace_chemicals = list()
|
||||
H.updatehealth()
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
severity -= 1
|
||||
severity = min(max(severity, 0), 4)
|
||||
var/mob/living/carbon/human/H = C
|
||||
var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
|
||||
var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
|
||||
|
||||
switch(severity)
|
||||
if(0)
|
||||
|
||||
@@ -1747,7 +1747,7 @@ datum
|
||||
// M.sdisabilities &= ~BLIND //doesn't even do anythig cos of the sdisabilities = 0 bit
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
|
||||
var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
|
||||
if(istype(E))
|
||||
E.damage = max(E.damage-5 , 0)
|
||||
M.SetWeakened(0)
|
||||
|
||||
@@ -209,10 +209,10 @@
|
||||
return ..() && is_chest_organ_damaged && target.op_stage.ribcage == 2
|
||||
|
||||
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"]
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"]
|
||||
|
||||
if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
|
||||
if(lungs.damage > 0)
|
||||
@@ -270,10 +270,10 @@
|
||||
..()
|
||||
|
||||
end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"]
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"]
|
||||
|
||||
if(lungs.damage > 0)
|
||||
user.visible_message("\blue [user] mends the rupture in [target]'s lungs with \the [tool].", \
|
||||
@@ -300,10 +300,10 @@
|
||||
kidney.damage = 0
|
||||
|
||||
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"]
|
||||
var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"]
|
||||
var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"]
|
||||
var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"]
|
||||
var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"]
|
||||
var/datum/organ/external/chest/affected = target.get_organ("chest")
|
||||
user.visible_message("\red [user]'s hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!", \
|
||||
"\red Your hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!")
|
||||
|
||||
Reference in New Issue
Block a user