From eef12bf2520cc18bc49da7c8896ed44c3e9efef3 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sun, 21 Jul 2013 15:03:49 +0100 Subject: [PATCH 1/4] Fixes #3324. Signed-off-by: Mloc-Argent --- code/game/mecha/equipment/tools/tools.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 81243486139..9ff9c68a5c3 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -20,6 +20,8 @@ action(atom/target) if(!action_checks(target)) return if(!cargo_holder) return + if(istype(target, /obj/structure/stool)) return + if(istype(target,/obj)) var/obj/O = target if(!O.anchored) From e4b67a346652ba181797cb98f2bf8d4fb0921519 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sun, 21 Jul 2013 16:55:30 +0100 Subject: [PATCH 2/4] Fixes #3104. Signed-off-by: Mloc-Argent --- code/modules/events/prison_break.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 6f13e84fe82..37a457076a6 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -10,6 +10,9 @@ announceWhen = rand(50, 60) releaseWhen = rand(20, 30) + src.startWhen = src.releaseWhen-1 + src.endWhen = src.releaseWhen+1 + /datum/event/prison_break/announce() if(prisonAreas && prisonAreas.len > 0) From c135d19b66696096f6f462fe611f696c6b45b1ec Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sun, 21 Jul 2013 17:05:10 +0100 Subject: [PATCH 3/4] Partial fix for #2284. Signed-off-by: Mloc-Argent --- code/game/gamemodes/changeling/changeling_powers.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 93d54a56550..29dcc13a03f 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -186,6 +186,7 @@ changeling.geneticdamage = 30 src.dna = chosen_dna src.real_name = chosen_dna.real_name + src.flavor_text = "" updateappearance(src, src.dna.uni_identity) domutcheck(src, null) From f0e0951c1cc94ed220f0ff169da9e9e30f3ff043 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 22 Jul 2013 00:18:24 +0100 Subject: [PATCH 4/4] Fixes #3230. Signed-off-by: Mloc-Argent --- code/modules/admin/verbs/cinematic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index d7b572e2849..863efb6bc9f 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -3,6 +3,7 @@ set category = "Fun" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. set hidden = 1 + if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return if(!ticker) return switch(cinematic) if("explosion")