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
@@ -23,6 +23,7 @@
 	armour_penetration = 1000
 	resistance_flags = INDESTRUCTIBLE
 	anchored = TRUE
+	flags_2 = SLOWS_WHILE_IN_HAND_2
 	var/team = WHITE_TEAM
 	var/reset_cooldown = 0
 	var/obj/effect/ctf/flag_reset/reset
@@ -0,0 +1,18 @@
+diff a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm	(rejected hunks)
+@@ -473,14 +473,14 @@
+ 	W.registered_name = H.real_name
+ 	W.update_label(W.registered_name, W.assignment)
+ 
+-	// The shielded hardsuit is already NODROP
+	// The shielded hardsuit is already NODROP_1
+ 	no_drops += H.get_item_by_slot(slot_gloves)
+ 	no_drops += H.get_item_by_slot(slot_shoes)
+ 	no_drops += H.get_item_by_slot(slot_w_uniform)
+ 	no_drops += H.get_item_by_slot(slot_ears)
+ 	for(var/i in no_drops)
+ 		var/obj/item/I = i
+-		I.flags |= NODROP
+		I.flags_1 |= NODROP_1
+ 
+ /datum/outfit/ctf/instagib
+ 	r_hand = /obj/item/gun/energy/laser/instakill