Merge pull request #1875 from SkyMarshal/bugfixes

Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid (now guarantees melted helmet, no other changes.)

code/modules/assembly/assembly.dm

@@ -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

code/modules/assembly/holder.dm

@@ -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

code/modules/assembly/proximity.dm

@@ -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
 
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -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"