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
@@ -316,7 +316,7 @@
// called when pipe is cut with welder
/obj/structure/disposalpipe/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
if(!(flags_1 & NODECONSTRUCT_1))
if(disassembled)
if(stored)
var/turf/T = loc
+2 -2
View File
@@ -95,7 +95,7 @@
return
if(user.a_intent != INTENT_HARM)
if(!user.drop_item() || (I.flags & ABSTRACT))
if(!user.drop_item() || (I.flags_1 & ABSTRACT_1))
return
place_item_in_disposal(I, user)
update_icon()
@@ -236,7 +236,7 @@
/obj/machinery/disposal/deconstruct(disassembled = TRUE)
var/turf/T = loc
if(!(flags & NODECONSTRUCT))
if(!(flags_1 & NODECONSTRUCT_1))
if(stored)
stored.forceMove(T)
src.transfer_fingerprints_to(stored)
+1 -1
View File
@@ -146,7 +146,7 @@
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
/obj/item/device/destTagger/proc/openwindow(mob/user)