MergeConflict fixes

Fluffy-Frontier · Apr 15, 2024 · 3db89d4 · 3db89d4
1 parent c0e7195
commit 3db89d4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
@@ -2,22 +2,6 @@
 
 
 #define EMAGGED (1<<0)
-<<<<<<< HEAD
-#define IN_USE (1<<1) // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
-#define CAN_BE_HIT (1<<2) //can this be bludgeoned by items?
-#define DANGEROUS_POSSESSION (1<<3) //Admin possession yes/no
-#define UNIQUE_RENAME (1<<4) // can you customize the description/name of the thing?
-#define BLOCK_Z_OUT_DOWN (1<<5)  // Should this object block z falling from loc?
-#define BLOCK_Z_OUT_UP (1<<6) // Should this object block z uprise from loc?
-#define BLOCK_Z_IN_DOWN (1<<7) // Should this object block z falling from above?
-#define BLOCK_Z_IN_UP (1<<8) // Should this object block z uprise from below?
-#define BLOCKS_CONSTRUCTION (1<<9) //! Does this object prevent things from being built on it?
-#define BLOCKS_CONSTRUCTION_DIR (1<<10) //! Does this object prevent same-direction things from being built on it?
-#define IGNORE_DENSITY (1<<11) //! Can we ignore density when building on this object? (for example, directional windows and grilles)
-#define INFINITE_RESKIN (1<<12) // We can reskin this item infinitely
-#define CONDUCTS_ELECTRICITY (1<<13) //! Can this object conduct electricity?
-#define NO_DECONSTRUCTION (1<<14) //! Atoms don't spawn anything when deconstructed. They just vanish
-=======
 #define CAN_BE_HIT (1<<1) //can this be bludgeoned by items?
 #define DANGEROUS_POSSESSION (1<<2) //Admin possession yes/no
 #define UNIQUE_RENAME (1<<3) // can you customize the description/name of the thing?
@@ -31,7 +15,6 @@
 #define INFINITE_RESKIN (1<<11) // We can reskin this item infinitely
 #define CONDUCTS_ELECTRICITY (1<<12) //! Can this object conduct electricity?
 #define NO_DEBRIS_AFTER_DECONSTRUCTION (1<<13) //! Atoms don't spawn anything when deconstructed. They just vanish
->>>>>>> 9d06343b826 ([MIRROR] Removes unused code for HTML UIs (#1932))
 
 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
 

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -292,15 +292,9 @@ DEFINE_BITFIELD(obj_flags, list(
 	"BLOCKS_CONSTRUCTION" = BLOCKS_CONSTRUCTION,
 	"BLOCKS_CONSTRUCTION_DIR" = BLOCKS_CONSTRUCTION_DIR,
 	"IGNORE_DENSITY" = IGNORE_DENSITY,
-<<<<<<< HEAD
-	"IN_USE" = IN_USE,
-	"NO_DECONSTRUCTION" = NO_DECONSTRUCTION,
-	"UNIQUE_RENAME" = UNIQUE_RENAME,
-=======
 	"INFINITE_RESKIN" = INFINITE_RESKIN,
 	"CONDUCTS_ELECTRICITY" = CONDUCTS_ELECTRICITY,
 	"NO_DEBRIS_AFTER_DECONSTRUCTION" = NO_DEBRIS_AFTER_DECONSTRUCTION,
->>>>>>> 9d06343b826 ([MIRROR] Removes unused code for HTML UIs (#1932))
 ))
 
 DEFINE_BITFIELD(pass_flags, list(