From 37f972dc6ce6b531f347a9704e85bd8593e69f37 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:17:36 -0500 Subject: [PATCH] Update obj_flags.dm --- code/__DEFINES/obj_flags.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index c637e9c14c..f8287cf34e 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -19,8 +19,6 @@ #define IN_INVENTORY (1<<1) //is this item equipped into an inventory slot or hand of a mob? used for tooltips #define FORCE_STRING_OVERRIDE (1<<2) // used for tooltips #define NEEDS_PERMIT (1<<3) //Used by security bots to determine if this item is safe for public use. -<<<<<<< HEAD -======= #define SLOWS_WHILE_IN_HAND (1<<4) #define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. @@ -32,4 +30,3 @@ #define MASKINTERNALS (1<<3) // mask allows internals #define NOSLIP (1<<4) //prevents from slipping on wet floors, in space etc #define THICKMATERIAL (1<<5) //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. ->>>>>>> ccf8fc5... Kills off three more flags from flags_2 (#37529)