From 11a3b7e26d54ec76ceba873f490fb42e634f866a Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 26 May 2012 02:29:52 +0000
Subject: [PATCH] Pacman generators now accept their proper mineral sheets as
 fuel

Janitor Cyborgs can no longer make nuke ops auto-lose by picking up the nuke disk.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3673 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/items/trash.dm | 2 ++
 code/modules/power/port_gen.dm   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index b4f967d7353..facac75815e 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -89,6 +89,7 @@
 				if(contents.len < capacity)	//slightly redundant, but it makes it prettier in the chatbox. -Pete
 					user << "\blue You pick up all the trash."
 					for(var/obj/item/O in get_turf(W))
+						if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
 						if(contents.len < capacity)
 							if(O.w_class <= 2)
 								contents += O;
@@ -98,6 +99,7 @@
 				else
 					user << "\blue The bag is full!"
 			else
+				if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
 				if(contents.len < capacity)
 					contents += W;
 				else
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index aba2f5f90fb..cd276ee89a5 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -292,7 +292,7 @@ display round(lastgen) and plasmatank amount
 /obj/machinery/power/port_gen/pacman/super
 	name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator"
 	icon_state = "portgen1"
-	sheet_path = "/obj/item/stack/sheet/uranium"
+	sheet_path = /obj/item/stack/sheet/uranium
 	power_gen = 15000
 	time_per_sheet = 25
 	board_path = "/obj/item/weapon/circuitboard/pacman/super"
@@ -302,7 +302,7 @@ display round(lastgen) and plasmatank amount
 /obj/machinery/power/port_gen/pacman/mrs
 	name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
 	icon_state = "portgen2"
-	sheet_path = "/obj/item/stack/sheet/diamond"
+	sheet_path = /obj/item/stack/sheet/diamond
 	power_gen = 40000
 	time_per_sheet = 30
 	board_path = "/obj/item/weapon/circuitboard/pacman/mrs"