From 85f82219bad69b9be101a708a123b0cf4fa2d3ea Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 25 Jul 2013 03:03:14 +0300 Subject: [PATCH 1/3] Fix for #3345. --- code/game/mecha/mech_fabricator.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 5bf46648228..7b72a5597bf 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -49,7 +49,8 @@ /obj/item/robot_parts/robot_component/radio, /obj/item/robot_parts/robot_component/actuator, /obj/item/robot_parts/robot_component/diagnosis_unit, - /obj/item/robot_parts/robot_component/camera + /obj/item/robot_parts/robot_component/camera, + /obj/item/robot_parts/robot_component/armour ), "Ripley"=list( /obj/item/mecha_parts/chassis/ripley, From a17e456a97e28dc64ba620cfc08fca264b918731 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 25 Jul 2013 03:04:28 +0300 Subject: [PATCH 2/3] Defaulting LOOC to being toggled on. --- code/setup.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/setup.dm b/code/setup.dm index db51f9993e1..8cf41fb4cc7 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -627,7 +627,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define CHAT_LOOC 4096 -#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS) +#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) #define BE_TRAITOR 1 #define BE_OPERATIVE 2 From cf4f9ba054c5fdf5d5915d1c13d5c145e8cabd56 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 25 Jul 2013 03:06:06 +0300 Subject: [PATCH 3/3] Typo fix, retractor step bugfix. --- code/modules/surgery/generic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index e46bff882d4..ede924d8b48 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -86,7 +86,7 @@ fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.display_name] with the \[tool]!", \ + user.visible_message("\red [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.display_name] with \the [tool]!", \ "\red Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.display_name] with \the [tool]!",) affected.createwound(CUT, 10) @@ -102,7 +102,7 @@ can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - return ..() && affected.open < 2 && !(affected.status & ORGAN_BLEEDING) + return ..() && affected.open == 1 && !(affected.status & ORGAN_BLEEDING) begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone)