Added chem handling and IED recipe

Uh oh

Conflicts:
	code/game/atoms.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/structures/tables_racks.dm
This commit is contained in:
Razharas
2014-01-31 02:56:27 -05:00
committed by ZomgPonies
parent 17151cd7b2
commit 5c8d9ede3b
4 changed files with 86 additions and 28 deletions
+5 -2
View File
@@ -26,6 +26,10 @@
update_icon()
return
/obj/item/weapon/melee/baton/CheckParts()
bcell = locate(/obj/item/weapon/cell) in contents
update_icon()
/obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt)
if(bcell)
if(bcell.rigged)
@@ -220,5 +224,4 @@
else if(!bcell)
icon_state = "stunprod_nocell"
else
icon_state = "stunprod"
icon_state = "stunprod"