From b0d1d47c2378dfb005348ee89c53b99dc8e879b5 Mon Sep 17 00:00:00 2001
From: SkyMarshal <skymarshal1729@gmail.com>
Date: Wed, 17 Apr 2013 22:07:41 -0700
Subject: [PATCH] Fixes lighting, backpacks getting contaminated, and bombs not
 working.

---
 code/ZAS/Plasma.dm                            |  2 +-
 code/controllers/master_controller.dm         |  4 +-
 .../objects/effects/spawners/bombspawner.dm   | 88 ++++++-------------
 code/modules/admin/admin_verbs.dm             |  1 -
 4 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm
index d7da7f53379..efd7e211748 100644
--- a/code/ZAS/Plasma.dm
+++ b/code/ZAS/Plasma.dm
@@ -44,8 +44,8 @@ obj/item/proc
 	can_contaminate()
 		//Clothing and backpacks can be contaminated.
 		if(flags & PLASMAGUARD) return 0
-		else if(istype(src,/obj/item/clothing)) return 1
 		else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :(
+		else if(istype(src,/obj/item/clothing)) return 1
 
 	contaminate()
 		//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index e018eb0eba8..25dc9804d97 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -71,7 +71,9 @@ datum/controller/game_controller/proc/setup()
 	spawn(0)
 		if(ticker)
 			ticker.pregame()
-		lighting_controller.Initialize()
+
+	lighting_controller.Initialize()
+
 
 datum/controller/game_controller/proc/setup_objects()
 	world << "\red \b Initializing objects"
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 29a652b7778..944efe32a77 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -110,15 +110,11 @@
 	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x"
 	var/btype = 0 // 0=radio, 1=prox, 2=time
-	var/btemp1 = 1500
-	var/btemp2 = 1000	// tank temperatures
 
 	timer
 		btype = 2
 
 		syndicate
-			btemp1 = 150
-			btemp2 = 20
 
 	proximity
 		btype = 1
@@ -130,75 +126,49 @@
 /obj/effect/spawner/newbomb/New()
 	..()
 
+	var/obj/item/device/transfer_valve/V = new(src.loc)
+	var/obj/item/weapon/tank/plasma/PT = new(V)
+	var/obj/item/weapon/tank/oxygen/OT = new(V)
+
+	V.tank_one = PT
+	V.tank_two = OT
+
+	PT.master = V
+	OT.master = V
+
+	PT.air_contents.temperature = PLASMA_FLASHPOINT
+	PT.air_contents.toxins = 15
+	PT.air_contents.carbon_dioxide = 33
+	PT.air_contents.update_values()
+
+	OT.air_contents.temperature = PLASMA_FLASHPOINT
+	OT.air_contents.oxygen = 48
+	OT.air_contents.update_values()
+
+	var/obj/item/device/assembly/S
+
 	switch (src.btype)
 		// radio
 		if (0)
 
-			var/obj/item/device/transfer_valve/V = new(src.loc)
-			var/obj/item/weapon/tank/plasma/PT = new(V)
-			var/obj/item/weapon/tank/oxygen/OT = new(V)
-
-			var/obj/item/device/assembly/signaler/S = new(V)
-
-			V.tank_one = PT
-			V.tank_two = OT
-			V.attached_device = S
-
-			S.holder = V
-			S.toggle_secure()
-			PT.master = V
-			OT.master = V
-
-			PT.air_contents.temperature = btemp1 + T0C
-			OT.air_contents.temperature = btemp2 + T0C
-
-			V.update_icon()
+			S = new/obj/item/device/assembly/signaler(V)
 
 		// proximity
 		if (1)
 
-			var/obj/item/device/transfer_valve/V = new(src.loc)
-			var/obj/item/weapon/tank/plasma/PT = new(V)
-			var/obj/item/weapon/tank/oxygen/OT = new(V)
-
-			var/obj/item/device/assembly/prox_sensor/P = new(V)
-
-			V.tank_one = PT
-			V.tank_two = OT
-			V.attached_device = P
-
-			P.holder = V
-			P.toggle_secure()
-			PT.master = V
-			OT.master = V
-
-
-			PT.air_contents.temperature = btemp1 + T0C
-			OT.air_contents.temperature = btemp2 + T0C
-
-			V.update_icon()
-
+			S = new/obj/item/device/assembly/prox_sensor(V)
 
 		// timer
 		if (2)
-			var/obj/item/device/transfer_valve/V = new(src.loc)
-			var/obj/item/weapon/tank/plasma/PT = new(V)
-			var/obj/item/weapon/tank/oxygen/OT = new(V)
 
-			var/obj/item/device/assembly/timer/T = new(V)
+			S = new/obj/item/device/assembly/timer(V)
 
-			V.tank_one = PT
-			V.tank_two = OT
-			V.attached_device = T
 
-			T.holder = V
-			T.toggle_secure()
-			PT.master = V
-			OT.master = V
-			T.time = 30
+	V.attached_device = S
 
-			PT.air_contents.temperature = btemp1 + T0C
-			OT.air_contents.temperature = btemp2 + T0C
+	S.holder = V
+	S.toggle_secure()
+
+	V.update_icon()
 
-			V.update_icon()
 	del(src)
\ No newline at end of file
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 7ba70df0da1..6f6abd1d977 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -120,7 +120,6 @@ var/list/admin_verbs_server = list(
 	/client/proc/check_customitem_activity
 	)
 var/list/admin_verbs_debug = list(
-	/client/proc/restart_controller,
 	/client/proc/cmd_admin_list_open_jobs,
 	/client/proc/Debug2,
 	/client/proc/kill_air,