From d1f53378921b9ea2484298961dbbb83ab577dc75 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 6 Dec 2013 15:56:15 +0100 Subject: [PATCH 1/4] Telepads can now be moved --- code/game/machinery/telepad.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/telepad.dm b/code/game/machinery/telepad.dm index bf41bbf3e91..ff725fe041c 100644 --- a/code/game/machinery/telepad.dm +++ b/code/game/machinery/telepad.dm @@ -21,7 +21,6 @@ /obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - anchored = 0 playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 From 9af296d228a659ea7366ee5461ea9205696c0b33 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 6 Dec 2013 16:20:51 +0100 Subject: [PATCH 2/4] False alarm will no longer blow lights if it choses the undead event --- code/modules/events/sayuevents/undead.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/events/sayuevents/undead.dm b/code/modules/events/sayuevents/undead.dm index a9fc2ff64eb..efd6b2ab18f 100644 --- a/code/modules/events/sayuevents/undead.dm +++ b/code/modules/events/sayuevents/undead.dm @@ -3,12 +3,11 @@ startWhen = 2 announceWhen = 3 oneShot = 1 - setup() + start() var/datum/event/electrical_storm/RS = new RS.lightsoutAmount = pick(2,2,3) RS.start() RS.kill() - start() for(var/area/A) if(A.z != 1) continue //Spook on main station only. if(A.luminosity) continue From 04b1aecc0e79fded8ec946cd10de729d161ba38b Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 6 Dec 2013 16:26:05 +0100 Subject: [PATCH 3/4] Fixed false alarm message for brand_intelligence event --- code/modules/events/tgevents/brand_intelligence.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/events/tgevents/brand_intelligence.dm b/code/modules/events/tgevents/brand_intelligence.dm index 3ea5d415d85..b88c07b7be3 100644 --- a/code/modules/events/tgevents/brand_intelligence.dm +++ b/code/modules/events/tgevents/brand_intelligence.dm @@ -10,8 +10,7 @@ /datum/event/brand_intelligence/announce() command_alert("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert") - -/datum/event/brand_intelligence/start() +/datum/event/brand_intelligence/setup() for(var/obj/machinery/vending/V in machines) if(V.z != 1) continue vendingMachines.Add(V) @@ -22,6 +21,8 @@ originMachine = pick(vendingMachines) vendingMachines.Remove(originMachine) + +/datum/event/brand_intelligence/start() originMachine.shut_up = 0 originMachine.shoot_inventory = 1 From 927f832b99cf7d2c486a3651d8b043b4ff0b42b2 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 6 Dec 2013 17:04:25 +0100 Subject: [PATCH 4/4] Fixed false alarm message for infestation event --- code/modules/events/infestation.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 0c128914bbe..068b9045cdf 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -20,12 +20,13 @@ var/locstring var/vermin var/vermstring - -/datum/event/infestation/start() - - location = rand(0,9) var/list/turf/simulated/floor/turfs = list() var/spawn_area_type + var/list/spawn_types = list() + var/max_number + +/datum/event/infestation/setup() + location = rand(0,9) switch(location) if(LOC_KITCHEN) spawn_area_type = /area/crew_quarters/kitchen @@ -69,8 +70,6 @@ if(!F.contents.len) turfs += F - var/list/spawn_types = list() - var/max_number vermin = rand(0,2) switch(vermin) if(VERM_MICE) @@ -85,6 +84,9 @@ spawn_types = list(/obj/effect/spider/spiderling) vermstring = "spiders" + + +/datum/event/infestation/start() spawn(0) var/num = rand(2,max_number) while(turfs.len > 0 && num > 0)