shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

Browse Source 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
This commit is contained in:
kevinz000
2017-08-22 04:04:21 -07:00
committed by GitHub
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/craft.dm
+3 -3
View File
@@ -81,14 +81,14 @@
if(T.Adjacent(user))
for(var/B in T)
var/atom/movable/AM = B
if(AM.flags_2 & HOLOGRAM_2)
if(HAS_SECONDARY_FLAG(AM, HOLOGRAM))
continue
. += AM
/datum/personal_crafting/proc/get_surroundings(mob/user)
. = list()
for(var/obj/item/I in get_environment(user))
if(I.flags_2 & HOLOGRAM_2)
if(HAS_SECONDARY_FLAG(I, HOLOGRAM))
continue
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
@@ -96,7 +96,7 @@
else
if(istype(I, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RC = I
if(RC.container_type & OPENCONTAINER_1)
if(RC.container_type & OPENCONTAINER)
for(var/datum/reagent/A in RC.reagents.reagent_list)
.[A.type] += A.volume
.[I.type] += 1
code/modules/crafting/craft.dm.rej
-10
View File
@@ -1,10 +0,0 @@
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