From 5c3cdda40f5bc505aee48b237576d55e7bed554c Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 23 May 2012 15:21:54 +0100 Subject: [PATCH] Fixes Tajaran spawning as humans with furry bits. Fixes cyborgs using recharges. Fixes medical messages. --- code/game/machinery/recharger.dm | 3 +++ code/game/objects/items/weapons/medical.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 7987769849c..dba8093868f 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -12,6 +12,9 @@ obj/machinery/recharger obj/item/weapon/melee/baton/charging2 = null attackby(obj/item/weapon/G as obj, mob/user as mob) + if(issilicon(user)) + return + if (istype(G, /obj/item/weapon/gun/energy)) if (src.charging || src.charging2) return diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm index ef8a6b52f08..12305a43c01 100644 --- a/code/game/objects/items/weapons/medical.dm +++ b/code/game/objects/items/weapons/medical.dm @@ -37,7 +37,7 @@ MEDICAL if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) affecting = M:get_organ("head") if(affecting.destroyed && !affecting.gauzed) - user.visible_message("\red You do your best to stop the bleeding from [M]'s stump.", "\red [user] does [user.gender == MALE? "his" : "her"] best to stem [M]'s bleeding from [M.gender == MALE? "his" : "her"] stump.", "\red You hear something like gauze being ripped.") + user.visible_message("\red [user] does [user.gender == MALE? "his" : "her"] best to stem [M]'s bleeding from [M.gender == MALE? "his" : "her"] stump.", "\red You do your best to stop the bleeding from [M]'s stump.", "\red You hear something like gauze being ripped.") affecting.gauzed = 1 use(1) return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8194483c4f9..2f23dfd7ec2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -149,6 +149,11 @@ fixblood() ..() + + spawn(5) // Failsafe for.. weirdness. + update_clothing() + update_body() + /*var/known_languages = list() known_languages.Add("english")*/