From fc45243f8a36fbcd8c82c8eced4da154ced17a37 Mon Sep 17 00:00:00 2001 From: Artorp Date: Sat, 21 Mar 2015 13:39:00 +0100 Subject: [PATCH] Bugfixes - Disables random events by default, requires config.txt to enable random events - Makes portable turrets respect its preset anchored value - Gives flamethrower a real category --- code/controllers/configuration.dm | 2 +- code/game/machinery/portable_turret.dm | 7 +++++-- code/modules/research/designs/autolathe_designs.dm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 0c1d00bb7e3..8d6d25c930a 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -49,7 +49,7 @@ var/list/votable_modes = list() // votable modes var/list/probabilities = list() // relative probability of each mode var/humans_need_surnames = 0 - var/allow_random_events = 1 // enables random events mid-round when set to 1 + var/allow_random_events = 0 // enables random events mid-round when set to 1 var/allow_ai = 1 // allow ai job var/hostedby = null var/respawn = 0 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 828a9f1f7e0..08d0ce9987e 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -70,8 +70,11 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) - cover = new /obj/machinery/porta_turret_cover(loc) - cover.Parent_Turret = src + if(anchored) + create_cover() + else + invisibility = 0 + update_icon() setup() /obj/machinery/porta_turret/proc/setup() diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index cd3acea26fe..aac7a1be922 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -433,7 +433,7 @@ build_type = AUTOLATHE materials = list("$metal" = 500) build_path = /obj/item/weapon/flamethrower/full - category = list("hacked", "Weapons and ammo") + category = list("hacked", "Security") /datum/design/handcuffs name = "Handcuffs"