From dcf46204c93d0f46a5fae2a3d29a9801e888d2ab Mon Sep 17 00:00:00 2001 From: Vivalas Date: Wed, 21 Jun 2017 15:01:23 -0500 Subject: [PATCH 01/12] Splint nerf --- code/__DEFINES/mob.dm | 2 ++ code/game/objects/items/stacks/medical.dm | 4 ++++ code/modules/mob/living/carbon/carbon.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 2 ++ .../mob/living/carbon/human/human_organs.dm | 16 ++++++++++++++++ .../mob/living/carbon/human/species/skeleton.dm | 1 + code/modules/surgery/bones.dm | 2 +- code/modules/surgery/organs/organ_external.dm | 15 +++++++++++++++ 8 files changed, 42 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm index 36fffdd907a..f62db7a3fdc 100644 --- a/code/__DEFINES/mob.dm +++ b/code/__DEFINES/mob.dm @@ -25,6 +25,8 @@ #define LEFT 1 #define RIGHT 2 +#define SPLINT_LIFE 2000 //number of steps splints stay on + //Pulse levels, very simplified #define PULSE_NONE 0 //so !M.pulse checks would be possible diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 82d2ce8c024..8ec4fc87160 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -200,6 +200,7 @@ to_chat(user, "[H]'s [limb] is already splinted!") if(alert(user, "Would you like to remove the splint from [H]'s [limb]?", "Removing.", "Yes", "No") == "Yes") affecting.status &= ~ORGAN_SPLINTED + H.handle_splints() to_chat(user, "You remove the splint from [H]'s [limb].") return if(M == user) @@ -214,4 +215,7 @@ "You hear something being wrapped.") affecting.status |= ORGAN_SPLINTED + affecting.splinted_count = H.step_count + H.handle_splints() + use(1) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0848a90e8c0..9cdb618b8a4 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1110,4 +1110,4 @@ so that different stomachs can handle things in different ways VB*/ update_tint() if(I.flags_inv & HIDEMASK || forced) update_inv_wear_mask() - update_inv_head() + update_inv_head() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 15f9b6d112e..5ea1c9baeb0 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -73,3 +73,5 @@ var/global/default_martial_art = new/datum/martial_art var/datum/body_accessory/body_accessory = null var/tail // Name of tail image in species effects icon file. + + var/list/splinted_limbs = list() //limbs we know are splinted diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 24ed336a4a3..733493dc005 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -12,15 +12,25 @@ number_wounds = 0 var/force_process = 0 + var/splint_process = 0 var/damage_this_tick = getBruteLoss() + getFireLoss() + getToxLoss() if(damage_this_tick > last_dam) force_process = 1 + if(splinted_limbs.len) + splint_process = 1 last_dam = damage_this_tick if(force_process) bad_external_organs.Cut() for(var/obj/item/organ/external/Ex in bodyparts) bad_external_organs |= Ex + else if(splint_process) //we don't need to process every organ if it's just one limb splinted + for(var/obj/item/organ/external/splinted in splinted_limbs) + if(!(splinted.status & ORGAN_SPLINTED)) + splinted_limbs -= splinted + continue + bad_external_organs |= splinted + //processing internal organs is pretty cheap, do that first. for(var/obj/item/organ/internal/I in internal_organs) I.process() @@ -210,3 +220,9 @@ I use this to standardize shadowling dethrall code odmg += O.brute_dam odmg += O.burn_dam return (health < (100 - odmg)) + +/mob/living/carbon/human/proc/handle_splints() //proc that rebuilds the list of splints on this person, for ease of processing + splinted_limbs.Cut() + for(var/obj/item/organ/external/limb in bodyparts) + if(limb.status & ORGAN_SPLINTED) + splinted_limbs += limb \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm index 62676144ebd..efb0ca00785 100644 --- a/code/modules/mob/living/carbon/human/species/skeleton.dm +++ b/code/modules/mob/living/carbon/human/species/skeleton.dm @@ -55,6 +55,7 @@ if(L.brute_dam < L.min_broken_damage) L.status &= ~ORGAN_BROKEN L.status &= ~ORGAN_SPLINTED + H.handle_splints() L.perma_injury = 0 break // We're only checking one limb here, bucko if(prob(3)) diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index db9d5f4821d..74fd2c7c3d4 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -168,7 +168,7 @@ affected.status &= ~ORGAN_BROKEN affected.status &= ~ORGAN_SPLINTED affected.perma_injury = 0 - + target.handle_splints() return 1 /datum/surgery_step/finish_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 151636a9a50..de97dd66baa 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -68,6 +68,8 @@ var/can_stand var/wound_cleanup_timer + var/splinted_count = 0 //Time when this organ was last splinted + /obj/item/organ/external/necrotize(update_sprite=TRUE) if(status & (ORGAN_ROBOT|ORGAN_DEAD)) return @@ -468,6 +470,8 @@ This function completely restores a damaged organ to perfect condition. //Infections update_germs() + //Splints + update_splints() else ..() @@ -680,6 +684,17 @@ Note that amputating the affected organ does in fact remove the infection from t tbrute = 3 return "[tbrute][tburn]" +/obj/item/organ/external/proc/update_splints() //we're processing splints like this instead of on a per step basis for efficiency + if(!(status & ORGAN_SPLINTED)) + return + if(owner.step_count >= splinted_count + SPLINT_LIFE) + status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now! + owner.visible_message("[owner] screams in pain as their splint pops off their [src.name]!","You scream in pain as your splint pops off your [src.name]!") + owner.emote("scream") + owner.Stun(2) + owner.handle_splints() + + /**************************************************** DISMEMBERMENT ****************************************************/ From 69849706a71328bfaf695385dbb9881faa8ab651 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Thu, 22 Jun 2017 03:13:32 -0500 Subject: [PATCH 02/12] Changes splint to per step --- .../mob/living/carbon/human/human_movement.dm | 16 ++++++++++------ .../mob/living/carbon/human/human_organs.dm | 7 +------ code/modules/surgery/organs/organ_external.dm | 6 ++++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 85dd6e81f3c..4c5c1fb2993 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -35,12 +35,16 @@ /mob/living/carbon/human/Move(NewLoc, direct) . = ..() - if(shoes && .) // did we actually move? - if(!lying && !buckled) - if(!has_gravity(loc)) - return - var/obj/item/clothing/shoes/S = shoes - S.step_action(src) + if(.) // did we actually move? + if(!lying && !buckled && !throwing) + for(var/obj/item/organ/external/splinted in splinted_limbs) + splinted.update_splints() + if(!shoes) + return + if(!has_gravity(loc)) + return + var/obj/item/clothing/shoes/S = shoes + S.step_action(src) /mob/living/carbon/human/handle_footstep(turf/T) if(..()) diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 733493dc005..15a49474d3e 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -12,24 +12,19 @@ number_wounds = 0 var/force_process = 0 - var/splint_process = 0 var/damage_this_tick = getBruteLoss() + getFireLoss() + getToxLoss() if(damage_this_tick > last_dam) force_process = 1 - if(splinted_limbs.len) - splint_process = 1 last_dam = damage_this_tick if(force_process) bad_external_organs.Cut() for(var/obj/item/organ/external/Ex in bodyparts) bad_external_organs |= Ex - else if(splint_process) //we don't need to process every organ if it's just one limb splinted + if(splinted_limbs.len) //clean up the splinted limbs list for(var/obj/item/organ/external/splinted in splinted_limbs) if(!(splinted.status & ORGAN_SPLINTED)) splinted_limbs -= splinted - continue - bad_external_organs |= splinted //processing internal organs is pretty cheap, do that first. for(var/obj/item/organ/internal/I in internal_organs) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index de97dd66baa..2db1ad37a47 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -222,6 +222,10 @@ if(status & ORGAN_BROKEN && prob(40) && brute) owner.emote("scream") //getting hit on broken hand hurts + if(status & ORGAN_SPLINTED && prob((brute + burn)*4)) //taking damage to splinted limbs removes the splints + status &= ~ORGAN_SPLINTED + owner.visible_message("The splint on [owner]'s left arm unravels from their [src.name]!","The splint on your [src.name] unravels!") + owner.handle_splints() if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) @@ -470,8 +474,6 @@ This function completely restores a damaged organ to perfect condition. //Infections update_germs() - //Splints - update_splints() else ..() From f3ff2d3f1a5ac8b76d3389d4dc20ec6e580034f5 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Thu, 22 Jun 2017 03:17:09 -0500 Subject: [PATCH 03/12] Removes comment --- code/modules/surgery/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 2db1ad37a47..763b8655471 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -686,7 +686,7 @@ Note that amputating the affected organ does in fact remove the infection from t tbrute = 3 return "[tbrute][tburn]" -/obj/item/organ/external/proc/update_splints() //we're processing splints like this instead of on a per step basis for efficiency +/obj/item/organ/external/proc/update_splints() if(!(status & ORGAN_SPLINTED)) return if(owner.step_count >= splinted_count + SPLINT_LIFE) From fdfa737658049e602abc2b4e776263149f50a592 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Fri, 23 Jun 2017 00:19:46 -0500 Subject: [PATCH 04/12] Removes life check and adds qdel stuff --- code/modules/mob/living/carbon/human/human.dm | 1 + code/modules/mob/living/carbon/human/human_organs.dm | 5 ----- code/modules/surgery/organs/organ_external.dm | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ba55801c522..b3d5c09e626 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -66,6 +66,7 @@ /mob/living/carbon/human/Destroy() QDEL_LIST(bodyparts) + QDEL_LIST(splinted_limbs) return ..() /mob/living/carbon/human/dummy diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 15a49474d3e..bec84778c73 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -21,11 +21,6 @@ for(var/obj/item/organ/external/Ex in bodyparts) bad_external_organs |= Ex - if(splinted_limbs.len) //clean up the splinted limbs list - for(var/obj/item/organ/external/splinted in splinted_limbs) - if(!(splinted.status & ORGAN_SPLINTED)) - splinted_limbs -= splinted - //processing internal organs is pretty cheap, do that first. for(var/obj/item/organ/internal/I in internal_organs) I.process() diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 763b8655471..36fbd6e6e91 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -688,6 +688,7 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/proc/update_splints() if(!(status & ORGAN_SPLINTED)) + owner.splinted_limbs -= src return if(owner.step_count >= splinted_count + SPLINT_LIFE) status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now! From b2fae10aee9be4f2defb1dfd02c9a6eea4666852 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Fri, 23 Jun 2017 15:41:13 -0500 Subject: [PATCH 05/12] Probably fixes things --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/surgery/organs/organ_external.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b3d5c09e626..6247613db82 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -66,7 +66,7 @@ /mob/living/carbon/human/Destroy() QDEL_LIST(bodyparts) - QDEL_LIST(splinted_limbs) + splinted_limbs.Cut() return ..() /mob/living/carbon/human/dummy diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 36fbd6e6e91..ca2bee1fdd9 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -953,6 +953,8 @@ Note that amputating the affected organ does in fact remove the infection from t status |= ORGAN_DESTROYED victim.bad_external_organs -= src + if(status & ORGAN_SPLINTED) + victim.splinted_limbs -= src for(var/implant in implants) //todo: check if this can be left alone qdel(implant) From cabb9ff92ace29a8f6e7a9e396667f4aee76749d Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sat, 9 Sep 2017 17:41:43 -0500 Subject: [PATCH 06/12] Fixes some wierd indent issues probably --- .../mob/living/carbon/human/human_movement.dm | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index a3a1eb62e7e..7c98bbb6ab9 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -40,40 +40,41 @@ for(var/obj/item/organ/external/splinted in splinted_limbs) splinted.update_splints() - if(!has_gravity(loc)) - return - var/obj/item/clothing/shoes/S = shoes + if(!has_gravity(loc)) + return + + var/obj/item/clothing/shoes/S = shoes - //Bloody footprints - var/turf/T = get_turf(src) - var/obj/item/organ/external/l_foot = get_organ("l_foot") - var/obj/item/organ/external/r_foot = get_organ("r_foot") - var/hasfeet = 1 - if(!l_foot && !r_foot) - hasfeet = 0 + //Bloody footprints + var/turf/T = get_turf(src) + var/obj/item/organ/external/l_foot = get_organ("l_foot") + var/obj/item/organ/external/r_foot = get_organ("r_foot") + var/hasfeet = 1 + if(!l_foot && !r_foot) + hasfeet = 0 - if(shoes) - if(S.bloody_shoes && S.bloody_shoes[S.blood_state]) - var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T - if(oldFP && oldFP.blood_state == S.blood_state && oldFP.basecolor == S.blood_color) - return - else - //No oldFP or it's a different kind of blood - S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state] - BLOOD_LOSS_PER_STEP) - createFootprintsFrom(shoes, dir, T) - update_inv_shoes() - else if(hasfeet) - if(bloody_feet && bloody_feet[blood_state]) - var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T - if(oldFP && oldFP.blood_state == blood_state && oldFP.basecolor == feet_blood_color) - return - else - bloody_feet[blood_state] = max(0, bloody_feet[blood_state] - BLOOD_LOSS_PER_STEP) - createFootprintsFrom(src, dir, T) - update_inv_shoes() - //End bloody footprints - if(S) - S.step_action(src) + if(shoes) + if(S.bloody_shoes && S.bloody_shoes[S.blood_state]) + var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T + if(oldFP && oldFP.blood_state == S.blood_state && oldFP.basecolor == S.blood_color) + return + else + //No oldFP or it's a different kind of blood + S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state] - BLOOD_LOSS_PER_STEP) + createFootprintsFrom(shoes, dir, T) + update_inv_shoes() + else if(hasfeet) + if(bloody_feet && bloody_feet[blood_state]) + var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T + if(oldFP && oldFP.blood_state == blood_state && oldFP.basecolor == feet_blood_color) + return + else + bloody_feet[blood_state] = max(0, bloody_feet[blood_state] - BLOOD_LOSS_PER_STEP) + createFootprintsFrom(src, dir, T) + update_inv_shoes() + //End bloody footprints + if(S) + S.step_action(src) /mob/living/carbon/human/handle_footstep(turf/T) if(..()) From 9f751174b68cd054b1868a31bf3bcc3f39a1b3ca Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sat, 9 Sep 2017 17:57:15 -0500 Subject: [PATCH 07/12] Wierd spaces --- code/modules/mob/living/carbon/human/human_movement.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 7c98bbb6ab9..9b465c90eda 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -40,10 +40,10 @@ for(var/obj/item/organ/external/splinted in splinted_limbs) splinted.update_splints() - if(!has_gravity(loc)) + if(!has_gravity(loc)) return - var/obj/item/clothing/shoes/S = shoes + var/obj/item/clothing/shoes/S = shoes //Bloody footprints var/turf/T = get_turf(src) From 0a6fe18e77ad5de83ce5774ee0d440ac76658ff8 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sat, 9 Sep 2017 19:55:49 -0500 Subject: [PATCH 08/12] Hurrah! It compiles --- code/modules/surgery/organs/organ_external.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 9eccfb6a411..d6beda6e1f0 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -666,8 +666,6 @@ Note that amputating the affected organ does in fact remove the infection from t var/is_robotic = status & ORGAN_ROBOT var/mob/living/carbon/human/victim = owner - status |= ORGAN_DESTROYED - victim.bad_external_organs -= src if(status & ORGAN_SPLINTED) victim.splinted_limbs -= src From 3443b57e0a595481cb9c1432bd03fac7f9d5cf6e Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sat, 16 Sep 2017 14:19:59 -0500 Subject: [PATCH 09/12] qdel Destroy() fix --- code/modules/surgery/organs/organ_external.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index d6beda6e1f0..2336a438295 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -86,6 +86,7 @@ if(owner) owner.bodyparts_by_name[limb_name] = null + owner.splinted_limbs -= src QDEL_LIST(children) From 5d44161043bc7ec57b7622cdd0d6d1d72682dcb8 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 17 Sep 2017 17:44:26 -0500 Subject: [PATCH 10/12] TRUE, FALSE, MAYBE.....? --- code/modules/mob/living/carbon/human/human_movement.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 9b465c90eda..fc048ab161a 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -49,9 +49,9 @@ var/turf/T = get_turf(src) var/obj/item/organ/external/l_foot = get_organ("l_foot") var/obj/item/organ/external/r_foot = get_organ("r_foot") - var/hasfeet = 1 + var/hasfeet = TRUE if(!l_foot && !r_foot) - hasfeet = 0 + hasfeet = FALSE if(shoes) if(S.bloody_shoes && S.bloody_shoes[S.blood_state]) From 891895f467c804fe72bd815c4f15fe27649d34c1 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 17 Sep 2017 17:46:27 -0500 Subject: [PATCH 11/12] SPAN ME UP SPAN ME UP INSIDE!!!! I CAN'T SPAN UP SAVEEEEE MEEEEEEEEE --- code/modules/surgery/organs/organ_external.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 2336a438295..9e173a26fdb 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -201,7 +201,7 @@ owner.emote("scream") //getting hit on broken hand hurts if(status & ORGAN_SPLINTED && prob((brute + burn)*4)) //taking damage to splinted limbs removes the splints status &= ~ORGAN_SPLINTED - owner.visible_message("The splint on [owner]'s left arm unravels from their [src.name]!","The splint on your [src.name] unravels!") + owner.visible_message("The splint on [owner]'s left arm unravels from their [src.name]!","The splint on your [src.name] unravels!") owner.handle_splints() if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) @@ -471,7 +471,7 @@ Note that amputating the affected organ does in fact remove the infection from t return if(owner.step_count >= splinted_count + SPLINT_LIFE) status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now! - owner.visible_message("[owner] screams in pain as their splint pops off their [src.name]!","You scream in pain as your splint pops off your [src.name]!") + owner.visible_message("[owner] screams in pain as their splint pops off their [src.name]!","You scream in pain as your splint pops off your [src.name]!") owner.emote("scream") owner.Stun(2) owner.handle_splints() @@ -776,4 +776,4 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/X in bodyparts) var/obj/item/organ/external/L = X for(var/obj/item/I in L.embedded_objects) - return 1 \ No newline at end of file + return 1 From f202816c7146aeb03c0413e37b9c2f8dbd0861ef Mon Sep 17 00:00:00 2001 From: Vivalas Date: Sun, 17 Sep 2017 17:54:53 -0500 Subject: [PATCH 12/12] Now look at this [src.name], that I just found.... When I say go, be ready to throw! .... IT'S [name] NOT [src.name]!! Aagh, Let's try something else... --- code/modules/surgery/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 9e173a26fdb..a623c0a0d0f 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -201,7 +201,7 @@ owner.emote("scream") //getting hit on broken hand hurts if(status & ORGAN_SPLINTED && prob((brute + burn)*4)) //taking damage to splinted limbs removes the splints status &= ~ORGAN_SPLINTED - owner.visible_message("The splint on [owner]'s left arm unravels from their [src.name]!","The splint on your [src.name] unravels!") + owner.visible_message("The splint on [owner]'s left arm unravels from their [name]!","The splint on your [name] unravels!") owner.handle_splints() if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) @@ -471,7 +471,7 @@ Note that amputating the affected organ does in fact remove the infection from t return if(owner.step_count >= splinted_count + SPLINT_LIFE) status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now! - owner.visible_message("[owner] screams in pain as their splint pops off their [src.name]!","You scream in pain as your splint pops off your [src.name]!") + owner.visible_message("[owner] screams in pain as their splint pops off their [name]!","You scream in pain as your splint pops off your [name]!") owner.emote("scream") owner.Stun(2) owner.handle_splints()