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
@@ -17,7 +17,7 @@
break_apart()
/obj/item/device/modular_computer/proc/break_apart()
if(!(flags & NODECONSTRUCT))
if(!(flags_1 & NODECONSTRUCT_1))
physical.visible_message("\The [src] breaks apart!")
var/turf/newloc = get_turf(src)
new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
@@ -12,6 +12,9 @@
max_hardware_size = 2
w_class = WEIGHT_CLASS_NORMAL
// No running around with open laptops in hands.
flags_2 = SLOWS_WHILE_IN_HAND_2
screen_on = 0 // Starts closed
var/start_open = TRUE // unless this var is set to 1
var/icon_state_closed = "laptop-closed"
@@ -21,9 +24,6 @@
/obj/item/device/modular_computer/laptop/Initialize()
. = ..()
// No running around with open laptops in hands.
SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
if(start_open && !screen_on)
toggle_open()