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
This commit is contained in:
johnsonmt88@gmail.com
2012-05-26 02:29:52 +00:00
parent 2fe93e3e25
commit 11a3b7e26d
2 changed files with 4 additions and 2 deletions
+2
View File
@@ -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