From e4763aa9289b49ac843764d3b3518c93f2815985 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sat, 27 Apr 2013 13:49:44 +0400 Subject: [PATCH 1/3] Fixed #2708. --- code/modules/research/designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index fa0c2b39359..b231729fa13 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -595,7 +595,7 @@ datum/design/posibrain build_type = PROTOLATHE materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100) - build_path = "/obj/item/device/posibrain" + build_path = "/obj/item/device/mmi/posibrain" /////////////////////////////////// //////////Mecha Module Disks/////// From 6bd34da085823b1f5d35f8d347344498ed7455a7 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sat, 27 Apr 2013 13:54:13 +0400 Subject: [PATCH 2/3] Fixes #2689. --- code/modules/mob/living/simple_animal/friendly/mouse.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index ff45d972013..774810be306 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -74,6 +74,9 @@ // if(!istype(V,/obj/machinery/atmoalter/siphs/fullairsiphon/air_vent)) // return + + if(src.stat != CONSCIOUS) return + var/obj/machinery/atmospherics/unary/vent_pump/vent_found var/welded = 0 for(var/obj/machinery/atmospherics/unary/vent_pump/v in range(1,src)) From b605fe84dbd218d488bce5d9d746a97bccfec94c Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sat, 27 Apr 2013 14:37:10 +0400 Subject: [PATCH 3/3] Fixed #2706. --- code/game/gamemodes/cult/runes.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index b2972d2ff2a..f8b743eb701 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -107,7 +107,7 @@ var/list/sacrificed = list() M.visible_message("\red [M] writhes in pain as the markings below him glow a bloody red.", \ "\red AAAAAAHHHH!.", \ "\red You hear an anguished scream.") - if(is_convertable_to_cult(M.mind)) + if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument ticker.mode.add_cultist(M.mind) M.mind.special_role = "Cultist" M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." @@ -370,6 +370,8 @@ var/list/sacrificed = list() break if(!ghost) return this_rune.fizzle() + if(jobban_isbanned(ghost, "cultist")) + return this_rune.fizzle() usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!") var/mob/living/carbon/human/dummy/D = new(this_rune.loc)