Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid

This commit is contained in:
SkyMarshal
2012-11-04 16:14:31 -07:00
parent 1ab78f1ef9
commit 70c2fb231d
8 changed files with 297 additions and 149 deletions
+2
View File
@@ -71,6 +71,8 @@
holder.process_activation(src, 1, 0)
if(holder && (wires & WIRE_PULSE_SPECIAL))
holder.process_activation(src, 0, 1)
if(master && (wires & WIRE_PULSE))
master.receive_signal("activate")
// if(radio && (wires & WIRE_RADIO_PULSE))
//Not sure what goes here quite yet send signal?
return 1
-3
View File
@@ -231,9 +231,6 @@
if ( !(usr.stat || usr.restrained()) )
var/obj/item/device/assembly_holder/holder
if(istype(src,/obj/item/weapon/grenade/chem_grenade))
var/obj/item/weapon/grenade/chem_grenade/gren = src
holder=gren.detonator
var/obj/item/device/assembly/timer/tmr = holder.a_left
if(!istype(tmr,/obj/item/device/assembly/timer))
tmr = holder.a_right
+1 -1
View File
@@ -104,7 +104,7 @@
holder.update_icon()
if(holder && istype(holder.loc,/obj/item/weapon/grenade/chem_grenade))
var/obj/item/weapon/grenade/chem_grenade/grenade = holder.loc
grenade.primed(scanning)
grenade.c_state(scanning)
return
+1 -1
View File
@@ -749,7 +749,7 @@ datum
return
if(H.head)
if(prob(15) && !H.head.unacidable)
if(!H.head.unacidable)
del(H.head)
H.update_inv_head()
H << "\red Your helmet melts away but protects you from the acid"