Replace all secondary flags with bitflags stored in the flags_2 var
This commit is contained in:
@@ -81,14 +81,14 @@
|
||||
if(T.Adjacent(user))
|
||||
for(var/B in T)
|
||||
var/atom/movable/AM = B
|
||||
if(HAS_SECONDARY_FLAG(AM, HOLOGRAM))
|
||||
if(AM.flags_2 & HOLOGRAM_2)
|
||||
continue
|
||||
. += AM
|
||||
|
||||
/datum/personal_crafting/proc/get_surroundings(mob/user)
|
||||
. = list()
|
||||
for(var/obj/item/I in get_environment(user))
|
||||
if(HAS_SECONDARY_FLAG(I, HOLOGRAM))
|
||||
if(I.flags_2 & HOLOGRAM_2)
|
||||
continue
|
||||
if(istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/S = I
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
diff a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm (rejected hunks)
|
||||
@@ -96,7 +96,7 @@
|
||||
else
|
||||
if(istype(I, /obj/item/reagent_containers))
|
||||
var/obj/item/reagent_containers/RC = I
|
||||
- if(RC.container_type & OPENCONTAINER)
|
||||
+ if(RC.container_type & OPENCONTAINER_1)
|
||||
for(var/datum/reagent/A in RC.reagents.reagent_list)
|
||||
.[A.type] += A.volume
|
||||
.[I.type] += 1
|
||||
Reference in New Issue
Block a user