Replace all secondary flags with bitflags stored in the flags_2 var

This commit is contained in:
CitadelStationBot
2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
@@ -96,7 +96,7 @@
icon_state = "minigun_spin"
item_state = "minigun"
origin_tech = "combat=6;powerstorage=5;magnets=4"
flags = CONDUCT
flags_1 = CONDUCT_1
slowdown = 1
slot_flags = null
w_class = WEIGHT_CLASS_HUGE
@@ -108,16 +108,15 @@
fire_sound = 'sound/weapons/laser.ogg'
mag_type = /obj/item/ammo_box/magazine/internal/minigun
casing_ejector = 0
flags_2 = SLOWS_WHILE_IN_HAND_2
var/obj/item/weapon/minigunpack/ammo_pack
/obj/item/weapon/gun/ballistic/minigun/Initialize()
SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
if(istype(loc, /obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
ammo_pack = loc
else
return INITIALIZE_HINT_QDEL //No pack, no gun
return ..()
/obj/item/weapon/gun/ballistic/minigun/attack_self(mob/living/user)
@@ -261,7 +261,7 @@
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM
force = 10
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
sawn_desc = "Omar's coming!"
@@ -5,7 +5,7 @@
item_state = "shotgun"
w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BACK
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot
@@ -143,7 +143,7 @@
icon_state = "arcane_barrage"
item_state = "arcane_barrage"
flags = DROPDEL
flags_1 = DROPDEL_1
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage