From 0ba466e8810577825aaed6688133031612a84f42 Mon Sep 17 00:00:00 2001 From: Asanadas Date: Wed, 17 Oct 2012 19:18:17 -0400 Subject: [PATCH] Removing Soghun stutters, fix for infinite BoH in BoH. --- code/game/objects/items/weapons/storage/backpack.dm | 10 ++++++++-- code/modules/mob/living/carbon/human/say.dm | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 870c190e13..86cbe9afc0 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -42,10 +42,15 @@ ..() return -/* attackby(obj/item/weapon/W as obj, mob/user as mob) //BoH+BoH=Singularity, commented out + attackby(obj/item/weapon/W as obj, mob/user as mob) if(crit_fail) user << "\red The Bluespace generator isn't working." return + if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) + user << "\red The Bluespace interfaces of the two devices conflict and malfunction." + del(W) + return + /* //BoH+BoH=Singularity, commented out. if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) investigate_log("has become a singularity. Caused by [user.key]","singulo") user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!" @@ -56,8 +61,9 @@ log_game("[key_name(user)] detonated a bag of holding") del(src) return + */ ..() -*/ + proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index ecb20c6b41..967ce1d3ea 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -17,10 +17,10 @@ return if(src.dna) - if(src.dna.mutantrace == "lizard") + /*if(src.dna.mutantrace == "lizard") //Soghun stutterss-s-ss-sss. if(copytext(message, 1, 2) != "*") message = dd_replacetext(message, "s", stutter("ss")) - +*/ if(src.dna.mutantrace == "metroid" && prob(5)) if(copytext(message, 1, 2) != "*") if(copytext(message, 1, 2) == ";")