From eb1d24429a68935aab4cf2a34e06bf54d2b2ca8e Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 22 Nov 2012 15:16:17 +0400 Subject: [PATCH 1/4] Fixed typo and wrong colors for ribcage surgery messages. --- code/WorkInProgress/surgery.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/WorkInProgress/surgery.dm b/code/WorkInProgress/surgery.dm index 3989e7d8804..71ee76d797d 100644 --- a/code/WorkInProgress/surgery.dm +++ b/code/WorkInProgress/surgery.dm @@ -1093,8 +1093,8 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) target.custom_pain("Something hurts horribly in your chest!",1) end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/msg = "[user] bends [target]'s ribcage back into place with \the [tool]." - var/self_msg = "You bends [target]'s ribcage back into place with \the [tool]." + var/msg = "\blue [user] bends [target]'s ribcage back into place with \the [tool]." + var/self_msg = "\blue You bend [target]'s ribcage back into place with \the [tool]." user.visible_message(msg, self_msg) target.ribcage_op_stage = 1 @@ -1116,8 +1116,8 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/msg = "[user] applied \the [tool] to [target]'s ribcage." - var/self_msg = "You applied \the [tool] to [target]'s ribcage." + var/msg = "\blue [user] applied \the [tool] to [target]'s ribcage." + var/self_msg = "\blue You applied \the [tool] to [target]'s ribcage." user.visible_message(msg, self_msg) target.ribcage_op_stage = 0 @@ -1168,8 +1168,8 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/chest/affected = target.get_organ("chest") - user.visible_message("[user] mends the rupture in [target]'s lungs with \the [tool].", \ - "You mend the rupture in [target]'s lungs with \the [tool]." ) + user.visible_message("\blue [user] mends the rupture in [target]'s lungs with \the [tool].", \ + "\blue You mend the rupture in [target]'s lungs with \the [tool]." ) affected.ruptured_lungs = 0 fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) From 8e716d12f1784847f62cbff33fc5c3bbfcd92911 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 22 Nov 2012 21:25:19 +0400 Subject: [PATCH 2/4] Stuffing mobs in disposals was logged only when you did it via grab. Now from dragging too. --- code/modules/recycling/disposal.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 76e4beb0ce6..b8fedc7e04f 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -155,6 +155,9 @@ else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" user << "You stuff [target.name] into the [src]!" + log_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") + log_admin("ATTACK: [usr] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") + msg_admin_attack("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") else return if (target.client) From 4e4db63889c557aa3fc2e79638201c51258c86aa Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 22 Nov 2012 23:40:24 +0400 Subject: [PATCH 3/4] Fixes healthy appendix spawning always, regardless of if mob had appendicitis or no. Also possibly mobs did not get resistance to appendicitis. --- code/WorkInProgress/surgery.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/surgery.dm b/code/WorkInProgress/surgery.dm index 71ee76d797d..cda474aa3a4 100644 --- a/code/WorkInProgress/surgery.dm +++ b/code/WorkInProgress/surgery.dm @@ -282,15 +282,15 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("\blue [user] has removed [target]'s appendix with \the [tool].", \ "\blue You have removed [target]'s appendix with \the [tool].") - var/datum/disease/appendicitis/app = null + var/app = 0 for(var/datum/disease/appendicitis/appendicitis in target.viruses) - app = appendicitis + app = 1 appendicitis.cure() + target.resistances += appendicitis if (app) new /obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed(get_turf(target)) else new /obj/item/weapon/reagent_containers/food/snacks/appendix(get_turf(target)) - target.resistances += app target.op_stage.appendix = 2 fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) From faa084a955b0ae33454b3d3d8694f12a5891fd14 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 25 Nov 2012 15:20:08 +0400 Subject: [PATCH 4/4] Fix for lung surgery. Fix for internal wounds surgery messages. --- code/WorkInProgress/surgery.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/surgery.dm b/code/WorkInProgress/surgery.dm index cda474aa3a4..3b1401708d0 100644 --- a/code/WorkInProgress/surgery.dm +++ b/code/WorkInProgress/surgery.dm @@ -323,9 +323,8 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - if (affected.stage == 0) - user.visible_message("[user] starts patching the damaged vein in [target]'s [affected.display_name] with \the [tool]." , \ - "You start patching the damaged vein in [target]'s [affected.display_name] with \the [tool].") + user.visible_message("[user] starts patching the damaged vein in [target]'s [affected.display_name] with \the [tool]." , \ + "You start patching the damaged vein in [target]'s [affected.display_name] with \the [tool].") target.custom_pain("The pain in [affected.display_name] is unbearable!",1) end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -1159,7 +1158,7 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user) max_duration = 90 can_use(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - return ..() && target.is_lung_ruptured() + return ..() && target.is_lung_ruptured() && target.ribcage_op_stage == 2 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("[user] starts mending the rupture in [target]'s lungs with \the [tool].", \