Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
@@ -0,0 +1,10 @@
+diff a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm	(rejected hunks)
+@@ -524,7 +524,7 @@
+ 			R.receive_pulse(power * (1 + power_transmission_bonus)/10 * freon_transmit_modifier)
+ 
+ /obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
+-	if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
+	if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
+ 		return
+ 	if(istype(W, /obj/item/scalpel/supermatter))
+ 		playsound(src, W.usesound, 100, 1)