diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 657a913e73a..987be984375 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -27,7 +27,7 @@ Contains helper procs for airflow, handled in /connection_group. /mob/living/carbon/human/airflow_stun() if(shoes) - if(shoes.item_flags & NOSLIP) return 0 + if(shoes.item_flags & ITEM_FLAG_NO_SLIP) return 0 ..() /atom/movable/proc/check_airflow_movable(n) @@ -74,7 +74,7 @@ Contains helper procs for airflow, handled in /connection_group. if(buckled_to) return 0 var/obj/item/shoes = get_equipped_item(slot_shoes) - if(istype(shoes) && (shoes.item_flags & NOSLIP)) + if(istype(shoes) && (shoes.item_flags & ITEM_FLAG_NO_SLIP)) return 0 return 1 diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 7a7b2fa5cc9..e55949a4f87 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -41,7 +41,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') /obj/var/contaminated = 0 /obj/item/proc/can_contaminate() - if(flags & PHORONGUARD) + if(item_flags & ITEM_FLAG_PHORON_GUARD) return FALSE return TRUE @@ -99,15 +99,15 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/burn_eyes = 1 //Check for protective glasses - if(glasses && (glasses.body_parts_covered & EYES) && (glasses.item_flags & AIRTIGHT)) + if(glasses && (glasses.body_parts_covered & EYES) && (glasses.item_flags & ITEM_FLAG_AIRTIGHT)) burn_eyes = 0 //Check for protective maskwear - if(burn_eyes && wear_mask && (wear_mask.body_parts_covered & EYES) && (wear_mask.item_flags & AIRTIGHT)) + if(burn_eyes && wear_mask && (wear_mask.body_parts_covered & EYES) && (wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) burn_eyes = 0 //Check for protective helmets - if(burn_eyes && head && (head.body_parts_covered & EYES) && (head.item_flags & AIRTIGHT)) + if(burn_eyes && head && (head.body_parts_covered & EYES) && (head.item_flags & ITEM_FLAG_AIRTIGHT)) burn_eyes = 0 //If we still need to, burn their eyes @@ -141,7 +141,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') //Checks if the head is adequately sealed. if(head) if(vsc.plc.PHORONGUARD_ONLY) - if(head.flags & PHORONGUARD) + if(head.item_flags & ITEM_FLAG_PHORON_GUARD) return 1 else if(head.body_parts_covered & EYES) return 1 @@ -153,7 +153,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') for(var/obj/item/protection in list(wear_suit, gloves, shoes)) if(!protection) continue - if(vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD)) + if(vsc.plc.PHORONGUARD_ONLY && !(protection.item_flags & ITEM_FLAG_PHORON_GUARD)) return 0 coverage |= protection.body_parts_covered diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm index a41ccdd946f..a1b9a03c4d2 100644 --- a/code/__defines/flags.dm +++ b/code/__defines/flags.dm @@ -1,7 +1,3 @@ -// Movable flags. -#define MOVABLE_FLAG_EFFECTMOVE 1 //Is this an effect that should move? -#define MOVABLE_FLAG_DEL_SHUTTLE 2 //Shuttle transition will delete this. - var/global/list/bitflags = list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768) #define TURF_IS_MIMICING(T) (isturf(T) && (T:z_flags & ZM_MIMIC_BELOW)) @@ -27,3 +23,69 @@ var/list/mimic_defines = list( "ZM_MIMIC_NO_AO", "ZM_NO_OCCLUDE" ) + +// Flags bitmask + +/// If a dense atom (potentially) only blocks movements from a given direction, i.e. window panes +#define ATOM_FLAG_CHECKS_BORDER FLAG(1) +/// Used for atoms if they don't want to get a blood overlay. +#define ATOM_FLAG_NO_BLOOD FLAG(2) +/// Reagents do not react in this containers +#define ATOM_FLAG_NO_REACT FLAG(3) +/// Is an open container for chemistry purposes +#define ATOM_FLAG_OPEN_CONTAINER FLAG(4) +/// Reagent container that can pour its contents with a lid on. only used for syrup bottles for now +#define ATOM_FLAG_POUR_CONTAINER FLAG(5) +/// Should we use the initial icon for display? Mostly used by overlay only objects +#define ATOM_FLAG_HTML_USE_INITIAL_ICON FLAG(6) + +// Movable flags. + +/// Does this object require proximity checking in Enter()? +#define MOVABLE_FLAG_PROXMOVE FLAG(1) +///Is this an effect that should move? +#define MOVABLE_FLAG_EFFECTMOVE FLAG(2) +///Shuttle transition will delete this. +#define MOVABLE_FLAG_DEL_SHUTTLE FLAG(3) + +// Obj flags + +/// Can this object be rotated? +#define OBJ_FLAG_ROTATABLE FLAG(0) +/// This object can be rotated even while anchored +#define OBJ_FLAG_ROTATABLE_ANCHORED FLAG(1) +/// Can this take a signaler? only in use for machinery +#define OBJ_FLAG_SIGNALER FLAG(2) +/// Will prevent mobs from falling +#define OBJ_FLAG_NOFALL FLAG(3) +/// Object moves with shuttle transition even if turf below is a background turf. +#define OBJ_FLAG_MOVES_UNSUPPORTED FLAG(4) +#define OBJ_FLAG_CONDUCTABLE FLAG(5) + +// Item flags +/// When an item has this it produces no "X has been hit by Y with Z" message with the default handler. +#define ITEM_FLAG_NO_BLUDGEON FLAG(0) +/// Does not get contaminated by phoron. +#define ITEM_FLAG_PHORON_GUARD FLAG(1) +/// Prevents syringes, parapens and hyposprays if equiped to slot_suit or slot_head. +#define ITEM_FLAG_THICK_MATERIAL FLAG(2) +/// Functions with internals +#define ITEM_FLAG_AIRTIGHT FLAG(3) +///Prevents from slipping on wet floors, in space, etc. +#define ITEM_FLAG_NO_SLIP FLAG(4) +/// Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) +#define ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT FLAG(5) +/// At the moment, masks with this flag will not prevent eating even if they are covering your face. +#define ITEM_FLAG_FLEXIBLE_MATERIAL FLAG(6) +/// Allows syringes and hyposprays to inject, even if the material is thick +#define ITEM_FLAG_INJECTION_PORT FLAG(7) +/// When applied to footwear, this makes it so that they don't trigger things like landmines and mouse traps +#define ITEM_FLAG_LIGHT_STEP FLAG(8) +/// whether wearing this item will protect you from loud noises such as flashbangs | this only works for ear slots or the head slot +#define ITEM_FLAG_SOUND_PROTECTION FLAG(9) +/// won't block flavourtext when worn on equipment slot +#define ITEM_FLAG_SHOW_FLAVOR_TEXT FLAG(10) +/// Uses the special held maptext system, which sets a specific maptext if the item is in possession of a mob. +#define ITEM_FLAG_HELD_MAP_TEXT FLAG(11) +/// Cannot be moved from its current inventory slot. Mostly for augments, modules, and other "attached" items. +#define ITEM_FLAG_NO_MOVE FLAG(12) diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index 66cdff02d72..ce3a5323248 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -21,31 +21,6 @@ #define SLOT_WRISTS BITFLAG(15) #define SLOT_S_STORE BITFLAG(16) -// Flags bitmasks. -#define NOBLUDGEON 0x1 // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. -#define CONDUCT 0x2 // Conducts electricity. (metal etc.) -#define ON_BORDER 0x4 // Item has priority to check when entering or leaving. -#define NOBLOODY 0x8 // Used for items if they don't want to get a blood overlay. -#define OPENCONTAINER 0x10 // Is an open container for chemistry purposes. -#define PHORONGUARD 0x20 // Does not get contaminated by phoron. -#define NOREACT 0x40 // Reagents don't react inside this container. -#define PROXMOVE 0x80 // Does this object require proximity checking in Enter()? -#define HELDMAPTEXT 0x100 // Uses the special held maptext system, which sets a specific maptext if the item is in possession of a mob. -#define NOMOVE 0x200 // Cannot be moved from its current inventory slot. Mostly for augments, modules, and other "attached" items. -#define HTML_USE_INITAL_ICON 0x400 // Should we use the initial icon for display? Mostly used by overlay only objects -#define POURCONTAINER 0x800 // reagent container that can pour its contents with a lid on. only used for syrup bottles for now - -//Flags for items (equipment) -#define THICKMATERIAL BITFLAG(0) // Prevents syringes, parapens and hyposprays if equiped to slot_suit or slot_head. -#define AIRTIGHT BITFLAG(1) // Functions with internals. -#define NOSLIP BITFLAG(2) // Prevents from slipping on wet floors, in space, etc. -#define BLOCK_GAS_SMOKE_EFFECT BITFLAG(3) // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) -#define FLEXIBLEMATERIAL BITFLAG(4) // At the moment, masks with this flag will not prevent eating even if they are covering your face. -#define SOUNDPROTECTION BITFLAG(5) // whether wearing this item will protect you from loud noises such as flashbangs | this only works for ear slots or the head slot -#define LIGHTSTEP BITFLAG(6) // When applied to footwear, this makes it so that they don't trigger things like landmines and mouse traps -#define INJECTIONPORT BITFLAG(7) // Allows syringes and hyposprays to inject, even if the material is thick -#define SHOWFLAVORTEXT BITFLAG(8) // won't block flavourtext when worn on equipment slot - // Flags for pass_flags. #define PASSTABLE 0x1 #define PASSGLASS 0x2 diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index e6aff764d8a..bfd23621af2 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -142,13 +142,13 @@ #define DEFAULT_JOB_TYPE /datum/job/assistant //Area flags, possibly more to come -#define RAD_SHIELDED BITFLAG(1) //shielded from radiation, clearly -#define SPAWN_ROOF BITFLAG(2) // if we should attempt to spawn a roof above us. -#define HIDE_FROM_HOLOMAP BITFLAG(3) // if we shouldn't be drawn on station holomaps -#define FIRING_RANGE BITFLAG(4) -#define NO_CREW_EXPECTED BITFLAG(5) // Areas where crew is not expected to ever be. Used to tell antag bases and such from crew-accessible areas on centcom level. -#define PRISON BITFLAG(6) // Marks prison area for purposes of checking if brigged/imprisoned -#define NO_GHOST_TELEPORT_ACCESS BITFLAG(7) // Marks whether ghosts should not have teleport access to this area +#define AREA_FLAG_RAD_SHIELDED BITFLAG(1) //shielded from radiation, clearly +#define AREA_FLAG_SPAWN_ROOF BITFLAG(2) // if we should attempt to spawn a roof above us. +#define AREA_FLAG_HIDE_FROM_HOLOMAP BITFLAG(3) // if we shouldn't be drawn on station holomaps +#define AREA_FLAG_FIRING_RANGE BITFLAG(4) +#define AREA_FLAG_NO_CREW_EXPECTED BITFLAG(5) // Areas where crew is not expected to ever be. Used to tell antag bases and such from crew-accessible areas on centcom level. +#define AREA_FLAG_PRISON BITFLAG(6) // Marks prison area for purposes of checking if brigged/imprisoned +#define AREA_FLAG_NO_GHOST_TELEPORT_ACCESS BITFLAG(7) // Marks whether ghosts should not have teleport access to this area // Convoluted setup so defines can be supplied by Bay12 main server compile script. // Should still work fine for people jamming the icons into their repo. diff --git a/code/__defines/obj.dm b/code/__defines/obj.dm index 8128c6ad2e5..15be321838c 100644 --- a/code/__defines/obj.dm +++ b/code/__defines/obj.dm @@ -1,9 +1,3 @@ -#define OBJ_FLAG_ROTATABLE (1<<1) // Can this object be rotated? -#define OBJ_FLAG_ROTATABLE_ANCHORED (1<<2) // This object can be rotated even while anchored -#define OBJ_FLAG_SIGNALER (1<<3) // Can this take a signaler? only in use for machinery -#define OBJ_FLAG_NOFALL (1<<4) // Will prevent mobs from falling -#define OBJ_FLAG_MOVES_UNSUPPORTED (1<<5) // Object moves with shuttle transition even if turf below is a background turf. - /obj/proc/issurgerycompatible() // set to false for things that are too unwieldy for surgery return TRUE diff --git a/code/_helpers/icon_smoothing.dm b/code/_helpers/icon_smoothing.dm index 763a693d693..40f6e798f31 100644 --- a/code/_helpers/icon_smoothing.dm +++ b/code/_helpers/icon_smoothing.dm @@ -189,7 +189,7 @@ return if(QDELETED(A)) return - A.flags |= HTML_USE_INITAL_ICON + A.atom_flags |= ATOM_FLAG_HTML_USE_INITIAL_ICON if((A.smoothing_flags & SMOOTH_TRUE) || (A.smoothing_flags & SMOOTH_MORE)) var/adjacencies = A.calculate_adjacencies() diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index 47b17b27ae2..4caf807282e 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -1146,7 +1146,7 @@ lighting determines lighting capturing (optional), suppress_errors suppreses err if (isnull(icon_state)) icon_state = thing.icon_state //Despite casting to atom, this code path supports mutable appearances, so let's be nice to them - if(isnull(icon_state) || (isatom(thing) && thing.flags & HTML_USE_INITAL_ICON)) + if(isnull(icon_state) || (isatom(thing) && thing.atom_flags & ATOM_FLAG_HTML_USE_INITIAL_ICON)) icon_state = initial(thing.icon_state) if (isnull(dir)) dir = initial(thing.dir) diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index d5541a88250..692dc5ead1b 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -116,7 +116,7 @@ Quick adjacency (to turf): /* This checks if you there is uninterrupted airspace between that turf and this one. - This is defined as any dense ON_BORDER object, or any dense object without throwpass. + This is defined as any dense ATOM_FLAG_CHECKS_BORDER object, or any dense object without throwpass. The border_only flag allows you to not objects (for source and destination squares) */ /turf/proc/ClickCross(var/target_dir, var/border_only, var/target_atom = null) @@ -124,7 +124,7 @@ Quick adjacency (to turf): if(!O.density || O == target_atom || O.throwpass) continue // throwpass is used for anything you can click through - if(O.flags & ON_BORDER) // windows have throwpass but are on border, check them first + if(O.atom_flags & ATOM_FLAG_CHECKS_BORDER) // windows have throwpass but are on border, check them first if(O.dir & target_dir || O.dir & (O.dir - 1)) // full tile windows are just diagonals mechanically if(istype(target_atom, /obj/structure/window)) var/obj/structure/window/W = target_atom diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index ff31ecc9d9a..6bfa260ec98 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -345,7 +345,7 @@ var/dy = A.y - y var/direction - if (loc == A.loc && A.flags & ON_BORDER) + if (loc == A.loc && A.atom_flags & ATOM_FLAG_CHECKS_BORDER) direction = A.dir else if (!dx && !dy) return diff --git a/code/_onclick/hud/screen_object_types/internals.dm b/code/_onclick/hud/screen_object_types/internals.dm index 79cdf17ce99..82166f150b8 100644 --- a/code/_onclick/hud/screen_object_types/internals.dm +++ b/code/_onclick/hud/screen_object_types/internals.dm @@ -149,8 +149,8 @@ user.internal = null /obj/screen/internals/proc/has_internals_mask(var/mob/living/carbon/human/user) - if(user.wear_mask && HAS_FLAG(user.wear_mask.item_flags, AIRTIGHT)) + if(user.wear_mask && HAS_FLAG(user.wear_mask.item_flags, ITEM_FLAG_AIRTIGHT)) return TRUE - if(user.head && HAS_FLAG(user.head.item_flags, AIRTIGHT)) + if(user.head && HAS_FLAG(user.head.item_flags, ITEM_FLAG_AIRTIGHT)) return TRUE return FALSE diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index b12f32ab3ba..c2ebe997ed4 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -33,7 +33,7 @@ avoid code duplication. This includes items that may sometimes act as a standard return /atom/movable/attackby(obj/item/W, mob/user) - if(!(W.flags & NOBLUDGEON)) + if(!(W.item_flags & ITEM_FLAG_NO_BLUDGEON)) visible_message("[src] has been hit by [user] with [W].") /mob/living/attackby(obj/item/I, mob/user) @@ -86,7 +86,7 @@ avoid code duplication. This includes items that may sometimes act as a standard //I would prefer to rename this attack_as_weapon(), but that would involve touching hundreds of files. /obj/item/proc/attack(mob/living/M, mob/living/user, var/target_zone = BP_CHEST) - if(flags & NOBLUDGEON) + if(item_flags & ITEM_FLAG_NO_BLUDGEON) return 0 if(M == user && user.a_intent != I_HURT) diff --git a/code/controllers/subsystems/initialization/holomap.dm b/code/controllers/subsystems/initialization/holomap.dm index 7e1849e3f5b..9f6410116ef 100644 --- a/code/controllers/subsystems/initialization/holomap.dm +++ b/code/controllers/subsystems/initialization/holomap.dm @@ -63,7 +63,7 @@ SUBSYSTEM_DEF(holomap) A = T.loc Ttype = T.type - if (A.flags & HIDE_FROM_HOLOMAP) + if (A.area_flags & AREA_FLAG_HIDE_FROM_HOLOMAP) continue if (rock_tcache[Ttype]) continue diff --git a/code/controllers/subsystems/initialization/misc_late.dm b/code/controllers/subsystems/initialization/misc_late.dm index 41be824becf..18963fcd05d 100644 --- a/code/controllers/subsystems/initialization/misc_late.dm +++ b/code/controllers/subsystems/initialization/misc_late.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(misc_late) /datum/controller/subsystem/misc_late/Initialize(timeofday) // Setup the teleport locs. for(var/area/AR as anything in the_station_areas) - if(AR.flags & NO_GHOST_TELEPORT_ACCESS) + if(AR.area_flags & AREA_FLAG_NO_GHOST_TELEPORT_ACCESS) continue var/list/area_turfs = AR.contents if (area_turfs.len) // Check the area is mapped diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm index e3bf2835ddc..25eb32c12af 100644 --- a/code/controllers/subsystems/radiation.dm +++ b/code/controllers/subsystems/radiation.dm @@ -71,7 +71,7 @@ SUBSYSTEM_DEF(radiation) continue // Radiation is not multi-z if(source.respect_maint) var/area/A = T.loc - if(A.flags & RAD_SHIELDED) + if(A.area_flags & AREA_FLAG_RAD_SHIELDED) continue // In shielded area var/dist = get_dist(source.source_turf, T) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 8915744863f..fa57784c981 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -166,7 +166,7 @@ else for(var/atom/movable/A in destturf) if(A != teleatom && A.density && A.anchored && !istype(A, /obj/effect/portal)) - if(A.flags & ON_BORDER) + if(A.atom_flags & ATOM_FLAG_CHECKS_BORDER) if(prob(10)) impediment = A break diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 9501194e813..25b17afae4c 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -12,7 +12,7 @@ density = 0 unacidable = 1//Just to be sure. var/def_zone - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE pass_flags = PASSTABLE | PASSRAILING /var/list/acting_rank_prefixes = list("acting", "temporary", "interim", "provisional") @@ -47,7 +47,7 @@ throwforce = 0.0 throw_speed = 1 throw_range = 20 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE drop_sound = 'sound/items/drop/rubber.ogg' pickup_sound = 'sound/items/pickup/rubber.ogg' diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index de1f99cc9c5..b64a3a26e79 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -3,7 +3,7 @@ desc = "Should anything ever go wrong..." icon = 'icons/obj/radio.dmi' icon_state = "red_phone" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 3.0 throwforce = 2.0 throw_speed = 1 @@ -50,7 +50,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "cane" item_state = "stick" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 10 throwforce = 7.0 w_class = ITEMSIZE_LARGE @@ -383,7 +383,7 @@ var/selfdestruct = 0.0 var/traitor_frequency = 0.0 var/obj/item/device/radio/origradio = null - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT item_state = "radio" throwforce = 5 @@ -435,7 +435,7 @@ icon_state = "std_mod" w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE usesound = 'sound/items/Deconstruct.ogg' var/mtype = 1 // 1=electronic 2=hardware diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 78a5022d860..60544c3b735 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -9,6 +9,8 @@ /area var/global/global_uid = 0 var/uid + ///Bitflag (Any of `AREA_FLAG_*`). See `code\__defines\misc.dm`. + var/area_flags var/holomap_color // Color of this area on the holomap. Must be a hex color (as string) or null. var/fire = null var/atmosalm = 0 @@ -105,10 +107,10 @@ . = ..() /area/proc/is_prison() - return flags & PRISON + return area_flags & AREA_FLAG_PRISON /area/proc/is_no_crew_expected() - return flags & NO_CREW_EXPECTED + return area_flags & AREA_FLAG_NO_CREW_EXPECTED /area/proc/set_lightswitch(var/state) // Set lights in area. TRUE for on, FALSE for off, NULL for initial state. if(isnull(state)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 9da9b8b4567..b8802c08674 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1,7 +1,7 @@ /atom layer = 2 var/level = 2 - var/flags = 0 + var/atom_flags = 0 var/init_flags = 0 var/list/fingerprints var/list/fingerprintshidden @@ -107,15 +107,15 @@ // Convenience proc to see if a container is open for chemistry handling. // Returns true if open, false if closed. /atom/proc/is_open_container() - return flags & OPENCONTAINER + return atom_flags & ATOM_FLAG_OPEN_CONTAINER /atom/proc/is_pour_container() - return flags & POURCONTAINER + return atom_flags & ATOM_FLAG_POUR_CONTAINER /atom/proc/CheckExit() return 1 -// If you want to use this, the atom must have the PROXMOVE flag and the moving atom must also have the PROXMOVE flag currently to help with lag. -ComicIronic +// If you want to use this, the atom must have the MOVABLE_FLAG_PROXMOVE flag and the moving atom must also have the MOVABLE_FLAG_PROXMOVE flag currently to help with lag. -ComicIronic /atom/proc/HasProximity(atom/movable/AM as mob|obj) return @@ -528,7 +528,7 @@ // Returns 1 if made bloody, returns 0 otherwise. /atom/proc/add_blood(mob/living/carbon/human/M) - if(flags & NOBLOODY) + if(atom_flags & ATOM_FLAG_NO_BLOOD) return 0 if(!blood_DNA || !istype(blood_DNA, /list)) // If our list of DNA doesn't exist yet (or isn't a list), initialise it. diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 8c17173b877..1b9ff8f698d 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -2,7 +2,7 @@ name = "pinpointer" icon = 'icons/obj/device.dmi' icon_state = "pinoff" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL item_state = "electronic" diff --git a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm index 3694afa6aa4..a0852329245 100644 --- a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm +++ b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm @@ -8,7 +8,7 @@ /obj/item/clothing/shoes/combat/speed name = "boots of speed" desc = "The latest in sure footing technology." - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP siemens_coefficient = 0.6 slowdown = -1 armor = null diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index 3d61420f082..3978ee543f9 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -33,7 +33,7 @@ ) throwforce = 0 force = 0 - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON var/mob/living/carbon/human/owner var/obj/item/technomancer_core/core var/cast_methods = null // Controls how the spell is casted. diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 73ceb1fc435..3df3d59a173 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -47,7 +47,7 @@ //IPCs leak oil to_chat(src, SPAN_WARNING("[T] is not a creature you can drain useful blood from.")) return - if(T.head && (T.head.item_flags & AIRTIGHT)) + if(T.head && (T.head.item_flags & ITEM_FLAG_AIRTIGHT)) to_chat(src, SPAN_WARNING("[T]'s headgear is blocking the way to the neck.")) return var/obj/item/blocked = check_mouth_coverage() diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 0748c3c17d8..809c4166a8f 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -10,8 +10,7 @@ icon_state = "yellow" density = 1 var/health = 100.0 - flags = CONDUCT - obj_flags = OBJ_FLAG_SIGNALER + obj_flags = OBJ_FLAG_SIGNALER | OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_HUGE var/valve_open = 0 @@ -354,7 +353,7 @@ update_flag if(istype(W, /obj/item/mecha_equipment/clamp)) return if(!W.iswrench() && !is_type_in_list(W, list(/obj/item/tank, /obj/item/device/analyzer, /obj/item/modular_computer)) && !issignaler(W) && !(W.iswirecutter() && signaler)) - if(W.flags & NOBLUDGEON) + if(W.item_flags & ITEM_FLAG_NO_BLUDGEON) return TRUE visible_message(SPAN_WARNING("\The [user] hits \the [src] with \the [W]!"), SPAN_NOTICE("You hit \the [src] with \the [W].")) user.do_attack_animation(src, W) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 1bddaf2fe74..d2adf73d6dd 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -201,7 +201,7 @@ return 1 for(var/obj/O in B) - if(O.density && !istype(O, /obj/machinery/door) && !(O.flags & ON_BORDER)) + if(O.density && !istype(O, /obj/machinery/door) && !(O.atom_flags & ATOM_FLAG_CHECKS_BORDER)) return 1 return 0 diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index f2a6f12b2d1..d3542aae138 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -3,7 +3,7 @@ var/detectTime = 0 var/area/ai_monitored/area_motion = null var/alarm_delay = 100 // Don't forget, there's another 10 seconds in queueAlarm() - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE /obj/machinery/camera/internal_process() // motion camera event loop diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 6d237c00e74..47da6ca5e4d 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -11,7 +11,7 @@ maxhealth = 150 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file health = 150 visible = 0.0 - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER opacity = 0 var/obj/item/airlock_electronics/electronics = null explosion_resistance = 5 diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 864870c678e..37aac89db1e 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -15,7 +15,7 @@ var/base_state = "mflash" anchored = 1 idle_power_usage = 2 - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE var/_wifi_id var/datum/wifi/receiver/button/flasher/wifi_receiver diff --git a/code/game/machinery/floor_frames.dm b/code/game/machinery/floor_frames.dm index 3d77d73bc74..e5825a80a2c 100644 --- a/code/game/machinery/floor_frames.dm +++ b/code/game/machinery/floor_frames.dm @@ -3,7 +3,7 @@ desc = "Used for building machines." icon = 'icons/obj/monitors.dmi' icon_state = "fire_bitem" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/build_machine_type var/refund_amt = 2 var/refund_type = /obj/item/stack/material/steel diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 5e46825c576..8cc2effbea6 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -80,7 +80,7 @@ /obj/machinery/iv_drip/Crossed(var/mob/H) if(ishuman(H)) var/mob/living/carbon/human/M = H - if(M.shoes?.item_flags & LIGHTSTEP) + if(M.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return if(M.incapacitated()) return diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index a6a28bc2c7e..e5b3572f1c2 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -169,7 +169,7 @@ center = locate(x+center_x, y+center_y, z) if(center) for(var/obj/M in orange(magnetic_field, center)) - if(!M.anchored && (M.flags & CONDUCT)) + if(!M.anchored && (M.obj_flags & OBJ_FLAG_CONDUCTABLE)) step_towards(M, center) for(var/mob/living/silicon/S in orange(magnetic_field, center)) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index ce2a848e9ce..9d0aca43178 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -3,7 +3,7 @@ desc = "Used for building machines." icon = 'icons/obj/monitors.dmi' icon_state = "fire_bitem" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/build_machine_type var/refund_amt = 2 var/refund_type = /obj/item/stack/material/steel diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index d2af0b5fc84..3bfd4ab4505 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -96,7 +96,7 @@ if(perp.shoes && !perp.buckled_to)//Adding blood to shoes var/obj/item/clothing/shoes/S = perp.shoes if(istype(S)) - if(S.item_flags & LIGHTSTEP) + if(S.item_flags & ITEM_FLAG_LIGHT_STEP) return S.blood_color = basecolor S.track_footprint = max(amount, S.track_footprint) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index cd17484cea7..71de5aafe9f 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -128,11 +128,11 @@ steam.start() -- spawns the effect if (istype(M)) return 0 if (M.internal != null) - if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT)) + if(M.wear_mask && (M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) return 0 if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(H.head && (H.head.item_flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) return 0 return 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 701a0694bd1..a27350030bc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -234,7 +234,7 @@ if(armor[type]) AddComponent(/datum/component/armor, armor) break - if(flags & HELDMAPTEXT) + if(item_flags & ITEM_FLAG_HELD_MAP_TEXT) set_initial_maptext() check_maptext() @@ -520,7 +520,7 @@ /obj/item/proc/pickup(mob/user) pixel_x = 0 pixel_y = 0 - if(flags & HELDMAPTEXT) + if(item_flags & ITEM_FLAG_HELD_MAP_TEXT) addtimer(CALLBACK(src, PROC_REF(check_maptext)), 1) // invoke async does not work here do_pickup_animation(user) @@ -710,7 +710,7 @@ var/list/global/slot_flags_enumeration = list( // override for give shenanigans /obj/item/proc/on_give(var/mob/giver, var/mob/receiver) - if(flags & HELDMAPTEXT) + if(item_flags & ITEM_FLAG_HELD_MAP_TEXT) check_maptext() //This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'icon_action_button' to the icon_state of the image of the button in screen1_action.dmi @@ -784,7 +784,7 @@ var/list/global/slot_flags_enumeration = list( M.eye_blurry += rand(3,4) /obj/item/proc/protects_eyestab(var/obj/stab_item, var/stabbed = FALSE) // if stabbed is set to true if we're being stabbed and not just checking - if((item_flags & THICKMATERIAL) && (body_parts_covered & EYES)) + if((item_flags & ITEM_FLAG_THICK_MATERIAL) && (body_parts_covered & EYES)) return TRUE return FALSE @@ -1177,12 +1177,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/throw_at() ..() - if(flags & HELDMAPTEXT) + if(item_flags & ITEM_FLAG_HELD_MAP_TEXT) check_maptext() /obj/item/dropped(var/mob/user) ..() - if(flags & HELDMAPTEXT) + if(item_flags & ITEM_FLAG_HELD_MAP_TEXT) check_maptext() // used to check whether the item is capable of popping things like balloons, inflatable barriers, or cutting police tape. diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 0b40b99f732..69e16f72332 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -5,7 +5,7 @@ desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/frame/apc/attackby(obj/item/W as obj, mob/user as mob) if (W.iswrench()) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 5689618be67..92d5a363e58 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -47,7 +47,7 @@ starts_with = list(/obj/item/reagent_containers/pill/skrell_nootropic = 7) /obj/item/reagent_containers/glass/beaker/vial/random - flags = 0 + atom_flags = 0 var/list/random_reagent_list = list(list(/singleton/reagent/water = 15) = 1, list(/singleton/reagent/spacecleaner = 15) = 1) /obj/item/reagent_containers/glass/beaker/vial/random/toxin @@ -65,7 +65,7 @@ /obj/item/reagent_containers/glass/beaker/vial/random/Initialize() . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER var/list/picked_reagents = pickweight(random_reagent_list) for(var/reagent in picked_reagents) @@ -81,34 +81,34 @@ /obj/item/reagent_containers/glass/beaker/vial/venenum - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/glass/beaker/vial/venenum/Initialize() . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER reagents.add_reagent(/singleton/reagent/venenum,volume) desc = "Contains venenum." update_icon() /obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs/Initialize() . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER reagents.add_reagent(/singleton/reagent/toxin/nerveworm_eggs, 2) desc = "BIOHAZARDOUS! - Nerve Fluke eggs. Purchased from SciSupply Eridani, recently incorporated into Zeng-Hu Pharmaceuticals' Keiretsu!" update_icon() /obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs/Initialize() . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER reagents.add_reagent(/singleton/reagent/toxin/heartworm_eggs, 2) desc = "BIOHAZARDOUS! - Heart Fluke eggs. Purchased from SciSupply Eridani, recently incorporated into Zeng-Hu Pharmaceuticals' Keiretsu!" update_icon() diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index a311a9cda15..28b5792a733 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -324,7 +324,7 @@ /obj/item/shockpaddles/proc/check_contact(mob/living/carbon/human/H) if(!combat) for(var/obj/item/clothing/cloth in list(H.wear_suit, H.w_uniform)) - if((cloth.body_parts_covered & UPPER_TORSO) && (cloth.item_flags & THICKMATERIAL)) + if((cloth.body_parts_covered & UPPER_TORSO) && (cloth.item_flags & ITEM_FLAG_THICK_MATERIAL)) return FALSE return TRUE diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index a3ef48d0a76..6857219b16d 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -4,7 +4,7 @@ desc = "A pair of binoculars." icon_state = "binoculars" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index ab8c18bc0e7..7304c64812f 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -3,7 +3,7 @@ desc = "A strange device." desc_antag = "This device can let you disguise as common objects. Click on an object with this in your active hand to scan it, then activate it to use it in your hand." icon_state = "shield0" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT item_state = "electronic" throwforce = 5 diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 6ec507d6ba1..5dcf7df036b 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -4,7 +4,7 @@ desc = "Used to debug electronic equipment." icon = 'icons/obj/hacktool.dmi' icon_state = "hacktool-g" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5 w_class = ITEMSIZE_SMALL throwforce = 5 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 3b832cde59b..527fb6cc5f7 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -8,7 +8,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 4 throw_range = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) var/times_used = 0 //Number of times it's been used. diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index d2ae02f73f1..300277adb94 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -8,7 +8,7 @@ w_class = ITEMSIZE_SMALL throw_speed = 4 throw_range = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/list/storedwarrant = list() //All the warrants currently stored var/activename = null var/activecharges = null diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index 20485f9eeed..fc45e4e2b1b 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -10,7 +10,7 @@ icon_state = "flashlight" item_state = "flashlight" w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT light_color = LIGHT_COLOR_HALOGEN uv_intensity = 50 @@ -304,7 +304,7 @@ item_state = "pen" drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_EARS brightness_on = 2 w_class = ITEMSIZE_TINY @@ -315,7 +315,7 @@ desc = "A miniature lamp, that might be used by small robots." icon_state = "penlight" item_state = "" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE brightness_on = 2 efficiency_modifier = 2 w_class = ITEMSIZE_TINY @@ -375,7 +375,7 @@ desc = "Some nifty lamps drawing from internal battery sources to produce a light, though a dim one." icon_state = "headlights" item_state = "headlights" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_HEAD | SLOT_EARS brightness_on = 2 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/devices/lighting/lamp.dm b/code/game/objects/items/devices/lighting/lamp.dm index 6b8d8c3d78f..6d0537eb934 100644 --- a/code/game/objects/items/devices/lighting/lamp.dm +++ b/code/game/objects/items/devices/lighting/lamp.dm @@ -9,7 +9,7 @@ brightness_on = 4 flashlight_power = 1.0 w_class = ITEMSIZE_HUGE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE uv_intensity = 100 power_use = FALSE on = TRUE diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm index ac5e21d999d..d66aeaa5070 100644 --- a/code/game/objects/items/devices/lightmeter.dm +++ b/code/game/objects/items/devices/lightmeter.dm @@ -7,7 +7,7 @@ icon_state = "locator" // Copied from debugger.dm - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 02da6ab3201..f18ce37c793 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -44,7 +44,7 @@ icon_state = "lightreplacer" item_state = "lightreplacer" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 34443ae8362..45477ca6d5d 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -8,7 +8,7 @@ item_state = "megaphone" contained_sprite = TRUE w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/spamcheck = 0 var/emagged = 0 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 1cce5836ab9..6501f4348ce 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -12,7 +12,7 @@ item_state = "multitool" item_icons = null contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/pin_extractor.dm b/code/game/objects/items/devices/pin_extractor.dm index f59a8c2b345..47529e742c3 100644 --- a/code/game/objects/items/devices/pin_extractor.dm +++ b/code/game/objects/items/devices/pin_extractor.dm @@ -5,7 +5,7 @@ icon_state = "pin_extractor" item_state = "pin_extractor" w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE action_button_name = "Toggle extractor" var/on = 0 var/activation_sound = 'sound/effects/lighton.ogg' diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 59b09c1419d..60866c79260 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -6,7 +6,7 @@ icon_state = "powersink0" item_state = "powersink0" w_class = ITEMSIZE_LARGE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE throwforce = 5 throw_speed = 1 throw_range = 2 diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 90670f9224a..c7c7925e39d 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -3,7 +3,7 @@ desc = "Dance my monkeys! DANCE!!!" icon_state = "electropack0" item_state = "electropack" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index a4933548b60..a83af6aafe7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -202,7 +202,7 @@ desc_info = "This radio doubles as a pair of earmuffs by providing sound protection." icon_state = "earset" item_state = "earset" - item_flags = SOUNDPROTECTION + item_flags = ITEM_FLAG_SOUND_PROTECTION slot_flags = SLOT_EARS | SLOT_TWOEARS /obj/item/device/radio/headset/wrist @@ -652,7 +652,7 @@ icon = 'icons/obj/clothing/ears/earmuffs.dmi' icon_state = "earmuffs" item_state = "earmuffs" - item_flags = SOUNDPROTECTION + item_flags = ITEM_FLAG_SOUND_PROTECTION slot_flags = SLOT_EARS | SLOT_TWOEARS /obj/item/device/radio/headset/syndicate diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index b7537091b17..b09cad09c23 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -27,8 +27,8 @@ pixel_x = 8; appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall w_class = ITEMSIZE_LARGE canhear_range = 2 - flags = CONDUCT | NOBLOODY - obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED + atom_flags = ATOM_FLAG_NO_BLOOD + obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED | OBJ_FLAG_CONDUCTABLE var/number = 0 var/obj/machinery/abstract/intercom_listener/power_interface var/global/list/screen_overlays diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 79458ada231..a867003cc6a 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -42,7 +42,7 @@ var/global/list/default_interrogation_channels = list( icon = 'icons/obj/radio.dmi' icon_state = "walkietalkie" item_state = "radio" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throw_speed = 2 throw_range = 9 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 147e7ba0aaa..b48682a763a 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -12,7 +12,7 @@ BREATH ANALYZER desc = "A hand-held body scanner able to distinguish vital signs of the subject." icon_state = "health" item_state = "healthanalyzer" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL @@ -373,7 +373,7 @@ BREATH ANALYZER item_state = "analyzer" contained_sprite = TRUE w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -407,7 +407,8 @@ BREATH ANALYZER icon_state = "spectrometer" item_state = "analyzer" w_class = ITEMSIZE_SMALL - flags = CONDUCT | OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -480,7 +481,7 @@ BREATH ANALYZER icon_state = "reagent_scanner" item_state = "analyzer" w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -521,7 +522,7 @@ BREATH ANALYZER item_state = "analyzer" origin_tech = list(TECH_BIO = 1) w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE throwforce = 0 throw_speed = 3 throw_range = 7 @@ -562,7 +563,7 @@ BREATH ANALYZER name = "price scanner" desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy." icon_state = "price_scanner" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL throwforce = 0 @@ -584,7 +585,7 @@ BREATH ANALYZER icon_state = "breath_analyzer" item_state = "analyzer" w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 0 throw_speed = 3 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index eb364b76540..669ea861ba4 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -6,7 +6,7 @@ item_state = "nothing" layer = TURF_LAYER+0.2 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 35310135509..f7809efd6a6 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -10,7 +10,7 @@ slot_flags = SLOT_BACK //you can carry it on your back if you want, but it won't do anything unless attached to suit storage //copied from tank.dm - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 throwforce = 10.0 throw_speed = 1 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 39ff89a9569..59ac9c4c522 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -16,7 +16,7 @@ var/list/timestamp = list() var/can_print = TRUE var/obj/item/computer_hardware/hard_drive/portable/portable_drive - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE throwforce = 2 throw_speed = 4 throw_range = 20 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 28449123f99..0551484cbcf 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -22,7 +22,7 @@ effective or pretty fucking useless. w_class = ITEMSIZE_TINY throw_speed = 4 throw_range = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE item_state = "electronic" origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index dbaa3f7f478..386e49f5102 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -9,7 +9,7 @@ var/mob/attacher = null var/valve_open = 0 var/toggle = 1 - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index a8e62e43510..25a1830a6d6 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -358,7 +358,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin desc = "A small device used for access restricted sites in the remote corners of the Extranet." icon = 'icons/obj/radio.dmi' icon_state = "radio" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL /obj/item/device/contract_uplink/Initialize(var/mapload, var/mind) @@ -403,7 +403,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin desc_antag = "This is hidden uplink! Use it in-hand to access the uplink interface and spend telecrystals to beam in items. Make sure to do it in private, it could look suspicious!" icon = 'icons/obj/radio.dmi' icon_state = "radio" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL ///Amount of starting telecrystals. Defaults to default amount if not set. diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 2d73a6215c2..8c508e32997 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -4,7 +4,7 @@ icon_state = "voice0" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = ITEMSIZE_TINY - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/use_message = "Halt! Security!" var/spamcheck = 0 diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index eb00cebf185..814806814db 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -20,7 +20,7 @@ w_class = ITEMSIZE_SMALL matter = list(MATERIAL_GLASS = 200) recyclable = TRUE - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON var/contains = JAR_NOTHING // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling, 4 = gumballs, 5 = holder var/list/contained = list() drop_sound = 'sound/items/drop/glass.ogg' diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 6dbb4244e37..8a0aa8df538 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -22,7 +22,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list( Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets." singular_name = "metal rod" icon_state = "rods" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_NORMAL force = 9.0 throwforce = 15.0 @@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list( for(var/obj/O in user.loc) //Objects, we don't care about mobs. Turfs are checked elsewhere if(O.density) - if(!(O.flags & ON_BORDER) || O.dir == user.dir) + if(!(O.atom_flags & ATOM_FLAG_CHECKS_BORDER) || O.dir == user.dir) return var/build_stack = amount diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 3b2f2f92a46..2939ffcd04e 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -12,7 +12,7 @@ /obj/item/stack gender = PLURAL origin_tech = list(TECH_MATERIAL = 1) - flags = HELDMAPTEXT + item_flags = ITEM_FLAG_HELD_MAP_TEXT var/list/datum/stack_recipe/recipes var/singular_name var/amount = 1 diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 843c949ec17..b8652a399f3 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -9,7 +9,7 @@ icon_state = "telecrystal" w_class = ITEMSIZE_TINY max_amount = 50 - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) icon_has_variants = TRUE var/crystal_type = CRYSTAL_TYPE_TELECRYSTAL diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 5461ba4ded4..2305ad50048 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -23,6 +23,8 @@ randpixel = 7 drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' + item_flags = 0 + obj_flags = 0 /obj/item/stack/tile/New() ..() @@ -40,7 +42,6 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 origin_tech = list(TECH_BIO = 1) drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' @@ -57,7 +58,6 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' @@ -108,7 +108,6 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' @@ -177,7 +176,6 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT) @@ -200,7 +198,7 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/stack/tile/circuit_green name = "circuit tile" @@ -212,7 +210,7 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /* * Floors @@ -228,7 +226,7 @@ throwforce = 6 throw_speed = 5 throw_range = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/stack/tile/floor/full_stack/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/sticker.dm b/code/game/objects/items/sticker.dm index d030f874dc9..312b4ab19f5 100644 --- a/code/game/objects/items/sticker.dm +++ b/code/game/objects/items/sticker.dm @@ -3,7 +3,7 @@ desc = "It's a sticker." icon = 'icons/obj/sticker.dmi' icon_state = "sticker" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_TINY vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_DIR diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 07ffadae127..36dd669c9d5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -571,7 +571,7 @@ drop_sound = 'sound/items/drop/gun.ogg' pickup_sound = /singleton/sound_category/sword_pickup_sound equip_sound = /singleton/sound_category/sword_equip_sound - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_BACK force = 5 throwforce = 5 @@ -602,7 +602,7 @@ /obj/item/toy/snappop/Crossed(H as mob|obj) if((ishuman(H))) //i guess carp and shit shouldn't set them off var/mob/living/carbon/human/M = H - if(M.shoes?.item_flags & LIGHTSTEP) + if(M.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return if(M.m_intent == M_RUN) to_chat(M, SPAN_WARNING("You step on the snap pop!")) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index d40229552b8..396a736d7f4 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -12,7 +12,7 @@ AI MODULES icon_state = "std_mod" item_state = "electronic" desc = "An AI Module for transmitting encrypted instructions to the AI." - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index 8c910d7c562..e46954a868c 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -22,7 +22,7 @@ opacity = FALSE density = FALSE anchored = FALSE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 720855f81d0..7b32f923ce0 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -7,7 +7,7 @@ desc = "Extracts information on wounds." icon = 'icons/obj/device.dmi' icon_state = "autopsy" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) var/list/datum/autopsy_data_scanner/wdata = list() diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 4d91e60e4f3..7eecfa9b7dd 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -260,7 +260,7 @@ icon_state = "urn" applies_material_colour = TRUE w_class = ITEMSIZE_SMALL - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON /obj/item/material/urn/afterattack(var/obj/A, var/mob/user, var/proximity) if(!istype(A, /obj/effect/decal/cleanable/ash)) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index c486049a33d..6f322fee0be 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -32,7 +32,7 @@ /obj/item/clothing/mask/chewable/Initialize() create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 . = ..() - flags |= NOREACT // so it doesn't react until you light it + atom_flags |= ATOM_FLAG_NO_REACT // so it doesn't react until you light it if(wrapped) slot_flags = null update_icon() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index c1dffc97735..46c51a68980 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -172,7 +172,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/Initialize() . = ..() - flags |= NOREACT // so it doesn't react until you light it + atom_flags |= ATOM_FLAG_NO_REACT // so it doesn't react until you light it create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 /obj/item/clothing/mask/smokable/process() @@ -213,7 +213,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM e.start() qdel(src) return - flags &= ~NOREACT // allowing reagents to react after being lit + atom_flags &= ~ATOM_FLAG_NO_REACT // allowing reagents to react after being lit reagents.handle_reactions() icon_state = icon_on item_state = icon_on @@ -705,7 +705,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ) w_class = ITEMSIZE_TINY throwforce = 4 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") var/base_state diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 83975379ce8..f993e826728 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -12,7 +12,7 @@ item_state = "electronic" origin_tech = list(TECH_DATA = 2) w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5 throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/weapons/cloaking_device.dm b/code/game/objects/items/weapons/cloaking_device.dm index ec08f72dfde..0ac22cbb747 100644 --- a/code/game/objects/items/weapons/cloaking_device.dm +++ b/code/game/objects/items/weapons/cloaking_device.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/device.dmi' icon_state = "shield0" var/active = 0.0 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE item_state = "electronic" throwforce = 10.0 throw_speed = 2 diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index aa77fbc0d53..064c8f33076 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -246,7 +246,7 @@ icon_state = "ecartridge" matter = list(MATERIAL_STEEL = 50, MATERIAL_GLASS = 10) volume = 20 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER /obj/item/reagent_containers/ecig_cartridge/examine(mob/user) . = ..() diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 3ee5ca10537..bb314634e67 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "plastic-explosive0" item_state = "plasticx" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_SMALL origin_tech = list(TECH_ILLEGAL = 2) var/datum/wires/explosive/c4/wires = null diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 55ba7ae530f..19709eb0f04 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -5,7 +5,8 @@ icon_state = "metal_canister" item_state = "metal_canister" hitsound = 'sound/weapons/smash.ogg' - flags = CONDUCT | OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER + obj_flags = OBJ_FLAG_CONDUCTABLE throwforce = 8 w_class = ITEMSIZE_NORMAL throw_speed = 2 @@ -22,9 +23,9 @@ /obj/item/reagent_containers/extinguisher_refill/attackby(obj/item/O, mob/user) if(O.isscrewdriver()) if(is_open_container()) - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER else - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER to_chat(user, SPAN_NOTICE("Using \the [O], you [is_open_container() ? "unsecure" : "secure"] the cartridge's lid!")) return TRUE @@ -48,7 +49,7 @@ if(is_open_container()) if(LAZYLEN(reagents.reagent_volumes)) to_chat(user,"With a quick twist of the cartridge's lid, you secure the reagents inside \the [src].") - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER else to_chat(user,"You can't secure the cartridge without putting reagents in!") else @@ -78,7 +79,7 @@ /obj/item/reagent_containers/extinguisher_refill/filled/Initialize() . = ..() reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, volume) - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER /obj/item/extinguisher name = "fire extinguisher" @@ -87,7 +88,7 @@ icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE throwforce = 10 w_class = ITEMSIZE_HUGE throw_speed = 2 @@ -112,7 +113,7 @@ icon_state = "miniFE0" item_state = "miniFE" hitsound = null //it is much lighter, after all. - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER throwforce = 2 w_class = ITEMSIZE_SMALL force = 2.0 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 7b064566a38..0718c959061 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -7,7 +7,7 @@ contained_sprite = TRUE w_class = ITEMSIZE_LARGE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 3 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 33a56b8907e..43661065212 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -11,7 +11,7 @@ item_state = "grenade" throw_speed = 4 throw_range = 20 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT contained_sprite = 1 var/active = 0 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 80c147de8d7..3baf09f8d3f 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -7,7 +7,7 @@ sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/cuff.dmi' ) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 5 w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index de7d2ad9716..47bd6bcf231 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -44,7 +44,7 @@ desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" item_state = "rods" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 8 throwforce = 10 w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/weapons/ipc_scanner.dm b/code/game/objects/items/weapons/ipc_scanner.dm index 0b1d8e86736..7a9fa0ea7c6 100644 --- a/code/game/objects/items/weapons/ipc_scanner.dm +++ b/code/game/objects/items/weapons/ipc_scanner.dm @@ -5,7 +5,7 @@ icon_state = "ipc_tag_scanner" item_state = "ipc_tag_scanner" contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm index 4e12f00aa4e..2c0f06eb1dc 100644 --- a/code/game/objects/items/weapons/landmines.dm +++ b/code/game/objects/items/weapons/landmines.dm @@ -59,7 +59,7 @@ if(deployed || ignore_deployment) if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(H.shoes?.item_flags & LIGHTSTEP) + if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) ..() return if(isliving(AM)) diff --git a/code/game/objects/items/weapons/material/caltrops.dm b/code/game/objects/items/weapons/material/caltrops.dm index 2b498de89d3..adb3c6f5305 100644 --- a/code/game/objects/items/weapons/material/caltrops.dm +++ b/code/game/objects/items/weapons/material/caltrops.dm @@ -24,7 +24,7 @@ return if(H.resting) return - if(H.shoes?.item_flags & LIGHTSTEP) + if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return to_chat(H, SPAN_DANGER("You step on \the [src]!")) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 194d260729e..8f8a6eda3ce 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -7,7 +7,7 @@ contained_sprite = TRUE icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE sharp = 1 edge = TRUE var/active = 1 // For butterfly knives diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index c3adccb19d2..f9bcf7ba8ea 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -351,7 +351,7 @@ desc = "A robust tree-cutting chainsaw intended to cut down various types of invasive spaceplants that grow on the station." icon_state = "chainsaw_off" base_icon = "chainsaw_off" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 10 force_unwielded = 10 force_wielded = 20 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index d4f355c58f5..01780fb4bb9 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -6,7 +6,7 @@ sharp = 0 edge = FALSE armor_penetration = 20 - flags = NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD can_embed = 0//No embedding pls var/base_reflectchance = 40 var/base_block_chance = 25 @@ -141,7 +141,8 @@ throw_speed = 5 throw_range = 10 w_class = ITEMSIZE_HUGE - flags = CONDUCT | NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4) attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut") sharp = 1 @@ -189,7 +190,8 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - flags = CONDUCT | NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4) attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") sharp = 1 @@ -236,7 +238,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) sharp = 1 edge = TRUE @@ -402,7 +404,7 @@ throw_speed = 1 throw_range = 1 w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such. - flags = NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") var/mob/living/creator base_reflectchance = 140 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index e314c1dc624..b87c7275ce2 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -13,7 +13,7 @@ desc = "A tool used by great men to placate the frothing masses." icon_state = "chain" item_state = "chain" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 10 throwforce = 7 @@ -27,7 +27,7 @@ desc = "A deadly chainsaw in the shape of a sword." icon = 'icons/obj/weapons.dmi' icon_state = "chainswordoff" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 15 throwforce = 7 @@ -183,7 +183,7 @@ icon_state = "officersword" item_state = "officersword" contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 15 throwforce = 5 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 36fdebbdd92..b1eb43595dd 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -13,7 +13,7 @@ possible_transfer_amounts = list(10,20,30,60) volume = 60 unacidable = 0 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER fragile = 0 var/paint_reagent = null //name of the reagent responsible for colouring the paint var/paint_type = null //used for colouring detective technicolor coat and hat diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 60a33d2e9ae..5545bb2163b 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -60,7 +60,7 @@ name = "riot shield" desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon_state = "riot" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK force = 5.0 throwforce = 5.0 @@ -130,7 +130,7 @@ name = "energy combat shield" desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." icon_state = "eshield0" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 3.0 throwforce = 5.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 0076d95726c..e308b069575 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -15,7 +15,7 @@ throwforce = 0 throw_speed = 4 throw_range = 20 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/key_data var/clean_msg var/last_clean @@ -50,7 +50,7 @@ if(isliving(AM)) if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(H.shoes?.item_flags & LIGHTSTEP) + if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return var/mob/living/M = AM M.slip("the [src.name]",3) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 454daf04e05..95bc4b99681 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -275,7 +275,7 @@ desc = "A bag for carrying lots of money. It's got a big dollar sign printed on the front." icon_state = "moneybag" item_state = "moneybag" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE max_storage_space = 100 w_class = ITEMSIZE_LARGE can_hold = list(/obj/item/coin,/obj/item/spacecash) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index c3a34fa54f6..a73dca4b220 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -5,7 +5,7 @@ icon_state = "briefcase" item_state = "briefcase" contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 8.0 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 6e49dfc6f3c..491900a7428 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -304,7 +304,7 @@ var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette /obj/item/storage/box/fancy/cigarettes/Initialize() - flags |= NOREACT + atom_flags |= ATOM_FLAG_NO_REACT create_reagents(15 * storage_slots) //so people can inject cigarettes without opening a packet, now with being able to inject the whole one . = ..() diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 39215d9a64b..9a4e73c9e16 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -6,7 +6,7 @@ icon_state = "red" item_state = "red" center_of_mass = list("x" = 16,"y" = 11) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 5 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 5a95dd378bd..2dd358c129b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -28,7 +28,7 @@ item_state = "retractor" surgerysound = 'sound/items/surgery/retractor.ogg' matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) /* @@ -41,7 +41,7 @@ item_state = "hemostat" surgerysound = 'sound/items/surgery/hemostat.ogg' matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("attacked", "pinched") @@ -55,7 +55,7 @@ item_state = "cautery" surgerysound = 'sound/items/surgery/cautery.ogg' matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("burnt") @@ -70,7 +70,7 @@ surgerysound = 'sound/items/surgery/surgicaldrill.ogg' hitsound = /singleton/sound_category/drillhit_sound matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 15 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) @@ -87,7 +87,7 @@ icon_state = "scalpel" item_state = "scalpel" surgerysound = 'sound/items/surgery/scalpel.ogg' - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 10 sharp = 1 edge = TRUE @@ -145,7 +145,7 @@ item_state = "saw" surgerysound = 'sound/items/surgery/circularsaw.ogg' hitsound = 'sound/weapons/saw/circsawhit.ogg' - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 15 w_class = ITEMSIZE_NORMAL throwforce = 9 diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 7b3ae16f752..00ab46ad77e 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -106,7 +106,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "pen" item_state = "pen" - flags = HELDMAPTEXT + item_flags = ITEM_FLAG_HELD_MAP_TEXT slot_flags = SLOT_BELT | SLOT_EARS throwforce = 0 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 0b2f552ca14..80c9ee91d39 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -90,7 +90,7 @@ icon_state = "phoron" item_state = "phoron" gauge_icon = null - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = null //they have no straps! /obj/item/tank/phoron/adjust_initial_gas() @@ -119,7 +119,7 @@ desc = "Contains gaseous hydrogen. Do not inhale. Warning: extremely flammable." icon_state = "hydrogen" item_state = "hydrogen" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/tank/hydrogen/adjust_initial_gas() air_contents.adjust_gas(GAS_HYDROGEN, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)) @@ -138,7 +138,7 @@ item_state = "emergency" gauge_icon = "indicator_emergency" gauge_cap = 4 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL force = 4.0 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index d67c6814cf7..fa9e4ec1047 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -9,7 +9,7 @@ var/last_gauge_pressure var/gauge_cap = 6 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK w_class = ITEMSIZE_NORMAL @@ -135,11 +135,11 @@ mask_check = 1 if(mask_check) - if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT)) + if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) data["maskConnected"] = 1 else if(istype(location, /mob/living/carbon/human)) var/mob/living/carbon/human/H = location - if(H.head && (H.head.item_flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) data["maskConnected"] = 1 return data @@ -159,11 +159,11 @@ location.internals.icon_state = "internal0" else var/can_open_valve - if(location.wear_mask && (location.wear_mask.item_flags & AIRTIGHT)) + if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) can_open_valve = 1 else if(istype(location,/mob/living/carbon/human)) var/mob/living/carbon/human/H = location - if(H.head && (H.head.item_flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) can_open_valve = 1 if(can_open_valve) diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 00be71d4843..ef136e7a79f 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -98,9 +98,9 @@ drop_sound = null var/obj/item/stuck = null -/obj/item/ducttape/New() - ..() - flags |= NOBLUDGEON +/obj/item/ducttape/Initialize() + . = ..() + item_flags |= ITEM_FLAG_NO_BLUDGEON /obj/item/ducttape/examine(mob/user) return stuck.examine(user) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 3065d1a44c0..09c1fc958cc 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -32,7 +32,7 @@ var/frequency = 1451 var/broadcasting = null var/listening = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL item_state = "electronic" throw_speed = 4 @@ -146,7 +146,7 @@ Frequency: icon_state = "hand_tele" item_state = "electronic" throwforce = 5 - flags = HELDMAPTEXT + item_flags = ITEM_FLAG_HELD_MAP_TEXT w_class = ITEMSIZE_SMALL throw_speed = 3 throw_range = 5 @@ -266,7 +266,7 @@ Frequency: desc_antag = "Click a closet with this to install. Step into the closet and close the door to teleport to the linked closet. It has a one minute cooldown after a batch teleport." icon = 'icons/obj/modular_components.dmi' icon_state = "cpu_normal_photonic" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MAGNET = 2, TECH_BLUESPACE = 3) matter = list(DEFAULT_WALL_MATERIAL = 400) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index e78a7e062a1..93aba450b13 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -25,7 +25,7 @@ ) icon_state = "wrench" item_state = "wrench" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 8 throwforce = 7 @@ -54,7 +54,7 @@ ) icon_state = "screwdriver" item_state = "screwdriver" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_EARS force = 8 throwforce = 5 @@ -128,7 +128,7 @@ ) icon_state = "wirecutters" item_state = "wirecutters" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 6 throw_speed = 2 @@ -218,7 +218,7 @@ item_state = "welder" var/welding_state = "welding_sparks" contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT drop_sound = 'sound/items/drop/weldingtool.ogg' pickup_sound = 'sound/items/pickup/weldingtool.ogg' @@ -688,7 +688,7 @@ ) icon_state = "crowbar" item_state = "crowbar" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 8 throwforce = 7 @@ -717,7 +717,7 @@ w_class = ITEMSIZE_NORMAL force = 12 throwforce = 12 - flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you. + obj_flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you. sharp = TRUE edge = TRUE origin_tech = list(TECH_ENGINEERING = 2) @@ -752,7 +752,7 @@ ) icon_state = "pipewrench" item_state = "pipewrench" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 8 throwforce = 7 @@ -835,7 +835,7 @@ icon_state = "impact_wrench-screw" item_state = "impact_wrench" contained_sprite = TRUE - flags = HELDMAPTEXT + item_flags = ITEM_FLAG_HELD_MAP_TEXT force = 8 attack_verb = list("gored", "drilled", "screwed", "punctured") w_class = ITEMSIZE_SMALL @@ -908,7 +908,7 @@ desc = "Harvested from the finest NanoTrasen steel sheep." icon = 'icons/obj/tools.dmi' icon_state = "steel_wool" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_SMALL var/lit matter = list(MATERIAL_STEEL = 40) @@ -972,7 +972,7 @@ ) icon_state = "hammer" item_state = "hammer" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 8 throwforce = 5 diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 5c81cf403bf..386597692ff 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -125,7 +125,7 @@ /obj/item/trap/Crossed(atom/movable/AM) if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(H.shoes?.item_flags & LIGHTSTEP) + if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return if(deployed && isliving(AM)) var/mob/living/L = AM diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index 9d3896f2c33..00445fce215 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -104,7 +104,8 @@ throw_speed = 5 throw_range = 10 w_class = ITEMSIZE_TINY - flags = CONDUCT | NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD + obj_flags = OBJ_FLAG_CONDUCTABLE attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut") sharp = 1 edge = TRUE @@ -277,7 +278,7 @@ magpulse = 1 slowdown = 3 action_button_name = null - item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT|NOSLIP + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT|ITEM_FLAG_NO_SLIP canremove = FALSE /obj/item/clothing/shoes/magboots/vaurca/aug/throw_at() @@ -367,7 +368,7 @@ /obj/item/clothing/mask/gas/vaurca/tactical name = "tactical garment" desc = "A tactical mandible garment with state of the art air filtration." - item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | FLEXIBLEMATERIAL | THICKMATERIAL + item_flags = ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT | ITEM_FLAG_AIRTIGHT | ITEM_FLAG_FLEXIBLE_MATERIAL | ITEM_FLAG_THICK_MATERIAL flags_inv = HIDEEARS|HIDEEYES|HIDEFACE body_parts_covered = FACE|EYES gas_filter_strength = 3 @@ -400,7 +401,8 @@ throw_speed = 5 throw_range = 10 w_class = ITEMSIZE_LARGE - flags = CONDUCT | NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD + obj_flags = OBJ_FLAG_CONDUCTABLE attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut") sharp = 1 edge = TRUE diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index fb028b6c0f1..c7fa9210c07 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -128,7 +128,7 @@ var/obj/structure/S = O if(S.climbable) continue - if(O && O.density && !(O.flags & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check. + if(O && O.density && !(O.atom_flags & ATOM_FLAG_CHECKS_BORDER)) //ATOM_FLAG_CHECKS_BORDER structures are handled by the Adjacent() check. if(exclude_self && O == src) continue return O @@ -138,7 +138,7 @@ if (!can_climb(user)) return - user.visible_message(SPAN_WARNING("[user] starts [flags & ON_BORDER ? "leaping over" : "climbing onto"] \the [src]!")) + user.visible_message(SPAN_WARNING("[user] starts [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaping over" : "climbing onto"] \the [src]!")) LAZYADD(climbers, user) if(!do_after(user, 5 SECONDS, src, DO_DEFAULT | DO_USER_UNIQUE_ACT)) @@ -150,12 +150,12 @@ return var/turf/TT = get_turf(src) - if(flags & ON_BORDER) + if(atom_flags & ATOM_FLAG_CHECKS_BORDER) TT = get_step(get_turf(src), dir) if(user.loc == TT) TT = get_turf(src) - user.visible_message("[user] [flags & ON_BORDER ? "leaps over" : "climbs onto"] \the [src]!") + user.visible_message("[user] [atom_flags & ATOM_FLAG_CHECKS_BORDER ? "leaps over" : "climbs onto"] \the [src]!") user.forceMove(TT) LAZYREMOVE(climbers, user) diff --git a/code/game/objects/structures/barricades/_barricade.dm b/code/game/objects/structures/barricades/_barricade.dm index f85582159e3..ee8994f4e65 100644 --- a/code/game/objects/structures/barricades/_barricade.dm +++ b/code/game/objects/structures/barricades/_barricade.dm @@ -5,7 +5,7 @@ density = TRUE throwpass = TRUE //You can throw objects over this, despite its density. layer = BELOW_OBJ_LAYER - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER var/stack_type //The type of stack the barricade dropped when disassembled if any. var/stack_amount = 5 //The amount of stack dropped when disassembled at full health diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index dbbad03eb2a..bc888dbaa26 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -776,7 +776,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT /obj/item/device/cratescanner/proc/print_contents(targetname, targetcontents, targetloc) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index dc6a6268bb1..be428e4e6b3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -8,7 +8,7 @@ icon_state = "grille" density = TRUE anchored = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE explosion_resistance = 1 layer = 2.98 obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED @@ -215,7 +215,7 @@ return //window placing end - else if(!(W.flags & CONDUCT) || !shock(user, 70)) + else if(!(W.obj_flags & OBJ_FLAG_CONDUCTABLE) || !shock(user, 70)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 4393d6eb1fe..78189ee6a27 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -10,7 +10,7 @@ anchored = FALSE density = TRUE climbable = TRUE - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER build_amt = 15 slowdown = 0 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 407bbf5958c..aa5328f7f4b 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -5,7 +5,7 @@ icon_state = "mopbucket" density = 1 w_class = ITEMSIZE_NORMAL - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite var/bucketsize = 600 //about 2x the size relative to a regular bucket. diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index 761c21c8d58..a5ee93a8fa1 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -9,7 +9,7 @@ layer = OBJ_LAYER anchored = FALSE - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED build_amt = 2 @@ -300,7 +300,7 @@ return FALSE for(var/atom/A in destination_turf.contents - src) - if(A.density && !(A.flags & ON_BORDER)) + if(A.density && !(A.atom_flags & ATOM_FLAG_CHECKS_BORDER)) to_chat(user, SPAN_DANGER("You can't climb there, the way is blocked.")) return FALSE diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm index 4261f31f36d..a423001c5c9 100644 --- a/code/game/objects/structures/therapy.dm +++ b/code/game/objects/structures/therapy.dm @@ -57,7 +57,7 @@ matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50) recyclable = TRUE w_class = ITEMSIZE_TINY - flags = NOBLUDGEON + atom_flags = ITEM_FLAG_NO_BLUDGEON var/datum/weakref/thrall = null var/time_counter = 0 var/closed = FALSE diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index f7a67ca90b7..b836c658eb7 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -18,7 +18,7 @@ density = 0 dir = NORTH w_class = ITEMSIZE_NORMAL - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER var/obj/item/airlock_electronics/electronics = null @@ -271,7 +271,7 @@ if (obstacle == src) continue - if((obstacle.flags & ON_BORDER) && obstacle.dir == targetdir) + if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && obstacle.dir == targetdir) to_chat(usr, SPAN_WARNING("You can't turn the windoor assembly that way, there's already something there!")) return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e02aa9cbc0b..0507c0aded4 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -14,7 +14,7 @@ w_class = ITEMSIZE_NORMAL layer = WINDOW_PANE_LAYER anchored = TRUE - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED var/hitsound = 'sound/effects/glass_hit.ogg' var/maxhealth = 14 @@ -258,7 +258,7 @@ grab_smash_attack(G, DAMAGE_BRUTE) return - if(W.flags & NOBLUDGEON) + if(W.item_flags & ITEM_FLAG_NO_BLUDGEON) return if(W.isscrewdriver() && user.a_intent != I_HURT) @@ -538,7 +538,7 @@ icon = 'icons/obj/smooth/shuttle_window.dmi' icon_state = "shuttle_window" basestate = "window" - flags = 0 + atom_flags = 0 obj_flags = null maxhealth = 40 reinf = TRUE @@ -614,7 +614,7 @@ /obj/structure/window/full name = "window" desc = "You aren't supposed to see this." - flags = 0 + atom_flags = 0 obj_flags = null dir = 5 maxhealth = 28 // Two glass panes worth of health, since that's the minimum you need to break through to get to the other side. @@ -665,7 +665,7 @@ grab_smash_attack(G, DAMAGE_BRUTE) return - if(W.flags & NOBLUDGEON) + if(W.item_flags & ITEM_FLAG_NO_BLUDGEON) return if(W.isscrewdriver() && user.a_intent != I_HURT) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index cd6e5a93894..c1f550771b9 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -11,7 +11,7 @@ icon_state = "shuttle3" requires_power = 0 station_area = 1 - flags = SPAWN_ROOF | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_SPAWN_ROOF | AREA_FLAG_HIDE_FROM_HOLOMAP /area/supply/dock name = "Supply Shuttle" diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index ace4689fc9f..f1de8ced386 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -136,7 +136,7 @@ icon_state = "diona0" footstep_sound = /singleton/sound_category/grass_footstep initial_flooring = /singleton/flooring/diona - flags = TURF_REMOVE_SHOVEL|TURF_REMOVE_WELDER + turf_flags = TURF_REMOVE_SHOVEL|TURF_REMOVE_WELDER /turf/simulated/floor/diona/airless initial_gas = null diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index eca4f43c6ef..481eed3c7e1 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -93,7 +93,7 @@ // Hard-coding this for performance reasons. baseturf = A.base_turf || current_map.base_turf_by_z["[z]"] || /turf/space - if (A.flags & SPAWN_ROOF) + if (A.area_flags & AREA_FLAG_SPAWN_ROOF) spawn_roof() if (z_flags & ZM_MIMIC_BELOW) @@ -189,21 +189,21 @@ //First, check objects to block exit that are not on the border for(var/obj/obstacle in mover.loc) - if(!(obstacle.flags & ON_BORDER) && (mover != obstacle) && (forget != obstacle)) + if(!(obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && (mover != obstacle) && (forget != obstacle)) if(!obstacle.CheckExit(mover, src)) mover.Collide(obstacle) return 0 //Now, check objects to block exit that are on the border for(var/obj/border_obstacle in mover.loc) - if((border_obstacle.flags & ON_BORDER) && (mover != border_obstacle) && (forget != border_obstacle)) + if((border_obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && (mover != border_obstacle) && (forget != border_obstacle)) if(!border_obstacle.CheckExit(mover, src)) mover.Collide(border_obstacle) return 0 //Next, check objects to block entry that are on the border for(var/obj/border_obstacle in src) - if(border_obstacle.flags & ON_BORDER) + if(border_obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) if(!border_obstacle.CanPass(mover, mover.loc, 1, 0) && (forget != border_obstacle)) mover.Collide(border_obstacle) return 0 @@ -215,7 +215,7 @@ //Finally, check objects/mobs to block entry that are not on the border for(var/atom/movable/obstacle in src) - if(!(obstacle.flags & ON_BORDER)) + if(!(obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER)) if(!obstacle.CanPass(mover, mover.loc, 1, 0) && (forget != obstacle)) mover.Collide(obstacle) return 0 @@ -283,13 +283,13 @@ var/const/enterloopsanity = 100 ..(AM, old_loc) var/objects = 0 - if(AM && (AM.flags & PROXMOVE) && AM.simulated) + if(AM && (AM.movable_flags & MOVABLE_FLAG_PROXMOVE) && AM.simulated) for(var/atom/movable/oAM in range(1)) if(objects > enterloopsanity) break objects++ - if (oAM.simulated && (oAM.flags & PROXMOVE)) + if (oAM.simulated && (oAM.movable_flags & MOVABLE_FLAG_PROXMOVE)) AM.proximity_callback(oAM) /turf/proc/add_tracks(var/typepath, var/footprint_DNA, var/comingdir, var/goingdir, var/footprint_color="#A10808") @@ -302,7 +302,7 @@ var/const/enterloopsanity = 100 set waitfor = FALSE sleep(0) HasProximity(AM, TRUE) - if (!QDELETED(AM) && !QDELETED(src) && (AM.flags & PROXMOVE)) + if (!QDELETED(AM) && !QDELETED(src) && (AM.movable_flags & MOVABLE_FLAG_PROXMOVE)) AM.HasProximity(src, TRUE) /turf/proc/adjacent_fire_act(turf/simulated/floor/source, temperature, volume) @@ -387,7 +387,7 @@ var/const/enterloopsanity = 100 if(density) return 1 for(var/atom/A in src) - if(A.density && !(A.flags & ON_BORDER)) + if(A.density && !(A.atom_flags & ATOM_FLAG_CHECKS_BORDER)) return 1 return 0 diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index 885cdd42c8a..44d1015ca15 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -463,7 +463,7 @@ name = "bluespace technician's shoes" desc = "A pair of black shoes with extra grip. The letters 'BST' are stamped on the side." icon_state = "black" - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP canremove = 0 /obj/item/clothing/shoes/sneakers/black/bst/attack_hand() diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 27e9853a3ed..807894d01f4 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -3,7 +3,7 @@ desc = "A small electronic device that should never exist." icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL matter = list(DEFAULT_WALL_MATERIAL = 100) recyclable = TRUE diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index c009655f965..1fdfc55a7fe 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -6,7 +6,8 @@ w_class = ITEMSIZE_NORMAL throw_speed = 2 throw_range = 4 - flags = CONDUCT | PROXMOVE + obj_flags = OBJ_FLAG_CONDUCTABLE + movable_flags = MOVABLE_FLAG_PROXMOVE var/status = FALSE // FALSE - not readied // TRUE - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/tank/bombtank = null //the second part of the bomb is a phoron tank diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 3b055b468cc..e3805b3cf87 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -3,7 +3,8 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "holder" item_state = "assembly" - flags = CONDUCT | PROXMOVE + obj_flags = OBJ_FLAG_CONDUCTABLE + movable_flags = MOVABLE_FLAG_PROXMOVE throwforce = 5 w_class = ITEMSIZE_SMALL throw_speed = 3 diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 1ebfc9c17b4..60a0b1665f2 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -88,7 +88,7 @@ triggered(AM) else if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(!(H.shoes?.item_flags & LIGHTSTEP)) + if(!(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP)) triggered(H) H.visible_message(SPAN_WARNING("\The [H] accidentally steps on \the [src]."), SPAN_WARNING("You accidentally step on \the [src].")) else if(isliving(AM)) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index b0dc0106f69..ac418d29878 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -6,7 +6,7 @@ pickup_sound = 'sound/items/pickup/component.ogg' origin_tech = list(TECH_MAGNET = 1) matter = list(DEFAULT_WALL_MATERIAL = 800, MATERIAL_GLASS = 200) - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE wires = WIRE_PULSE secured = FALSE diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index e3e271a99a7..a3691a036d7 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "price_scanner" slot_flags = SLOT_BELT - item_flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_SMALL siemens_coefficient = 1 diff --git a/code/modules/clothing/ears/earmuffs.dm b/code/modules/clothing/ears/earmuffs.dm index 38962fae4e6..8f6cd399634 100644 --- a/code/modules/clothing/ears/earmuffs.dm +++ b/code/modules/clothing/ears/earmuffs.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/clothing/ears/earmuffs.dmi' icon_state = "earmuffs" item_state = "earmuffs" - item_flags = SOUNDPROTECTION + item_flags = ITEM_FLAG_SOUND_PROTECTION slot_flags = SLOT_EARS | SLOT_TWOEARS contained_sprite = TRUE var/on = FALSE diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 61f7a72ea09..9ef11ebc702 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -57,7 +57,7 @@ BLIND // can't see anything update_clothing_icon() /obj/item/clothing/glasses/protects_eyestab(var/obj/stab_item, var/stabbed = FALSE) - if(stabbed && (body_parts_covered & EYES) && !(item_flags & THICKMATERIAL) && shatter_material && prob(stab_item.force * 5)) + if(stabbed && (body_parts_covered & EYES) && !(item_flags & ITEM_FLAG_THICK_MATERIAL) && shatter_material && prob(stab_item.force * 5)) var/mob/M = loc M.visible_message(SPAN_WARNING("\The [src] [M] is wearing gets shattered!")) playsound(loc, /singleton/sound_category/glass_break_sound, 70, TRUE) @@ -118,7 +118,7 @@ BLIND // can't see anything toggleable = 1 vision_flags = SEE_TURFS see_invisible = SEE_INVISIBLE_NOLIGHTING - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT activated_color = LIGHT_COLOR_GREEN /obj/item/clothing/glasses/meson/Initialize() @@ -211,7 +211,7 @@ BLIND // can't see anything ) toggleable = 1 unacidable = 1 - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT /obj/item/clothing/glasses/science/Initialize() . = ..() @@ -255,7 +255,7 @@ BLIND // can't see anything desc = "A simple pair of safety glasses. Thinner than their goggle counterparts, for those who can't decide between safety and style." icon_state = "plaingoggles" item_state = "plaingoggles" - item_flags = AIRTIGHT|THICKMATERIAL + item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_THICK_MATERIAL unacidable = 1 /obj/item/clothing/glasses/safety/prescription @@ -499,7 +499,7 @@ BLIND // can't see anything origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) toggleable = 1 vision_flags = SEE_OBJS - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT /obj/item/clothing/glasses/material/aviator name = "material aviators" @@ -681,7 +681,7 @@ BLIND // can't see anything action_button_name = "Flip Welding Goggles" var/up = 0 - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL flash_protection = FLASH_PROTECTION_MAJOR tint = TINT_HEAVY normal_layer = GLASSES_LAYER_ALT @@ -724,7 +724,7 @@ BLIND // can't see anything icon_state = "welding-aug" item_state = "welding-aug" contained_sprite = TRUE - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL flash_protection = FLASH_PROTECTION_MAJOR tint = TINT_HEAVY canremove = FALSE @@ -867,7 +867,7 @@ BLIND // can't see anything desc = "Flash-resistant goggles with inbuilt combat and security information." icon_state = "swatgoggles" item_state = "swatgoggles" - item_flags = AIRTIGHT|THICKMATERIAL + item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_THICK_MATERIAL /obj/item/clothing/glasses/sunglasses/sechud/head name = "advanced aviators" @@ -975,7 +975,7 @@ BLIND // can't see anything vision_flags = SEE_MOBS see_invisible = SEE_INVISIBLE_NOLIGHTING flash_protection = FLASH_PROTECTION_REDUCED - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT /obj/item/clothing/glasses/thermal/emp_act(severity) if(istype(src.loc, /mob/living/carbon/human)) @@ -1010,15 +1010,14 @@ BLIND // can't see anything toggleable = 0 activation_sound = null action_button_name = null - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT /obj/item/clothing/glasses/thermal/plain/monocle name = "thermonocle" desc = "A monocle thermal." icon_state = "thermonocle" item_state = "thermonocle" - flags = null //doesn't protect eyes because it's a monocle, duh - item_flags = null + item_flags = null //doesn't protect eyes because it's a monocle, duh body_parts_covered = 0 /obj/item/clothing/glasses/thermal/plain/jensen @@ -1203,7 +1202,7 @@ BLIND // can't see anything item_state = "spiffygogs" action_button_name = "Adjust Goggles" var/up = 0 - item_flags = AIRTIGHT + item_flags = ITEM_FLAG_AIRTIGHT /obj/item/clothing/glasses/spiffygogs/attack_self() toggle() @@ -1220,14 +1219,14 @@ BLIND // can't see anything flags_inv |= HIDEEYES body_parts_covered |= EYES icon_state = initial(icon_state) - item_flags |= AIRTIGHT + item_flags |= ITEM_FLAG_AIRTIGHT to_chat(usr, "You flip \the [src] down over your eyes.") else src.up = !src.up flags_inv &= ~HIDEEYES body_parts_covered &= ~EYES icon_state = "[initial(icon_state)]up" - item_flags &= ~AIRTIGHT + item_flags &= ~ITEM_FLAG_AIRTIGHT to_chat(usr, "You push \the [src] up off your eyes.") update_clothing_icon() usr.update_action_buttons() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 8b395991115..fd64b5a3876 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,7 +1,7 @@ /obj/item/clothing/glasses/hud name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." - flags = 0 //doesn't protect eyes because it's a monocle, duh + item_flags = 0 //doesn't protect eyes because it's a monocle, duh origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 2) var/list/icon/current = list() //the current hud icons diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index b88690f0baa..ea8b993de6a 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/clothing/hats/berets.dmi' icon_state = "beret" item_state = "beret" - item_flags = SHOWFLAVORTEXT + item_flags = ITEM_FLAG_SHOW_FLAVOR_TEXT contained_sprite = TRUE siemens_coefficient = 0.9 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 6bc77f680df..f01a3275bca 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -82,7 +82,7 @@ ) icon_auto_adapt = TRUE icon_supported_species_tags = list("una", "taj") - item_flags = THICKMATERIAL | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_AIRTIGHT max_pressure_protection = FIRESUIT_MAX_PRESSURE min_pressure_protection = FIRESUIT_MIN_PRESSURE permeability_coefficient = 0 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index d1479658f88..a9b1675e6f8 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -6,7 +6,7 @@ slot_l_hand_str = "helmet", slot_r_hand_str = "helmet" ) - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL armor = list( melee = ARMOR_MELEE_KEVLAR, bullet = ARMOR_BALLISTIC_MEDIUM, diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d9b3a3decc3..ec8a31e94ae 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -244,7 +244,7 @@ name = "fez" desc = "You should wear a fez. Fezzes are cool." icon_state = "fez" - item_flags = SHOWFLAVORTEXT + item_flags = ITEM_FLAG_SHOW_FLAVOR_TEXT //end bs12 hats diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 6f97de0c957..fc8d385e448 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/clothing/hats/soft_caps.dmi' icon_state = "softcap" item_state = "softcap" - item_flags = SHOWFLAVORTEXT + item_flags = ITEM_FLAG_SHOW_FLAVOR_TEXT contained_sprite = TRUE var/flipped = FALSE siemens_coefficient = 0.9 diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index c49546f378a..c189c47cbc2 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -3,14 +3,14 @@ name = "breath mask" icon_state = "breath" item_state = "breath" - item_flags = AIRTIGHT|FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_FLEXIBLE_MATERIAL body_parts_covered = FACE w_class = ITEMSIZE_SMALL gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 down_gas_transfer_coefficient = 1 down_body_parts_covered = null - down_item_flags = FLEXIBLEMATERIAL + down_item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL adjustable = TRUE /obj/item/clothing/mask/breath/medical diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 925ff0343eb..62b4d2aabfd 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -2,7 +2,7 @@ name = "gas mask" desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air." icon_state = "gas_alt" - item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | THICKMATERIAL + item_flags = ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT | ITEM_FLAG_AIRTIGHT | ITEM_FLAG_THICK_MATERIAL flags_inv = HIDEEARS|HIDEEYES|HIDEFACE body_parts_covered = FACE|EYES w_class = ITEMSIZE_NORMAL diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 9b3546fa72b..1c1c676b0ca 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -34,7 +34,7 @@ item_state = "surgical" w_class = ITEMSIZE_SMALL body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( @@ -56,7 +56,7 @@ item_state = "cloth" w_class = ITEMSIZE_SMALL body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( @@ -73,7 +73,7 @@ item_state = "dust" w_class = ITEMSIZE_SMALL body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list( @@ -105,7 +105,7 @@ item_state = "trinary_mask" w_class = ITEMSIZE_SMALL body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL down_body_parts_covered = null adjustable = TRUE @@ -202,7 +202,7 @@ contained_sprite = TRUE icon_state = "pioneer_scarf" item_state = "pioneer_scarf" - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL w_class = ITEMSIZE_SMALL body_parts_covered = FACE diff --git a/code/modules/clothing/masks/xeno/skrell.dm b/code/modules/clothing/masks/xeno/skrell.dm index e3c258e6399..4cd9f70e52e 100644 --- a/code/modules/clothing/masks/xeno/skrell.dm +++ b/code/modules/clothing/masks/xeno/skrell.dm @@ -7,7 +7,7 @@ w_class = ITEMSIZE_SMALL contained_sprite = TRUE body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL flags_inv = HIDEFACE sprite_sheets = null diff --git a/code/modules/clothing/masks/xeno/tajara.dm b/code/modules/clothing/masks/xeno/tajara.dm index 1f13c50e8e5..e64ae7a38b0 100644 --- a/code/modules/clothing/masks/xeno/tajara.dm +++ b/code/modules/clothing/masks/xeno/tajara.dm @@ -6,6 +6,6 @@ item_state = "veil" contained_sprite = TRUE body_parts_covered = FACE - item_flags = FLEXIBLEMATERIAL + item_flags = ITEM_FLAG_FLEXIBLE_MATERIAL flags_inv = HIDEFACE sprite_sheets = null diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index 34f466f64cf..fbc9748ddd0 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -15,7 +15,7 @@ /obj/item/clothing/ring/reagent icon_state = "material" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 4) /obj/item/clothing/ring/reagent/Initialize() diff --git a/code/modules/clothing/sets/infiltrator.dm b/code/modules/clothing/sets/infiltrator.dm index 632764cb9bd..185e6a1008f 100644 --- a/code/modules/clothing/sets/infiltrator.dm +++ b/code/modules/clothing/sets/infiltrator.dm @@ -8,7 +8,7 @@ icon_supported_species_tags = list("una", "taj") contained_sprite = TRUE adjustable = FALSE - item_flags = THICKMATERIAL | INJECTIONPORT | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT flags_inv = HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES max_pressure_protection = SPACE_SUIT_MAX_PRESSURE @@ -21,7 +21,7 @@ icon_state = "uniform" item_state = "uniform" contained_sprite = TRUE - item_flags = THICKMATERIAL | INJECTIONPORT | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT armor = list( melee = ARMOR_MELEE_SMALL, bullet = ARMOR_BALLISTIC_SMALL, @@ -41,7 +41,7 @@ permeability_coefficient = 0.05 germ_level = 0 fingerprint_chance = 0 - item_flags = THICKMATERIAL | INJECTIONPORT | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT max_pressure_protection = SPACE_SUIT_MAX_PRESSURE min_pressure_protection = 0 species_restricted = null @@ -54,7 +54,7 @@ item_state = "shoes" contained_sprite = TRUE silent = TRUE - item_flags = THICKMATERIAL | INJECTIONPORT | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT max_pressure_protection = SPACE_SUIT_MAX_PRESSURE min_pressure_protection = 0 species_restricted = null diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index ff7b99bebea..e65f4cd5289 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -141,7 +141,7 @@ bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_MINOR ) - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP siemens_coefficient = 0.35 can_hold_knife = TRUE build_from_parts = TRUE diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index df2d08d91d6..e2a6a8f2885 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -9,7 +9,7 @@ species_restricted = null force = 5 overshoes = 1 - item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT var/magpulse = 0 var/icon_base = "magboots" var/slowdown_active = 3 @@ -43,7 +43,7 @@ /obj/item/clothing/shoes/magboots/attack_self(mob/user) if(magpulse) - item_flags &= ~NOSLIP + item_flags &= ~ITEM_FLAG_NO_SLIP magpulse = 0 set_slowdown() force = 3 @@ -52,7 +52,7 @@ item_state = icon_state to_chat(user, "You disable the mag-pulse traction system.") else - item_flags |= NOSLIP + item_flags |= ITEM_FLAG_NO_SLIP magpulse = 1 set_slowdown() force = 5 @@ -108,7 +108,7 @@ /obj/item/clothing/shoes/magboots/examine(mob/user) . = ..() var/state = "disabled" - if(item_flags & NOSLIP) + if(item_flags & ITEM_FLAG_NO_SLIP) state = "enabled" to_chat(user, "Its mag-pulse traction system appears to be [state].") diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 0b68eae5157..d7a9b5b9074 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -11,7 +11,7 @@ contained_sprite = TRUE icon_state = "flippers" item_state = "flippers" - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP slowdown = 1 /obj/item/clothing/shoes/footwraps @@ -61,7 +61,7 @@ icon_state = "galoshes" item_state = "galoshes" permeability_coefficient = 0.05 - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP slowdown = 1 species_restricted = null icon_auto_adapt = TRUE @@ -80,7 +80,7 @@ icon_state = "brown" item_state = "brown" contained_sprite = TRUE - item_flags = NOSLIP|LIGHTSTEP + item_flags = ITEM_FLAG_NO_SLIP|ITEM_FLAG_LIGHT_STEP slowdown = 0 origin_tech = list(TECH_ILLEGAL = 3) icon_auto_adapt = FALSE diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index 0fe9baea4f5..9770dde5160 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -89,7 +89,7 @@ item_state = "black" /obj/item/clothing/shoes/sneakers/black/noslip - item_flags = NOSLIP + item_flags = ITEM_FLAG_NO_SLIP /obj/item/clothing/shoes/sneakers/rainbow name = "rainbow shoes" diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 1553222b3e3..3fc9c3be5a4 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -670,7 +670,7 @@ if (combatType && ismob(aa)) continue - if (aa.density && NOT_FLAG(aa.flags, ON_BORDER)) + if (aa.density && NOT_FLAG(aa.atom_flags, ATOM_FLAG_CHECKS_BORDER)) to_chat(user, SPAN_WARNING("You cannot leap at a location with solid objects on it!")) return FALSE diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f61547a5e9e..a72a7f48733 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -91,7 +91,7 @@ var/offline_slowdown = 3 // If the suit is deployed and unpowered, it sets slowdown to this. var/vision_restriction = TINT_NONE var/offline_vision_restriction = TINT_HEAVY - var/airtight = 1 //If set, will adjust the AIRTIGHT flag on components. Otherwise it should leave them untouched. + var/airtight = 1 //If set, will adjust the ITEM_FLAG_AIRTIGHT flag on components. Otherwise it should leave them untouched. var/emp_protection = 0 @@ -225,7 +225,7 @@ if(airtight) piece.max_pressure_protection = initial(piece.max_pressure_protection) piece.min_pressure_protection = initial(piece.min_pressure_protection) - piece.item_flags &= ~AIRTIGHT + piece.item_flags &= ~ITEM_FLAG_AIRTIGHT update_icon(1) /obj/item/rig/proc/toggle_seals(var/mob/initiator,var/instant) @@ -381,11 +381,11 @@ if(canremove) piece.max_pressure_protection = initial(piece.max_pressure_protection) piece.min_pressure_protection = initial(piece.min_pressure_protection) - piece.item_flags &= ~AIRTIGHT + piece.item_flags &= ~ITEM_FLAG_AIRTIGHT else piece.max_pressure_protection = max_pressure_protection piece.min_pressure_protection = min_pressure_protection - piece.item_flags |= AIRTIGHT + piece.item_flags |= ITEM_FLAG_AIRTIGHT update_icon(1) /obj/item/rig/process() diff --git a/code/modules/clothing/spacesuits/rig/rig_construction.dm b/code/modules/clothing/spacesuits/rig/rig_construction.dm index 987b7024516..0c00a7e6f8b 100644 --- a/code/modules/clothing/spacesuits/rig/rig_construction.dm +++ b/code/modules/clothing/spacesuits/rig/rig_construction.dm @@ -8,10 +8,10 @@ var/obj/item/circuitboard/target_board_type = null var/obj/item/rig/rig_type = /obj/item/rig - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_POWER = 4) var/datum/construction/reversible/rig_assembly/construct - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/rig_assembly/examine(mob/user, distance) . = ..() diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index c7cd7c29802..06e9a9d7c7e 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -4,7 +4,7 @@ /obj/item/clothing/head/helmet/space/rig name = "helmet" - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES heat_protection = HEAD|FACE|EYES @@ -16,7 +16,7 @@ /obj/item/clothing/gloves/rig name = "gauntlets" - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS @@ -41,7 +41,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT|HIDETAIL - item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT slowdown = 0 //will reach 10 breach damage after 25 laser carbine blasts, 3 revolver hits, or ~1 PTR hit. Completely immune to smg or sts hits. breach_threshold = 38 @@ -83,7 +83,7 @@ body_parts_covered = HEAD|FACE|EYES heat_protection = HEAD|FACE|EYES cold_protection = HEAD|FACE|EYES - item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT /obj/item/clothing/suit/lightrig name = "suit" @@ -92,7 +92,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT /obj/item/clothing/shoes/lightrig name = "boots" @@ -100,7 +100,7 @@ cold_protection = FEET heat_protection = FEET species_restricted = null - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT gender = PLURAL /obj/item/clothing/gloves/lightrig @@ -108,6 +108,6 @@ body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT species_restricted = null gender = PLURAL diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 249e240f0f2..31fa3f0edf5 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -17,7 +17,7 @@ emp_protection = 100 slowdown = -1 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL offline_slowdown = 0 offline_vision_restriction = 0 max_pressure_protection = LIGHT_RIG_MAX_PRESSURE @@ -74,14 +74,14 @@ /obj/item/clothing/head/lightrig/hacker name = "HUD" siemens_coefficient = 0.4 - flags = 0 + item_flags = 0 /obj/item/clothing/suit/lightrig/hacker siemens_coefficient = 0.4 /obj/item/clothing/shoes/lightrig/hacker siemens_coefficient = 0.4 - flags = NOSLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it. + item_flags = ITEM_FLAG_NO_SLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it. /obj/item/clothing/gloves/lightrig/hacker siemens_coefficient = 0 diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index d0e8a8b809e..a391fae55ff 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -9,7 +9,7 @@ icon_state = "softsuit_helmet" item_state = "softsuit_helmet" contained_sprite = TRUE - item_flags = THICKMATERIAL | INJECTIONPORT | AIRTIGHT + item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT permeability_coefficient = 0.01 armor = list( bio = ARMOR_BIO_SHIELDED, @@ -49,7 +49,7 @@ w_class = ITEMSIZE_LARGE gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - item_flags = THICKMATERIAL|INJECTIONPORT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/device/suit_cooling_unit, /obj/item/tank) slowdown = 1 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index bc4cb88e3cb..cbfa9818416 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/armor allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight,/obj/item/clothing/head/helmet) body_parts_covered = UPPER_TORSO|LOWER_TORSO - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL cold_protection = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE @@ -106,7 +106,7 @@ item_state = "swat_suit" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 1 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c302b3f9fbd..effd737aaa8 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -29,7 +29,7 @@ desc = "Suit for a cyborg costume." icon_state = "death" item_state = "death" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE fire_resist = T0C+5200 flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 94908a57a81..070aed32b02 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -54,7 +54,7 @@ desc = "Use in case of bomb." icon_state = "bombsuit" w_class = ITEMSIZE_HUGE//Too large to fit in a backpack - item_flags = THICKMATERIAL|BLOCK_GAS_SMOKE_EFFECT + item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT armor = list( melee = ARMOR_MELEE_VERY_HIGH, bullet = ARMOR_BALLISTIC_MINOR, @@ -92,7 +92,7 @@ bomb = ARMOR_BOMB_SHIELDED ) siemens_coefficient = 0.1 - item_flags = THICKMATERIAL + item_flags = ITEM_FLAG_THICK_MATERIAL flags_inv = HIDEJUMPSUIT|HIDETAIL heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 9758ad217ff..b6d7c2ef94a 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -331,7 +331,7 @@ desc_extended = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off Raskara and other evils. \ Hand-carved tajani charms are held in special regards, often being thought of as being particularly fortunate." w_class = ITEMSIZE_TINY - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_MASK | SLOT_WRISTS | SLOT_EARS | SLOT_TIE /obj/item/clothing/accessory/tajaran/charm/get_mask_examine_text(mob/user) @@ -366,7 +366,8 @@ desc = "A warding metallic of tajaran origin." icon_state = "steel_talisman" item_state = "steel_talisman" - flags = CONDUCT | NOBLUDGEON + obj_flags = OBJ_FLAG_CONDUCTABLE + item_flags = ITEM_FLAG_NO_BLUDGEON /obj/item/clothing/accessory/tajaran/charm/steel/silver name = "silver charm" diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker.dm b/code/modules/cooking/machinery/cooking_machines/_cooker.dm index 74da2da9be5..0ef550aa706 100644 --- a/code/modules/cooking/machinery/cooking_machines/_cooker.dm +++ b/code/modules/cooking/machinery/cooking_machines/_cooker.dm @@ -14,7 +14,7 @@ mobdamagetype = DAMAGE_BURN cooking_coeff = 0 cooking_power = 0 - flags = null +// atom_flags = 0 var/temperature = T20C var/starts_with = list() @@ -140,7 +140,7 @@ update_cooking_power() // update! for(var/cooking_obj in cooking_objs) var/datum/cooking_item/CI = cooking_obj - if((CI.container.flags && NOREACT) || isemptylist(CI.container?.reagents.reagent_volumes)) + if((CI.container.atom_flags && ATOM_FLAG_NO_REACT) || isemptylist(CI.container?.reagents.reagent_volumes)) continue CI.container.reagents.set_temperature(min(temperature, CI.container.reagents.get_temperature() + 10*SIGN(temperature - CI.container.reagents.get_temperature()))) // max of 5C per second return ..() diff --git a/code/modules/cooking/machinery/cooking_machines/container.dm b/code/modules/cooking/machinery/cooking_machines/container.dm index 82f3e2bbec6..6cd35c0e621 100644 --- a/code/modules/cooking/machinery/cooking_machines/container.dm +++ b/code/modules/cooking/machinery/cooking_machines/container.dm @@ -8,7 +8,7 @@ var/place_verb = "into" var/max_space = 20//Maximum sum of w-classes of foods in this container at once volume = 80//Maximum units of reagents - flags = OPENCONTAINER | NOREACT + atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT var/list/insertable = list( /obj/item/reagent_containers/food/snacks, /obj/item/holder, @@ -204,7 +204,7 @@ volume = 30 force = 11 hitsound = 'sound/weapons/smash.ogg' - flags = OPENCONTAINER // Will still react + atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = SKILLET /obj/item/reagent_containers/cooking_container/skillet/Initialize(var/mapload, var/mat_key) @@ -225,7 +225,7 @@ slot_flags = SLOT_HEAD force = 8 hitsound = 'sound/weapons/smash.ogg' - flags = OPENCONTAINER // Will still react + atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = SAUCEPAN /obj/item/reagent_containers/cooking_container/saucepan/Initialize(var/mapload, var/mat_key) @@ -246,7 +246,7 @@ volume = 180 force = 8 hitsound = 'sound/weapons/smash.ogg' - flags = OPENCONTAINER // Will still react + atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = POT w_class = ITEMSIZE_LARGE @@ -292,7 +292,7 @@ drop_sound = /singleton/sound_category/generic_drop_sound pickup_sound = /singleton/sound_category/generic_pickup_sound appliancetype = MIX - flags = OPENCONTAINER // Will still react + atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react volume = 15 // for things like jelly sandwiches etc max_space = 25 diff --git a/code/modules/cooking/machinery/icecream.dm b/code/modules/cooking/machinery/icecream.dm index 43926e47ddf..017cd70b65e 100644 --- a/code/modules/cooking/machinery/icecream.dm +++ b/code/modules/cooking/machinery/icecream.dm @@ -17,7 +17,7 @@ density = 1 anchored = 0 use_power = POWER_USE_OFF - flags = OPENCONTAINER | NOREACT + atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA diff --git a/code/modules/cooking/machinery/smartfridge.dm b/code/modules/cooking/machinery/smartfridge.dm index e28567b74ad..79c840e6b4b 100644 --- a/code/modules/cooking/machinery/smartfridge.dm +++ b/code/modules/cooking/machinery/smartfridge.dm @@ -9,7 +9,7 @@ anchored = 1 idle_power_usage = 5 active_power_usage = 100 - flags = NOREACT + atom_flags = ATOM_FLAG_NO_REACT opacity = FALSE var/ui_sort_alphabetically = TRUE var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. diff --git a/code/modules/cooking/plates.dm b/code/modules/cooking/plates.dm index f1319f06219..67b351dd58d 100644 --- a/code/modules/cooking/plates.dm +++ b/code/modules/cooking/plates.dm @@ -16,7 +16,7 @@ Plates that can hold your cooking stuff fragile = 3 shatter_material = DEFAULT_TABLE_MATERIAL // Slight typecasting abuse here, gets converted to a material in Initialize(). can_be_placed_into = list() - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/grease = FALSE /obj/item/reagent_containers/bowl/examine(mob/user, distance) @@ -101,7 +101,7 @@ Plates that can hold your cooking stuff /obj/item/reagent_containers/bowl/plate name = "plate" desc = "A plate for dishing up the finest of cuisine." - flags = null + atom_flags = 0 icon_state = "plate" var/obj/item/holding diff --git a/code/modules/cooking/trays.dm b/code/modules/cooking/trays.dm index 470314cb0d5..39cc6478b90 100644 --- a/code/modules/cooking/trays.dm +++ b/code/modules/cooking/trays.dm @@ -15,7 +15,7 @@ throw_speed = 1 throw_range = 5 w_class = 3.0 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE matter = list(DEFAULT_WALL_MATERIAL = 3000) recyclable = TRUE hitsound = /singleton/sound_category/bottle_hit_broken @@ -215,7 +215,7 @@ icon_state = "l_plate" throwforce = 4 force = 3 - flags = null + atom_flags = 0 matter = list(DEFAULT_TABLE_MATERIAL = 1000) recyclable = TRUE max_carry = 7 // That's 3 dishes, a knife, spoon and fork and a glass diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm index 3e2c0c00e23..5f0c075b728 100644 --- a/code/modules/custom_ka/core.dm +++ b/code/modules/custom_ka/core.dm @@ -7,7 +7,7 @@ icon_state = "" item_state = "kineticgun" contained_sprite = 1 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT matter = list(DEFAULT_WALL_MATERIAL = 2000) w_class = ITEMSIZE_NORMAL diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 42dc775935f..68523499055 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -23,7 +23,8 @@ possible_transfer_amounts = list(5) volume = 10 can_be_placed_into = null - flags = OPENCONTAINER | NOBLUDGEON + atom_flags = ATOM_FLAG_OPEN_CONTAINER + item_flags = ITEM_FLAG_NO_BLUDGEON unacidable = FALSE fragile = FALSE drop_sound = 'sound/items/drop/cloth.ogg' @@ -160,7 +161,7 @@ qdel(src) // the rag is used up, it'll be all bloody and useless after return // we can only do one at a time else if(reagents.total_volume) - if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT)) + if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) user.do_attack_animation(src) user.visible_message( SPAN_DANGER("\The [user] smothers [target] with [src]!"), diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index 2e5711bb3ce..59bed868519 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -162,7 +162,7 @@ desc_info = "Click drag it on to an object to collect evidence. Alternatively click on non-help intent." icon_state = "m_glass" w_class = ITEMSIZE_SMALL - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON var/evidence_type = "fiber" var/evidence_path = /obj/item/sample/fibers diff --git a/code/modules/detectivework/tools/scene_cards.dm b/code/modules/detectivework/tools/scene_cards.dm index b1a740c0436..f3210bec213 100644 --- a/code/modules/detectivework/tools/scene_cards.dm +++ b/code/modules/detectivework/tools/scene_cards.dm @@ -25,7 +25,7 @@ drop_sound = 'sound/items/drop/card.ogg' pickup_sound = 'sound/items/pickup/card.ogg' w_class = ITEMSIZE_TINY - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON randpixel = 1 layer = ABOVE_MOB_LAYER //so you can mark bodies var/number = 1 diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index f42b0fefc8c..157902ce183 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -58,7 +58,7 @@ /datum/event/radiation_storm/proc/lights(var/turnOn = FALSE) for(var/area/A in all_areas) - if(A.flags & RAD_SHIELDED) + if(A.area_flags & AREA_FLAG_RAD_SHIELDED) continue if(turnOn) A.radiation_active = TRUE diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index f853f3156d6..7b7a416edb6 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -169,7 +169,7 @@ grab_smash_attack(G, DAMAGE_PAIN) return - if(W.flags & NOBLUDGEON) return + if(W.item_flags & ITEM_FLAG_NO_BLUDGEON) return if(W.isscrewdriver()) to_chat(user, ("It's a holowindow, you can't unfasten it!")) @@ -262,7 +262,7 @@ throw_range = 5 throwforce = 0 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD item_icons = list( slot_l_hand_str = 'icons/mob/items/weapons/lefthand_energy.dmi', slot_r_hand_str = 'icons/mob/items/weapons/righthand_energy.dmi' diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index aa8ea3a0647..02e0563ce84 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -155,7 +155,7 @@ if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(H.shoes && H.shoes.item_flags & NOSLIP) + if(H.shoes && H.shoes.item_flags & ITEM_FLAG_NO_SLIP) return M.stop_pulling() diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 9c789fcefdd..463838d2e00 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -73,7 +73,7 @@ if(isliving(AM)) if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(H.shoes?.item_flags & LIGHTSTEP) + if(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP) return var/mob/living/M = AM M.slip("the [src.name]",4) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 4bac5211572..9385c8746a9 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -45,7 +45,7 @@ icon = 'icons/obj/hydroponics_growing.dmi' icon_state = "bush4-1" layer = 3 - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE pass_flags = PASSTABLE mouse_opacity = MOUSE_OPACITY_OPAQUE diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 46ccec8ebcd..1e34b09482b 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -5,7 +5,7 @@ icon_state = "hydrotray3" density = 1 anchored = 1 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER volume = 100 var/mechanical = 1 // Set to 0 to stop it from drawing the alert lights. @@ -198,7 +198,7 @@ ..() temp_chem_holder = new() temp_chem_holder.create_reagents(10) - temp_chem_holder.flags |= OPENCONTAINER + temp_chem_holder.atom_flags |= ATOM_FLAG_OPEN_CONTAINER create_reagents(200) if(mechanical) connect() diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm index af3f9d1e94f..0255e579920 100644 --- a/code/modules/hydroponics/trays/tray_reagents.dm +++ b/code/modules/hydroponics/trays/tray_reagents.dm @@ -2,7 +2,7 @@ /obj/item/plantspray icon = 'icons/obj/hydroponics_machines.dmi' item_state = "spray" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_BELT throwforce = 4 w_class = ITEMSIZE_SMALL @@ -34,7 +34,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "plastic_jug" item_state = "plastic_jug" - flags = 0 + atom_flags = 0 possible_transfer_amounts = list(5, 10, 20, 40, 80) volume = 80 w_class = ITEMSIZE_NORMAL diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index b00eda1081a..4909e4f6213 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -4,7 +4,7 @@ w_class = ITEMSIZE_SMALL icon = 'icons/obj/assemblies/electronic_setups.dmi' icon_state = "setup_small" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON var/max_components = IC_COMPONENTS_BASE var/max_complexity = IC_COMPLEXITY_BASE var/opened = 0 diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 1615b4e026d..c40567e7d25 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/assemblies/electronic_tools.dmi' icon_state = "wirer-wire" item_state = "wirer" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_SMALL var/datum/integrated_io/selected_io var/mode = WIRE @@ -109,7 +109,8 @@ settings to specific circuits, or for debugging purposes. It can also pulse activation pins." icon = 'icons/obj/assemblies/electronic_tools.dmi' icon_state = "debugger" - flags = CONDUCT | NOBLUDGEON + obj_flags = OBJ_FLAG_CONDUCTABLE + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_SMALL var/data_to_write = null var/accepting_refs = 0 @@ -170,7 +171,7 @@ desc = "A combination autopainter and flash anodizer designed to give electronic assemblies a colorful, wear-resistant finish." icon = 'icons/obj/assemblies/electronic_tools.dmi' icon_state = "detailer" - item_flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON w_class = ITEMSIZE_SMALL var/detail_color = COLOR_ASSEMBLY_WHITE var/static/list/color_list = list( diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 24ae84a3e16..43142d499a6 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -123,7 +123,7 @@ extended_desc = "This is effectively an internal beaker. It will consume and produce power from phoron, slime jelly, welding fuel, carbon,\ ethanol, nutriments and blood, in order of decreasing efficiency. It will consume fuel only if the battery can take more energy." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 4 inputs = list() outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index d1f3970eab6..229389c6ed3 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -14,7 +14,7 @@ icon_state = "injector" extended_desc = "This autoinjector can push reagents into another container or someone else outside of the machine. The target \ must be adjacent to the machine, and if it is a person, they cannot be wearing thick clothing." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 20 cooldown_per_use = 6 SECONDS inputs = list("target" = IC_PINTYPE_REF, "injection amount" = IC_PINTYPE_NUMBER) @@ -131,7 +131,7 @@ extended_desc = "This is a pump, which will move liquids from the source ref to the target ref. The third pin determines \ how much liquid is moved per pulse, between 0 and 50. The pump can move reagents to any open container inside the machine, or \ outside the machine if it is next to the machine. Note that this cannot be used on entities." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 8 inputs = list( "source" = IC_PINTYPE_REF, @@ -194,7 +194,7 @@ desc = "Stores liquid inside, and away from electrical components. Can store up to 60u." icon_state = "reagent_storage" extended_desc = "This is effectively an internal beaker." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 4 inputs = list() outputs = list("volume used" = IC_PINTYPE_NUMBER, "self reference" = IC_PINTYPE_REF) @@ -217,7 +217,7 @@ desc = "Stores liquid inside, and away from electrical components. Can store up to 60u. This will also suppress reactions." icon_state = "reagent_storage_cryo" extended_desc = "This is effectively an internal cryo beaker." - flags = OPENCONTAINER | NOREACT + atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT complexity = 8 spawn_flags = IC_SPAWN_RESEARCH origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) @@ -227,7 +227,7 @@ desc = "Stores liquid inside, and away from electrical components. Can store up to 180u." icon_state = "reagent_storage_big" extended_desc = "This is effectively an internal beaker." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 16 volume = 180 spawn_flags = IC_SPAWN_RESEARCH @@ -238,7 +238,7 @@ desc = "Stores liquid inside, and away from electrical components. Can store up to 60u. On pulse this beaker will send list of contained reagents, as well as analyse their taste." icon_state = "reagent_scan" extended_desc = "Mostly useful for reagent filters." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 8 outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF,"list of reagents" = IC_PINTYPE_LIST,"taste" = IC_PINTYPE_STRING) activators = list("scan" = IC_PINTYPE_PULSE_IN) @@ -263,7 +263,7 @@ It will move all reagents, except list, given in fourth pin if amount value is positive.\ Or it will move only desired reagents if amount is negative, The third pin determines \ how much reagent is moved per pulse, between 0 and 50. Amount is given for each separate reagent." - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER complexity = 8 inputs = list("source" = IC_PINTYPE_REF, "target" = IC_PINTYPE_REF, "injection amount" = IC_PINTYPE_NUMBER, "list of reagents" = IC_PINTYPE_LIST) inputs_default = list("3" = 5) diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm index 2c85278269b..6408aa8b6eb 100644 --- a/code/modules/maps/map_template.dm +++ b/code/modules/maps/map_template.dm @@ -148,7 +148,7 @@ var/turf/T = i T.post_change(FALSE) if(template_flags & TEMPLATE_FLAG_NO_RUINS) - T.flags |= TURF_NORUINS + T.turf_flags |= TURF_NORUINS if(istype(T,/turf/simulated)) var/turf/simulated/sim = T sim.update_air_properties() diff --git a/code/modules/maps/ruins.dm b/code/modules/maps/ruins.dm index 9191ac143ac..5aa6a6afbef 100644 --- a/code/modules/maps/ruins.dm +++ b/code/modules/maps/ruins.dm @@ -88,7 +88,7 @@ var/list/banned_ruin_ids = list() valid = TRUE for(var/turf/check_turf in ruin.get_affected_turfs(choice, TRUE)) var/area/check_area = get_area(check_turf) - if(!istype(check_area, filter_area) || check_turf.flags & TURF_NORUINS) + if(!istype(check_area, filter_area) || check_turf.turf_flags & TURF_NORUINS) valid = FALSE break diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 2c71aa2094d..1324de7cde6 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -42,7 +42,7 @@ pickup_sound = material.pickup_sound if(material.conductive) - flags |= CONDUCT + obj_flags |= OBJ_FLAG_CONDUCTABLE matter = material.get_matter() diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 073ff032dc7..eb5c29a9402 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -561,7 +561,7 @@ to_chat(user, "This material is not reinforced enough to use for a door.") return for(var/obj/obstacle in T) - if((obstacle.flags & ON_BORDER) && obstacle.dir == user.dir) + if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && obstacle.dir == user.dir) failed_to_build = 1 if(failed_to_build) to_chat(user, "There is no room in this location.") diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index a59af11fd6c..a8a56485aa7 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -6,7 +6,7 @@ icon_state = "coin__heads" randpixel = 8 desc = "A flat disc or piece of metal with an official stamp. An archaic type of currency." - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 0.0 throwforce = 0.0 w_class = ITEMSIZE_TINY diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index ecc9d49350e..3b1aac85ba1 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -10,7 +10,7 @@ slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi', slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi', ) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 4.0 force = 10.0 @@ -325,7 +325,7 @@ ) icon_state = "shovel" item_state = "shovel" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT force = 8.0 throwforce = 4.0 @@ -618,7 +618,7 @@ desc = "An antiquated device that can detect ore in a wide radius around the user." icon = 'icons/obj/device.dmi' icon_state = "pinoff" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL item_state = "electronic" diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index e64b1872b55..4f0aa867a4e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -24,7 +24,7 @@ /mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, del_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, ignore_blocked = FALSE, assisted_equip = FALSE) if(!istype(W)) return FALSE - if(W.item_flags & NOMOVE) //Cannot move NOMOVE items from one inventory slot to another. Cannot do canremove here because then BSTs spawn naked. + if(W.item_flags & ITEM_FLAG_NO_MOVE) //Cannot move ITEM_FLAG_NO_MOVE items from one inventory slot to another. Cannot do canremove here because then BSTs spawn naked. return FALSE if(!W.mob_can_equip(src, slot, disable_warning, ignore_blocked)) diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 13362a331f4..8984d960e6c 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -12,7 +12,7 @@ if(!bypass_checks) - if(wear_mask && wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT) //Check if the gasmask blocks an effect + if(wear_mask && wear_mask.item_flags & ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT) //Check if the gasmask blocks an effect return 0 if (internals && internals.icon_state == "internal1") //Check for internals @@ -51,7 +51,7 @@ if(internal) if (!contents.Find(internal)) internal = null - if (!(wear_mask && (wear_mask.item_flags & AIRTIGHT))) + if (!(wear_mask && (wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))) internal = null if(internal) if (internals) @@ -86,7 +86,7 @@ /mob/living/carbon/proc/handle_chemical_smoke(var/datum/gas_mixture/environment) if(species && environment.return_pressure() < species.breath_pressure/5) return //pressure is too low to even breathe in. - if(wear_mask && (wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)) + if(wear_mask && (wear_mask.item_flags & ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT)) return for(var/obj/effect/effect/smoke/chem/smoke in view(1, src)) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 354c4794aa8..399947eb8d6 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -1,7 +1,7 @@ /mob/living/carbon/human/proc/get_covered_body_parts(var/thick) var/skipbody = 0 for(var/obj/item/clothing/C in list(wear_suit, head, wear_mask, w_uniform, gloves, shoes)) - if(!thick || (C.item_flags & THICKMATERIAL)) + if(!thick || (C.item_flags & ITEM_FLAG_THICK_MATERIAL)) skipbody |= C.body_parts_covered return skipbody diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f44f12381bc..394e952e97e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1629,9 +1629,9 @@ ) for(var/obj/item/C in list(wear_suit, head, wear_mask, w_uniform, gloves, shoes)) var/injection_modifier = BASE_INJECTION_MOD - if(C.item_flags & INJECTIONPORT) + if(C.item_flags & ITEM_FLAG_INJECTION_PORT) injection_modifier = SUIT_INJECTION_MOD - else if(C.item_flags & THICKMATERIAL) + else if(C.item_flags & ITEM_FLAG_THICK_MATERIAL) injection_modifier = INJECTION_FAIL if(. == SUIT_INJECTION_MOD && injection_modifier != INJECTION_FAIL) // don't reset it back to the base, unless it completely blocks continue @@ -1656,7 +1656,7 @@ var/feet_exposed = 1 for(var/obj/item/clothing/C in equipment) - if(C.item_flags & SHOWFLAVORTEXT) + if(C.item_flags & ITEM_FLAG_SHOW_FLAVOR_TEXT) continue if(C.body_parts_covered & HEAD) @@ -1711,7 +1711,7 @@ return 0 /mob/living/carbon/human/slip(var/slipped_on, stun_duration=8) - if((species.flags & NO_SLIP) || (shoes && (shoes.item_flags & NOSLIP))) + if((species.flags & NO_SLIP) || (shoes && (shoes.item_flags & ITEM_FLAG_NO_SLIP))) return 0 . = ..(slipped_on,stun_duration) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 11661ee1c5c..9cfb97c7f90 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -149,7 +149,7 @@ emp_act /mob/living/carbon/human/proc/check_head_airtight_coverage() var/list/clothing = list(head, wear_mask, wear_suit) for(var/obj/item/clothing/C in clothing) - if((C.body_parts_covered & HEAD) && (C.item_flags & (AIRTIGHT))) + if((C.body_parts_covered & HEAD) && (C.item_flags & (ITEM_FLAG_AIRTIGHT))) return TRUE return FALSE @@ -157,7 +157,7 @@ emp_act /mob/living/carbon/human/proc/check_mouth_coverage() var/list/protective_gear = list(head, wear_mask, wear_suit, w_uniform) for(var/obj/item/gear in protective_gear) - if(istype(gear) && (gear.body_parts_covered & FACE) && !(gear.item_flags & FLEXIBLEMATERIAL)) + if(istype(gear) && (gear.body_parts_covered & FACE) && !(gear.item_flags & ITEM_FLAG_FLEXIBLE_MATERIAL)) return gear return null @@ -263,7 +263,7 @@ emp_act apply_effect(20, PARALYZE, blocked) //Apply blood - if(!(I.flags & NOBLOODY)) + if(!(I.atom_flags & ATOM_FLAG_NO_BLOOD)) I.add_blood(src) var/is_sharp_weapon = is_sharp(I) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index a7914bd93e7..de48d82eff2 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -307,7 +307,7 @@ /mob/living/carbon/human/get_hearing_protection() . = EAR_PROTECTION_NONE - if ((l_ear?.item_flags & SOUNDPROTECTION) || (r_ear?.item_flags & SOUNDPROTECTION) || (head?.item_flags & SOUNDPROTECTION)) + if ((l_ear?.item_flags & ITEM_FLAG_SOUND_PROTECTION) || (r_ear?.item_flags & ITEM_FLAG_SOUND_PROTECTION) || (head?.item_flags & ITEM_FLAG_SOUND_PROTECTION)) return EAR_PROTECTION_MAJOR if(istype(head, /obj/item/clothing/head/helmet) || HAS_FLAG(mutations, HULK)) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 13667a3f07c..785b30baffd 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -110,7 +110,7 @@ return prob_slip /mob/living/carbon/human/Check_Shoegrip(checkSpecies = TRUE) - if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots) && !lying && !buckled_to && !length(grabbed_by)) //magboots + dense_object = no floating. Doesn't work if lying. Grabbedby and buckled_to are for mob carrying, wheelchairs, roller beds, etc. + if(shoes && (shoes.item_flags & ITEM_FLAG_NO_SLIP) && istype(shoes, /obj/item/clothing/shoes/magboots) && !lying && !buckled_to && !length(grabbed_by)) //magboots + dense_object = no floating. Doesn't work if lying. Grabbedby and buckled_to are for mob carrying, wheelchairs, roller beds, etc. return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index bce467b9c84..a21d0250721 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -745,7 +745,7 @@ var/turf/target = get_step(src, dir) for(var/obj/obstacle in get_turf(src)) - if((obstacle.flags & ON_BORDER) && (src != obstacle)) + if((obstacle.atom_flags & ATOM_FLAG_CHECKS_BORDER) && (src != obstacle)) if(!obstacle.CheckExit(src, target)) brokesomething++ if (!crash_into(obstacle)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e12a95d9083..c87e0eded64 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -268,11 +268,11 @@ /** breathing **/ /mob/living/carbon/human/handle_chemical_smoke(var/datum/gas_mixture/environment) - if(wear_mask && (wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT)) + if(wear_mask && (wear_mask.item_flags & ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT)) return - if(glasses && (glasses.item_flags & BLOCK_GAS_SMOKE_EFFECT)) + if(glasses && (glasses.item_flags & ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT)) return - if(head && (head.item_flags & BLOCK_GAS_SMOKE_EFFECT)) + if(head && (head.item_flags & ITEM_FLAG_BLOCK_GAS_SMOKE_EFFECT)) return ..() @@ -285,7 +285,7 @@ if(!rig.offline && (rig.air_supply && internal == rig.air_supply)) rig_supply = rig.air_supply - if (!rig_supply && (!contents.Find(internal) || !((wear_mask && (wear_mask.item_flags & AIRTIGHT)) || (head && (head.item_flags & AIRTIGHT))))) + if (!rig_supply && (!contents.Find(internal) || !((wear_mask && (wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) || (head && (head.item_flags & ITEM_FLAG_AIRTIGHT))))) internal = null if(internal) diff --git a/code/modules/mob/living/carbon/slime/items.dm b/code/modules/mob/living/carbon/slime/items.dm index 4fc7349182a..f3be138bb06 100644 --- a/code/modules/mob/living/carbon/slime/items.dm +++ b/code/modules/mob/living/carbon/slime/items.dm @@ -11,7 +11,7 @@ origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = FALSE //has it been enhanced before? - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER /obj/item/slime_extract/attackby(var/obj/item/O, var/mob/user) if(istype(O, /obj/item/extract_enhancer)) diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index ea27823fb04..b72beed4925 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -53,7 +53,7 @@ desc = "A set of specialized tools that functions as both the ordinary crowbar, but is additionally capable of brute forcing bolted doors without power." icon = 'icons/obj/item/tools/jawsoflife.dmi' icon_state = "jawspry" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON force = 0 sharp = FALSE edge = FALSE diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index aab3ea60e54..08aa3e8e6a1 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -6,7 +6,7 @@ icon_state = "robotanalyzer" item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index 3e786716eed..d481277a5ec 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/device.dmi' icon_state = "gripper" - flags = NOBLUDGEON + item_flags = ITEM_FLAG_NO_BLUDGEON //Has a list of items that it can hold. var/list/can_hold = list( diff --git a/code/modules/mob/living/silicon/robot/items/inductive_charger.dm b/code/modules/mob/living/silicon/robot/items/inductive_charger.dm index b42284c0990..2a4fa6b4478 100644 --- a/code/modules/mob/living/silicon/robot/items/inductive_charger.dm +++ b/code/modules/mob/living/silicon/robot/items/inductive_charger.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/item/tools/inductive_charger.dmi' icon_state = "inductive_charger" item_state = "inductive_charger" - flags = HELDMAPTEXT + item_flags = ITEM_FLAG_HELD_MAP_TEXT contained_sprite = TRUE var/is_in_use = FALSE var/ready_to_use = TRUE diff --git a/code/modules/mob/living/silicon/robot/items/robot_parts.dm b/code/modules/mob/living/silicon/robot/items/robot_parts.dm index b6aaaba4e74..1d7477a9ca5 100644 --- a/code/modules/mob/living/silicon/robot/items/robot_parts.dm +++ b/code/modules/mob/living/silicon/robot/items/robot_parts.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/robot_parts.dmi' item_state = "buildpipe" icon_state = "blank" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT var/list/part = null // Order of args is important for installing robolimbs. var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics. diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 09c5cafc191..b23f9bf04aa 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -16,7 +16,7 @@ var/global/list/robot_modules = list( icon_state = "std_mod" w_class = ITEMSIZE_IMMENSE item_state = "electronic" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE var/channels = list() var/networks = list() var/languages = list( // Any listed language will be understandable. Any set to TRUE will be speakable diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index 917aaa6d6e1..f497c0efb66 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -87,12 +87,12 @@ var/obj/item/clothing/worn_suit = M.wear_suit var/obj/item/clothing/worn_helmet = M.head if(worn_suit) // Are you wearing clothes? - if ((worn_suit.flags & THICKMATERIAL)) + if ((worn_suit.item_flags & ITEM_FLAG_THICK_MATERIAL)) prob_mult -= 0.7 else prob_mult -= 0.01 * (min(LAZYACCESS(worn_suit.armor, "bio"), 70)) // Is it sealed? I can't get to 70% of your body. if(worn_helmet) - if ((worn_helmet.flags & THICKMATERIAL)) + if ((worn_helmet.item_flags & ITEM_FLAG_THICK_MATERIAL)) prob_mult -= 0.3 else prob_mult -= 0.01 *(min(LAZYACCESS(worn_helmet.armor, "bio"), 30))// Is your helmet sealed? I can't get to 30% of your body. diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 623164195ff..68aac79d31f 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -400,7 +400,7 @@ found_obj = locate(/obj/structure/window) in target_turf if(found_obj) - if(HAS_FLAG(found_obj.flags, ON_BORDER) && found_obj.dir != reverse_dir[card_dir]) + if(HAS_FLAG(found_obj.atom_flags, ATOM_FLAG_CHECKS_BORDER) && found_obj.dir != reverse_dir[card_dir]) continue found_obj.attack_generic(src, rand(melee_damage_lower, melee_damage_upper), attacktext, TRUE) hostile_last_attack = world.time diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index bb53c83b01e..49dd4d3799d 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -2,7 +2,7 @@ density = 1 layer = 4.0 animate_movement = 2 - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE sight = DEFAULT_SIGHT var/datum/mind/mind diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index b29b3c4d96b..55cc2efa960 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -14,7 +14,7 @@ name = "grab" icon = 'icons/mob/screen/generic.dmi' icon_state = "reinforce" - flags = 0 + atom_flags = 0 var/obj/screen/grab/hud = null var/mob/living/affecting = null var/mob/living/carbon/human/assailant = null @@ -151,7 +151,7 @@ if(ishuman(affecting)) var/mob/living/carbon/human/A = affecting var/obj/item/clothing/C = A.head - if(C && (C.item_flags & THICKMATERIAL)) + if(C && (C.item_flags & ITEM_FLAG_THICK_MATERIAL)) return if(!(A.species.flags & NO_BREATHE)) A.losebreath = max(A.losebreath + 3, 5) @@ -301,7 +301,7 @@ else if(state < GRAB_UPGRADING) if(ishuman(affecting)) var/mob/living/carbon/human/H = affecting - if(H.head && (H.head.item_flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) assailant.visible_message(SPAN_WARNING("[affecting]'s headgear prevents [assailant] from choking them out!"), SPAN_WARNING("[affecting]'s headgear prevents you from choking them out!")) return hud.icon_state = "kill1" diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index cb737aa8ac5..51f3e9f4747 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -370,7 +370,7 @@ desc = "An archaic method of preventing travel along the X and Y axes if you are on a lower point on the Z-axis." density = TRUE anchored = TRUE - flags = ON_BORDER + atom_flags = ATOM_FLAG_CHECKS_BORDER climbable = TRUE icon = 'icons/obj/structure/platforms.dmi' icon_state = "platform" diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index bc579b96238..1cd885017a6 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -117,7 +117,7 @@ var/obj/item/M = new augment_type(owner) M.canremove = FALSE - M.item_flags |= NOMOVE + M.item_flags |= ITEM_FLAG_NO_MOVE owner.equip_to_slot(M, aug_slot) var/obj/item/organ/O = owner.organs_by_name[parent_organ] owner.visible_message(SPAN_NOTICE("\The [M] slides out of \the [owner]'s [O.name]."), SPAN_NOTICE("You deploy \the [M]!")) diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm index 9bb7f0a21b4..fe5549e88eb 100644 --- a/code/modules/organs/subtypes/vaurca.dm +++ b/code/modules/organs/subtypes/vaurca.dm @@ -413,11 +413,11 @@ mask_check = 1 if(mask_check) - if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT)) + if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) data["maskConnected"] = 1 else if(istype(location, /mob/living/carbon/human)) var/mob/living/carbon/human/H = location - if(H.head && (H.head.flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) data["maskConnected"] = 1 // update the ui if it exists, returns null if no ui is passed/found @@ -461,11 +461,11 @@ else var/can_open_valve - if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT)) + if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) can_open_valve = 1 else if(istype(location,/mob/living/carbon/human)) var/mob/living/carbon/human/H = location - if(H.head && (H.head.flags & AIRTIGHT)) + if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) can_open_valve = 1 if(can_open_valve) diff --git a/code/modules/overmap/exoplanets/decor/_turfs.dm b/code/modules/overmap/exoplanets/decor/_turfs.dm index bb840425744..065e5401792 100644 --- a/code/modules/overmap/exoplanets/decor/_turfs.dm +++ b/code/modules/overmap/exoplanets/decor/_turfs.dm @@ -5,7 +5,7 @@ has_resources = 1 footstep_sound = /singleton/sound_category/asteroid_footstep turf_flags = TURF_FLAG_BACKGROUND - flags = null + turf_flags = null does_footprint = TRUE diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index 19c132cbb4c..c06a200fd03 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -309,7 +309,7 @@ // Ruins check - try to avoid blowing up ruins with our LZ // We do this until we run out of attempts for(var/turf/check in block_to_check) - if(!istype(get_area(check), /area/exoplanet) || check.flags & TURF_NORUINS) + if(!istype(get_area(check), /area/exoplanet) || check.turf_flags & TURF_NORUINS) valid = FALSE break // Landability check - try to find an already-open space for an LZ diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index 564ceb4d0bd..5dbbf0b5cc9 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -75,7 +75,7 @@ /obj/effect/shuttle_landmark/ship name = "Open Space" landmark_tag = "ship" - flags = SLANDMARK_FLAG_AUTOSET | SLANDMARK_FLAG_ZERO_G + landmark_flags = SLANDMARK_FLAG_AUTOSET | SLANDMARK_FLAG_ZERO_G base_turf = /turf/space var/shuttle_name var/list/visitors // landmark -> visiting shuttle stationed there @@ -96,7 +96,7 @@ return "Grappled by other shuttle; cannot manouver." /obj/effect/shuttle_landmark/visiting_shuttle - flags = SLANDMARK_FLAG_AUTOSET | SLANDMARK_FLAG_ZERO_G + landmark_flags = SLANDMARK_FLAG_AUTOSET | SLANDMARK_FLAG_ZERO_G var/obj/effect/shuttle_landmark/ship/core_landmark /obj/effect/shuttle_landmark/visiting_shuttle/Initialize(mapload, obj/effect/shuttle_landmark/ship/master, _name) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index d25123ff979..ef64050c14c 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -168,7 +168,7 @@ * Reagent Pens */ /obj/item/pen/reagent - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER slot_flags = SLOT_BELT origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 54f3f7ebf0f..2a0d6767467 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -134,7 +134,7 @@ var/global/photo_count = 0 icon_state = "camera" item_state = "electropack" w_class = ITEMSIZE_SMALL - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT matter = list(DEFAULT_WALL_MATERIAL = 2000) var/pictures_max = 10 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index a9816552464..e68e14e05d1 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -135,7 +135,7 @@ By design, d1 is the smallest direction and d2 is the highest if(user.a_intent != I_HELP) return - if(W.flags & CONDUCT) + if(W.obj_flags & OBJ_FLAG_CONDUCTABLE) shock(user, 50, 0.7) if(d1 == 12 || d2 == 12) @@ -482,7 +482,8 @@ By design, d1 is the smallest direction and d2 is the highest throw_range = 5 matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20) recyclable = TRUE - flags = HELDMAPTEXT|CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE + item_flags = ITEM_FLAG_HELD_MAP_TEXT slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") stacktype = /obj/item/stack/cable_coil diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm index 1d04a958569..2cd78b4d194 100644 --- a/code/modules/power/lights/fixtures.dm +++ b/code/modules/power/lights/fixtures.dm @@ -474,7 +474,7 @@ return to_chat(user, SPAN_WARNING("You stick \the [W] into the light socket!")) - if(has_power() && (W.flags & CONDUCT)) + if(has_power() && (W.obj_flags & OBJ_FLAG_CONDUCTABLE)) spark(src, 3) if(prob(75)) electrocute_mob(user, get_area(src), src, rand(0.7,1.0)) @@ -482,7 +482,7 @@ /obj/machinery/light/proc/smash_check(var/obj/O, var/mob/living/user, var/others_text, var/self_text, var/only_break) if(prob(1 + O.force * 5)) user.visible_message(SPAN_WARNING("\The [user] [others_text] \the [src]!"), SPAN_WARNING("You hit \the [src], and it [self_text]!"), SPAN_WARNING("You hear a tinkle of breaking glass!")) - if(!stat && (O.flags & CONDUCT)) + if(!stat && (O.obj_flags & OBJ_FLAG_CONDUCTABLE)) if(prob(12)) electrocute_mob(user, get_area(src), src, 0.3) if(only_break) diff --git a/code/modules/power/portgen.dm b/code/modules/power/portgen.dm index 70b5d597f81..779698d4e63 100644 --- a/code/modules/power/portgen.dm +++ b/code/modules/power/portgen.dm @@ -469,7 +469,7 @@ board_path = "/obj/item/circuitboard/portgen/fusion" anchored = TRUE - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/coolant_volume = 360 var/coolant_use = 0.2 diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 987ce56a914..39e8f741be7 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -34,7 +34,7 @@ to_chat(src, "The [S] pulls \the [hand] from your grip!") apply_damage(current_size * 3, DAMAGE_RADIATION, damage_flags = DAMAGE_FLAG_DISPERSED) if(shoes) - if(shoes.item_flags & NOSLIP) return 0 + if(shoes.item_flags & ITEM_FLAG_NO_SLIP) return 0 ..() /obj/singularity_act() diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 419b5b3013b..6de56a0a3a2 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -8,7 +8,7 @@ unacidable = 1 use_power = POWER_USE_OFF light_range = 4 - flags = PROXMOVE + movable_flags = MOVABLE_FLAG_PROXMOVE var/obj/machinery/field_generator/FG1 = null var/obj/machinery/field_generator/FG2 = null var/has_shocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second. diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 6331e2e68ac..356cbd1051e 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" randpixel = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_EARS throwforce = 1 w_class = ITEMSIZE_TINY @@ -94,7 +94,7 @@ desc = "A magazine for some kind of gun." icon_state = "357" icon = 'icons/obj/ammo.dmi' - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT item_state = "box" matter = list(DEFAULT_WALL_MATERIAL = 500) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ee9cf76bc69..d055a37c545 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -50,7 +50,7 @@ icon_state = "pistol" item_state = "pistol" contained_sprite = TRUE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT|SLOT_HOLSTER matter = list(DEFAULT_WALL_MATERIAL = 2000) w_class = ITEMSIZE_NORMAL diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 9bd3c9327fd..e7d8d12ecee 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -212,7 +212,7 @@ w_class = ITEMSIZE_LARGE accuracy = 1 force = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK charge_cost = 300 max_shots = 4 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 22167482a34..a9f0ac47190 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -320,7 +320,7 @@ edge = TRUE anchored = 0 armor_penetration = 40 - flags = NOBLOODY + atom_flags = ATOM_FLAG_NO_BLOOD can_embed = 0 self_recharge = 1 recharge_time = 2 diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm index 8125affe050..a7adaa0b8af 100644 --- a/code/modules/projectiles/guns/launcher.dm +++ b/code/modules/projectiles/guns/launcher.dm @@ -5,7 +5,7 @@ switching to HARM intent, then click where you wish to fire. To reload it, insert the appropriate items. Some weapons may require additional drawing of the string or charging, \ which can typically be done with the Unique-Action macro or button located in the bottom right of the screen." w_class = ITEMSIZE_HUGE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK var/release_force = 0 diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 44a4c1c0904..f8d75e70405 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -6,7 +6,7 @@ item_state = "pneumatic" slot_flags = SLOT_BELT w_class = ITEMSIZE_HUGE - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE fire_sound_text = "a loud whoosh of moving air" fire_delay = 50 fire_sound = 'sound/weapons/tablehit1.ogg' diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index fd87659631c..3fbfba325e6 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -8,7 +8,7 @@ throw_speed = 2 throw_range = 10 force = 5.0 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = 0 origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) fire_sound = 'sound/weapons/rocketlaunch.ogg' diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index cf6b19e08c1..6ed0560b872 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -5,7 +5,7 @@ icon_state = "syringe-cartridge" var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot matter = list(DEFAULT_WALL_MATERIAL = 125, MATERIAL_GLASS = 375) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_EARS throwforce = 3 force = 3 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index a6e34e62834..74bfc952852 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -51,7 +51,7 @@ max_shells = 4 w_class = ITEMSIZE_LARGE force = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK caliber = "shotgun" origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) @@ -140,7 +140,7 @@ max_shells = 2 w_class = ITEMSIZE_LARGE force = 10 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE is_wieldable = TRUE var/has_wield_state = TRUE slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 77c84be5674..7f369925895 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -12,7 +12,7 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh icon_state = "firing_pin" item_state = "pen" origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2) - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_TINY attack_verb = list("poked") var/emagged = FALSE @@ -100,7 +100,7 @@ Pins Below. /obj/item/device/firing_pin/test_range/pin_auth(mob/living/user) var/area/A = get_area(src) - if (A && (A.flags & FIRING_RANGE)) + if (A && (A.area_flags & AREA_FLAG_FIRING_RANGE)) return 1 else return 0 diff --git a/code/modules/projectiles/projectile/trace.dm b/code/modules/projectiles/projectile/trace.dm index 50cdab79ea5..20022039e2d 100644 --- a/code/modules/projectiles/projectile/trace.dm +++ b/code/modules/projectiles/projectile/trace.dm @@ -1,19 +1,21 @@ //Helper proc to check if you can hit them or not. -/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE|PASSRAILING, flags=null) +/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE|PASSRAILING, obj_flags=null, item_flags=null) if(!istype(target) || !istype(firer)) return 0 var/obj/item/projectile/test/trace = new /obj/item/projectile/test(get_turf(firer)) //Making the test.... //Set the flags and pass flags to that of the real projectile... - if(!isnull(flags)) - trace.flags = flags + if(!isnull(obj_flags)) + trace.obj_flags = obj_flags + if(!isnull(item_flags)) + trace.item_flags = item_flags trace.pass_flags = pass_flags return trace.launch_projectile(target) //Test it! -/obj/item/projectile/proc/_check_fire(atom/target as mob, var/mob/living/user as mob) //Checks if you can hit them or not. - check_trajectory(target, user, pass_flags, flags) +/obj/item/projectile/proc/_check_fire(atom/target as mob, mob/living/user as mob) //Checks if you can hit them or not. + check_trajectory(target, user, pass_flags, obj_flags, item_flags) //"Tracing" projectile /obj/item/projectile/test //Used to see if you can hit them. diff --git a/code/modules/psionics/abilities/psi_punch.dm b/code/modules/psionics/abilities/psi_punch.dm index 94f16151ff4..3c369d58bfb 100644 --- a/code/modules/psionics/abilities/psi_punch.dm +++ b/code/modules/psionics/abilities/psi_punch.dm @@ -15,7 +15,7 @@ armor_penetration = 20 cooldown = 0 psi_cost = 3 - flags = 0 + item_flags = 0 hitsound = 'sound/weapons/resonator_blast.ogg' /obj/item/spell/punch/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) diff --git a/code/modules/psionics/abilities/rend.dm b/code/modules/psionics/abilities/rend.dm index bc8c3231d68..fa014ca3648 100644 --- a/code/modules/psionics/abilities/rend.dm +++ b/code/modules/psionics/abilities/rend.dm @@ -19,7 +19,7 @@ psi_cost = 35 attack_verb = list("rent apart", "disintegrated") hitsound = 'sound/weapons/heavysmash.ogg' - flags = 0 + item_flags = 0 var/structure_mode = FALSE /obj/item/spell/rend/on_use_cast(mob/user, bypass_psi_check) diff --git a/code/modules/psionics/equipment/psipower.dm b/code/modules/psionics/equipment/psipower.dm index e5ca9d22151..b1c0cc10d87 100644 --- a/code/modules/psionics/equipment/psipower.dm +++ b/code/modules/psionics/equipment/psipower.dm @@ -1,7 +1,7 @@ /obj/item/psychic_power name = "psychic power" icon = 'icons/obj/psychic_powers.dmi' - flags = 0 + atom_flags = 0 anchored = TRUE throwforce = 0 //Just to be on the safe side throw_range = 0 diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index ad476db52c0..e30a36ecbd4 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -4,7 +4,7 @@ var/turf/source_turf // Location of the radiation source. var/rad_power // Strength of the radiation being emitted. var/decay = TRUE // True for automatic decay. False if owner promises to handle it (i.e. supermatter) - var/respect_maint = FALSE // True for not affecting RAD_SHIELDED areas. + var/respect_maint = FALSE // True for not affecting AREA_FLAG_RAD_SHIELDED areas. var/flat = FALSE // True for power falloff with distance. var/range // Cached maximum range, used for quick checks against mobs. diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 26452351746..ec459557309 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -83,7 +83,7 @@ /datum/reagents/proc/process_reactions() if(!my_atom?.loc) return FALSE - if(my_atom.flags & NOREACT) + if(my_atom.atom_flags & ATOM_FLAG_NO_REACT) return FALSE var/reaction_occured diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e2137129342..17bf660eee3 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -29,7 +29,7 @@ var/bottlesprite = "bottle-1" //yes, strings var/pillsprite = "pill1" var/max_pill_count = 20 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/datum/asset/spritesheet/chem_master/chem_asset var/list/forbidden_containers = list(/obj/item/reagent_containers/glass/bucket) //For containers we don't want people to shove into the chem machine. Like big-ass buckets. var/datum/tgui/ui = null diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 36ee31bfed2..60b7fd8c8c5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -867,7 +867,7 @@ if(I.body_parts_covered & EYES) eyes_covered |= EYES_PROTECTED eye_protection = I.name - if((I.body_parts_covered & FACE) && !(I.item_flags & FLEXIBLEMATERIAL)) + if((I.body_parts_covered & FACE) && !(I.item_flags & ITEM_FLAG_FLEXIBLE_MATERIAL)) mouth_covered = 1 face_protection = I.name diff --git a/code/modules/reagents/dispenser/cartridge.dm b/code/modules/reagents/dispenser/cartridge.dm index 0129def748d..c486f061ae5 100644 --- a/code/modules/reagents/dispenser/cartridge.dm +++ b/code/modules/reagents/dispenser/cartridge.dm @@ -86,10 +86,10 @@ ..() if (is_open_container()) to_chat(usr, "You put the cap on \the [src].") - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER else to_chat(usr, "You take the cap off \the [src].") - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER update_icon() /obj/item/reagent_containers/chem_disp_cartridge/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index c706e6ded07..c280e7acba7 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -80,7 +80,7 @@ return if(fragile && (speed >= fragile)) shatter() - if(flags && NOREACT) + if(atom_flags && ATOM_FLAG_NO_REACT) return if(!reagents) return @@ -99,7 +99,7 @@ var/obj/item/reagent_containers/food/snacks/dipped = W dipped.attempt_apply_coating(src, user) return - if(!(W.flags & NOBLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile)) + if(!(W.item_flags & ITEM_FLAG_NO_BLUDGEON) && (user.a_intent == I_HURT) && fragile && (W.force > fragile)) if(do_after(user, 1 SECOND, src)) if(!QDELETED(src)) visible_message(SPAN_WARNING("[user] smashes [src] with \a [W]!")) @@ -129,9 +129,9 @@ if(standard_splash_obj(user, target)) return - if(istype(target, /obj/)) - var/obj/O = target - if(!(O.flags & NOBLUDGEON) && reagents) + if(istype(target, /obj/item)) + var/obj/item/O = target + if(!(O.item_flags & ITEM_FLAG_NO_BLUDGEON) && reagents) reagents.apply_force(O.force) return ..() diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 57e2f24334d..90910e46f45 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -24,7 +24,7 @@ amount_per_transfer_from_this = 0.2 possible_transfer_amounts = list(0.2, 1, 2, 3, 4) - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/datum/weakref/attached_mob diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 31380be997c..26bfeaa6ca6 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -5,7 +5,7 @@ drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' contained_sprite = TRUE - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. var/bitesize = 1 diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 87f2a5dccae..3e00ace639e 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -15,7 +15,7 @@ var/list/can_size_overrides = list("x" = 0, "y" = -3) // position of the can's opening - make sure to take away 16 from X and 23 from Y volume = 40 //just over one and a half cups amount_per_transfer_from_this = 5 - flags = 0 //starts closed + atom_flags = 0 //starts closed icon = 'icons/obj/item/reagent_containers/food/drinks/soda.dmi' drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 170dcc2d1dc..0aef9a4a404 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -10,7 +10,7 @@ desc = "Just your average condiment container." icon = 'icons/obj/item/reagent_containers/food/condiment.dmi' icon_state = "emptycondiment" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER possible_transfer_amounts = list(1,5,10) center_of_mass = list("x"=16, "y"=6) volume = 50 diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index ed23fb121d0..e5348ee8a36 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -17,7 +17,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e pickup_sound = 'sound/items/pickup/bottle.ogg' icon_state = null item_state = "glass_empty" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER amount_per_transfer_from_this = 5 volume = 50 var/shaken = 0 @@ -52,17 +52,17 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e /obj/item/reagent_containers/food/drinks/proc/open(mob/user as mob) playsound(loc,'sound/items/soda_open.ogg', rand(10,50), 1) user.visible_message("[user] opens \the [src].", SPAN_NOTICE("You open \the [src] with an audible pop!"), "You can hear a pop.") - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER /obj/item/reagent_containers/food/drinks/proc/boom(mob/user as mob) user.visible_message("\The [src] explodes all over [user] as they open it!","\The [src] explodes all over you as you open it!","You can hear a soda can explode.") playsound(loc,'sound/items/Soda_Burst.ogg', rand(20,50), 1) reagents.clear_reagents() - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER shaken = 0 /obj/item/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) - if(force && !(flags & NOBLUDGEON) && user.a_intent == I_HURT) + if(force && !(atom_flags & ITEM_FLAG_NO_BLUDGEON) && user.a_intent == I_HURT) return ..() return 0 @@ -223,7 +223,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e and 'Martian Water' has become a prized collector's item." icon = 'icons/obj/item/reagent_containers/food/drinks/soda.dmi' // it's no soda, but shows up in vending machines nonetheless icon_state = "smallbottle" - flags = 0 //starts closed + atom_flags = 0 //starts closed center_of_mass = list("x"=16, "y"=8) drop_sound = 'sound/items/drop/disk.ogg' pickup_sound = 'sound/items/pickup/disk.ogg' @@ -350,7 +350,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e if(cap) to_chat(user, SPAN_NOTICE("You remove \the [src]'s [cap].")) user.put_in_hands(cap) - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER cap = null playsound(src.loc, /singleton/sound_category/shaker_lid_off, 50, 1) update_icon() @@ -380,7 +380,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e return TRUE to_chat(user, SPAN_NOTICE("You put \the [W] onto \the [src].")) user.drop_from_inventory(W, src) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER cap = W playsound(src.loc, /singleton/sound_category/shaker_lid_off, 50, 1) update_icon() diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index ce3ae272019..c3a863ff5e8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -108,7 +108,7 @@ to_chat(user, "You stuff [R] into [src].") rag = R rag.forceMove(src) - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER update_icon() /obj/item/reagent_containers/food/drinks/bottle/proc/remove_rag(mob/user) @@ -116,14 +116,14 @@ return user.put_in_hands(rag) rag = null - flags |= (initial(flags) & OPENCONTAINER) + atom_flags |= (initial(atom_flags) & ATOM_FLAG_OPEN_CONTAINER) update_icon() /obj/item/reagent_containers/food/drinks/bottle/proc/delete_rag() if(!rag) return QDEL_NULL(rag) - flags |= (initial(flags) & OPENCONTAINER) + atom_flags |= (initial(atom_flags) & ATOM_FLAG_OPEN_CONTAINER) update_icon() /obj/item/reagent_containers/food/drinks/bottle/open(mob/user) @@ -342,7 +342,7 @@ icon_state = "champagnebottle" center_of_mass = list("x"=16, "y"=4) reagents_to_add = list(/singleton/reagent/alcohol/champagne = 100) - flags = 0 // starts closed + atom_flags = 0 // starts closed ///Used for sabrage; increases the chance of success per 1 force of the attacking sharp item var/sabrage_success_percentile = 5 ///Whether this bottle was a victim of a successful sabrage attempt @@ -423,7 +423,7 @@ SPAN_GOOD("You elegantly slice the cork off of [src], causing it to fly off the bottle with great force."), \ "You can hear a pop.") playsound(src, 'sound/items/champagne_pop.ogg', 70, TRUE) - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER update_icon() make_froth(offset_x = 0, offset_y = sabraged ? 13 : 15, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed ///Type of cork to fire away @@ -618,7 +618,7 @@ empty_icon_state = "soda_empty" center_of_mass = list("x"=16, "y"=6) volume = 30 - flags = 0 //starts closed + atom_flags = 0 //starts closed reagents_to_add = list(/singleton/reagent/drink/space_cola = 30) /obj/item/reagent_containers/food/drinks/bottle/space_up @@ -657,7 +657,7 @@ icon_state = "beer" volume = 30 smash_duration = 1 - flags = 0 //starts closed + atom_flags = 0 //starts closed rag_underlay = "rag_small" center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/reagents/reagent_containers/food/drinks/flask.dm b/code/modules/reagents/reagent_containers/food/drinks/flask.dm index ea23df709cf..1fbc6ab68e2 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/flask.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/flask.dm @@ -32,13 +32,13 @@ /obj/item/reagent_containers/food/drinks/flask/vacuumflask/Initialize() . = ..() cup = new(src) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER /obj/item/reagent_containers/food/drinks/flask/vacuumflask/attack_self(mob/user) if(cup) to_chat(user, SPAN_NOTICE("You remove \the [src]'s cap.")) user.put_in_hands(cup) - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER cup = null update_icon() @@ -52,7 +52,7 @@ return TRUE to_chat(user, SPAN_NOTICE("You put the cap onto \the [src].")) user.drop_from_inventory(W, src) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER cup = W cup.reagents.trans_to_holder(reagents, cup.reagents.total_volume) update_icon() diff --git a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm index 0b4429724f8..8b55de835f5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm @@ -10,7 +10,8 @@ matter = list(MATERIAL_IRON = 10) possible_transfer_amounts = null volume = 5 - flags = CONDUCT | OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER + obj_flags = OBJ_FLAG_CONDUCTABLE /obj/item/reagent_containers/food/drinks/trophy/gold_cup name = "gold cup" diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 6ca71417ab1..2cbe667a5f0 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -11,7 +11,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube name = "monkey cube" desc = "Just add water!" - flags = 0 + atom_flags = 0 icon = 'icons/obj/item/reagent_containers/food/processed.dmi' icon_state = "monkeycube" bitesize = 12 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index d4cd50a0d6b..6cbd8df4a18 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -13,7 +13,7 @@ volume = 60 accuracy = 0.1 w_class = ITEMSIZE_SMALL - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER fragile = 2 unacidable = 1 //glass doesn't dissolve in acid drop_sound = 'sound/items/drop/bottle.ogg' @@ -64,10 +64,10 @@ ..() if(is_open_container()) to_chat(usr, "You put the lid on \the [src].") - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER else to_chat(usr, "You take the lid off \the [src].") - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER update_icon() /obj/item/reagent_containers/glass/AltClick(var/mob/user) @@ -168,7 +168,7 @@ matter = list(MATERIAL_GLASS = 500) volume = 60 amount_per_transfer_from_this = 10 - flags = OPENCONTAINER | NOREACT + atom_flags = ATOM_FLAG_OPEN_CONTAINER | ATOM_FLAG_NO_REACT fragile = 0 /obj/item/reagent_containers/glass/beaker/bluespace @@ -250,7 +250,7 @@ amount_per_transfer_from_this = 120 possible_transfer_amounts = list(5,10,15,25,30,50,60,100,120,250,300) volume = 300 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER unacidable = 0 drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 7ca2ddc3269..506f1736a22 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -9,7 +9,7 @@ filling_states = "20;40;60;80;100" amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5,10,15,25,30,60) - flags = 0 + atom_flags = 0 volume = 60 /obj/item/reagent_containers/glass/bottle/on_reagent_change() @@ -234,7 +234,7 @@ desc = "A small bottle dispenser." icon_state = "syrup" filling_states = "20;40;60;80;100" - flags = POURCONTAINER + atom_flags = ATOM_FLAG_POUR_CONTAINER volume = 50 /obj/item/reagent_containers/glass/bottle/syrup/chocolate diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm index 7fe1bafc3bc..b3b6f45c97d 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm @@ -2,7 +2,7 @@ /obj/item/reagent_containers/glass/bottle/robot amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50,100) - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER volume = 60 fragile = 0 // do NOT shatter var/reagent = /singleton/reagent/ diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index e99f5855f9d..0a19289e30e 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -210,7 +210,8 @@ name = "metal coffee cup" desc = "A metal coffee cup. You're not sure which metal." icon_state = "coffeecup_metal" - flags = OPENCONTAINER | CONDUCT + atom_flags = ATOM_FLAG_OPEN_CONTAINER + obj_flags = OBJ_FLAG_CONDUCTABLE fragile = 0 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass @@ -253,7 +254,8 @@ name = "tall metal coffee cup" desc = "An unreasonably tall coffee cup, for when you really need to wake up in the morning. This one is made of metal." icon_state = "coffeecup_tall_metal" - flags = OPENCONTAINER | CONDUCT + atom_flags = ATOM_FLAG_OPEN_CONTAINER + obj_flags = OBJ_FLAG_CONDUCTABLE fragile = 0 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/rainbow diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 206d4be3920..2f7a20b56e6 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -15,7 +15,7 @@ unacidable = 1 volume = 15 possible_transfer_amounts = list(5, 10, 15) - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER slot_flags = SLOT_BELT drop_sound = 'sound/items/drop/gun.ogg' pickup_sound = 'sound/items/pickup/gun.ogg' @@ -129,7 +129,7 @@ name = "[name] ([name_label])" verbs += /atom/proc/remove_label if(reagents_to_add) - flags = 0 + atom_flags = 0 spent = FALSE update_icon() @@ -157,7 +157,7 @@ if(LAZYLEN(reagents.reagent_volumes)) to_chat(user, SPAN_NOTICE("With a quick twist of \the [src]'s lid, you secure the reagents inside.")) spent = FALSE - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER update_icon() else to_chat(user, SPAN_NOTICE("You can't secure \the [src] without putting reagents in!")) @@ -167,7 +167,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/attackby(obj/item/W, mob/user) if(W.isscrewdriver() && !is_open_container()) to_chat(user, SPAN_NOTICE("Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER update_icon() return TRUE . = ..() @@ -215,12 +215,12 @@ name_label = "coagzolug" desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one contains coagzolug, a quick-acting blood coagulant that will slow bleeding for as long as it's within the bloodstream." volume = 5 - flags = 0 + atom_flags = 0 reagents_to_add = list(/singleton/reagent/coagzolug = 5) /obj/item/reagent_containers/hypospray/autoinjector/hyronalin name_label = "hyronalin" - flags = 0 + atom_flags = 0 reagents_to_add = list(/singleton/reagent/hyronalin = 5) /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm index ca99be1178f..96a843f81a1 100644 --- a/code/modules/reagents/reagent_containers/inhaler.dm +++ b/code/modules/reagents/reagent_containers/inhaler.dm @@ -13,7 +13,7 @@ volume = 5 w_class = ITEMSIZE_SMALL possible_transfer_amounts = null - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER slot_flags = SLOT_BELT center_of_mass = null var/name_label @@ -27,7 +27,7 @@ name = "[name] ([name_label])" verbs += /atom/proc/remove_label if(reagents_to_add) - flags = 0 + atom_flags = 0 spent = FALSE update_icon() @@ -114,7 +114,7 @@ if(is_open_container()) if(LAZYLEN(reagents.reagent_volumes)) to_chat(user,"With a quick twist of \the [src]'s lid, you secure the reagents inside.") - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER spent = FALSE update_icon() else @@ -126,7 +126,7 @@ /obj/item/reagent_containers/inhaler/attackby(obj/item/W, mob/user) if(W.isscrewdriver() && !is_open_container()) to_chat(user,"Using \the [W], you unsecure the inhaler's lid.") // it locks shut after being secured - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER update_icon() return TRUE . = ..() @@ -156,7 +156,7 @@ /obj/item/reagent_containers/inhaler/dexalin name_label = "dexalin" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains dexalin." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/dexalin/Initialize() . =..() @@ -167,7 +167,7 @@ /obj/item/reagent_containers/inhaler/peridaxon name_label = "peridaxon" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains peridaxon." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/peridaxon/Initialize() . =..() @@ -178,7 +178,7 @@ /obj/item/reagent_containers/inhaler/hyperzine name_label = "hyperzine" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains hyperzine." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/hyperzine/Initialize() . =..() @@ -189,7 +189,7 @@ /obj/item/reagent_containers/inhaler/xuxigas name_label = "xu'xi gas" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains xu'xi gas." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/xuxigas/Initialize() . =..() @@ -200,7 +200,7 @@ /obj/item/reagent_containers/inhaler/phoron name_label = "phoron" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains phoron." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/phoron/Initialize() . =..() @@ -212,7 +212,7 @@ name = "vaurca autoinhaler (phoron)" desc = "A strange device that contains some sort of heavy-duty bag and mouthpiece combo." icon_state = "anthaler1" - flags = 0 + atom_flags = 0 volume = 10 var/empty_state = "anthaler0" @@ -226,7 +226,7 @@ name_label = "soporific" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains soporific." volume = 10 - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/soporific/Initialize() . =..() @@ -237,7 +237,7 @@ /obj/item/reagent_containers/inhaler/space_drugs name_label = "space drugs" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains space drugs." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/space_drugs/Initialize() . =..() @@ -248,7 +248,7 @@ /obj/item/reagent_containers/inhaler/ammonia name_label = "ammonia" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains ammonia." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/ammonia/Initialize() . =..() @@ -259,7 +259,7 @@ /obj/item/reagent_containers/inhaler/pulmodeiectionem name_label = "pulmodeiectionem" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pulmodeiectionem." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/pulmodeiectionem/Initialize() . =..() @@ -271,7 +271,7 @@ name_label = "pneumalin" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one contains pneumalin." volume = 10 - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/pneumalin/Initialize() . =..() @@ -282,7 +282,7 @@ /obj/item/reagent_containers/inhaler/raskara_dust name_label = "unmarked autoinhaler" desc = "A rapid and safe way to administer small amounts of drugs into the lungs by untrained or trained personnel. This one is unmarked." - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/inhaler/raskara_dust/Initialize() . =..() diff --git a/code/modules/reagents/reagent_containers/inhaler_advanced.dm b/code/modules/reagents/reagent_containers/inhaler_advanced.dm index 56aa29b5099..05e88c1febc 100644 --- a/code/modules/reagents/reagent_containers/inhaler_advanced.dm +++ b/code/modules/reagents/reagent_containers/inhaler_advanced.dm @@ -13,7 +13,7 @@ unacidable = 1 amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5,10,15) - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER slot_flags = SLOT_BELT origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2) matter = list(DEFAULT_WALL_MATERIAL = 250) @@ -53,7 +53,7 @@ if(is_open_container()) if(LAZYLEN(reagents.reagent_volumes)) to_chat(user,"With a quick twist of \the [src]'s lid, you secure the reagents inside.") - flags &= ~OPENCONTAINER + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER else to_chat(user,"You can't secure \the [src] without putting reagents in!") else @@ -63,7 +63,7 @@ /obj/item/reagent_containers/personal_inhaler_cartridge/attackby(obj/item/W, mob/user) if(W.isscrewdriver() && !is_open_container()) to_chat(user,"Using \the [W], you unsecure the inhaler cartridge's lid.") // it locks shut after being secured - flags |= OPENCONTAINER + atom_flags |= ATOM_FLAG_OPEN_CONTAINER return . = ..() @@ -219,7 +219,7 @@ /obj/item/reagent_containers/personal_inhaler_cartridge/large/hyperzine/Initialize() . = ..() reagents.add_reagent(/singleton/reagent/hyperzine, 30) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER update_icon() return @@ -229,6 +229,6 @@ /obj/item/reagent_containers/personal_inhaler_cartridge/large/inaprovaline/Initialize() . = ..() reagents.add_reagent(/singleton/reagent/inaprovaline, 30) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER update_icon() return diff --git a/code/modules/reagents/reagent_containers/ladle.dm b/code/modules/reagents/reagent_containers/ladle.dm index d9bd38c3c15..295c495101a 100644 --- a/code/modules/reagents/reagent_containers/ladle.dm +++ b/code/modules/reagents/reagent_containers/ladle.dm @@ -8,7 +8,8 @@ w_class = ITEMSIZE_SMALL volume = 30 force = 6 - flags = OPENCONTAINER | NOBLUDGEON + atom_flags = ATOM_FLAG_OPEN_CONTAINER + item_flags = ITEM_FLAG_NO_BLUDGEON drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' center_of_mass = list("x"=14, "y"=6) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 5e42990e42c..63010139ddd 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -9,7 +9,8 @@ icon_state = "cleaner" item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) - flags = OPENCONTAINER|NOBLUDGEON + atom_flags = ATOM_FLAG_OPEN_CONTAINER + item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/reagents/reagent_containers/tooth_paste.dm b/code/modules/reagents/reagent_containers/tooth_paste.dm index 7dd4349527b..6ae1fc39582 100644 --- a/code/modules/reagents/reagent_containers/tooth_paste.dm +++ b/code/modules/reagents/reagent_containers/tooth_paste.dm @@ -3,7 +3,7 @@ desc = "A simple tube full of toothpaste." icon = 'icons/obj/chemical.dmi' icon_state = "toothpaste" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER possible_transfer_amounts = null amount_per_transfer_from_this = 5 volume = 20 @@ -27,7 +27,7 @@ desc = "An essential tool in dental hygiene." icon = 'icons/obj/chemical.dmi' icon_state = "toothbrush_b" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER possible_transfer_amounts = null amount_per_transfer_from_this = 5 volume = 5 @@ -68,7 +68,7 @@ if(!reagents.total_volume) to_chat(user, "The [initial(name)] is dry!") else if(reagents.total_volume) - if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT)) + if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) user.do_attack_animation(src) user.visible_message("[user] is trying to brush \the [target]'s teeth \the [src]!") playsound(loc, 'sound/effects/toothbrush.ogg', 15, 1) diff --git a/code/modules/reagents/reagent_containers/welding_backpack.dm b/code/modules/reagents/reagent_containers/welding_backpack.dm index e474428ca44..d886dcf3f57 100644 --- a/code/modules/reagents/reagent_containers/welding_backpack.dm +++ b/code/modules/reagents/reagent_containers/welding_backpack.dm @@ -29,12 +29,12 @@ /obj/item/reagent_containers/weldpack/attackby(obj/item/W, mob/user) if(W.iswrench()) - if(flags & OPENCONTAINER) - flags &= ~OPENCONTAINER + if(atom_flags & ATOM_FLAG_OPEN_CONTAINER) + atom_flags &= ~ATOM_FLAG_OPEN_CONTAINER else - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER playsound(src, W.usesound, 70) - to_chat(user, SPAN_NOTICE("You wrench \the [src]'s fuel cap [(flags & OPENCONTAINER) ? "open" : "closed"].")) + to_chat(user, SPAN_NOTICE("You wrench \the [src]'s fuel cap [(atom_flags & ATOM_FLAG_OPEN_CONTAINER) ? "open" : "closed"].")) return else if(W.iswelder()) var/obj/item/weldingtool/T = W diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index d6e0d928beb..840c09dd987 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -77,11 +77,11 @@ START_PROCESSING(SSprocessing,src) else if(accept_any_reagent) - if(flags & OPENCONTAINER) + if(atom_flags & ATOM_FLAG_OPEN_CONTAINER) user.visible_message(SPAN_NOTICE("[user] wrenches the inlet cap on \the [src] shut."), SPAN_NOTICE("You wrench the inlet cap back on \the [src].")) else user.visible_message(SPAN_NOTICE("[user] unwrenches the inlet cap from \the [src]."), SPAN_NOTICE("You unwrench the inlet cap from \the [src].")) - flags ^= OPENCONTAINER + atom_flags ^= ATOM_FLAG_OPEN_CONTAINER return /obj/structure/reagent_dispensers/process() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 97cd3418689..8cc7c31a100 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -6,7 +6,6 @@ var/obj/wrapped = null density = 1 var/sortTag = null - flags = NOBLUDGEON mouse_drag_pointer = MOUSE_ACTIVE_POINTER var/examtext = null var/nameset = 0 @@ -256,7 +255,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT /obj/item/device/destTagger/proc/openwindow(mob/user as mob) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index d5833c84be6..698e214c027 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). name = "circuit imprinter" desc = "An advanced device that can only be operated via a nearby RnD console, it can print any circuitboard the user requests, provided it has the correct materials to do so." icon_state = "circuit_imprinter" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, MATERIAL_GLASS = 0, MATERIAL_GOLD = 0, MATERIAL_SILVER = 0, MATERIAL_PHORON = 0, MATERIAL_URANIUM = 0, MATERIAL_DIAMOND = 0) var/list/datum/design/queue = list() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 19e77f59b14..da2c5c51c25 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -2,7 +2,7 @@ name = "protolathe" desc = "An upgraded variant of a common Autolathe, this can only be operated via a nearby RnD console, but can manufacture cutting edge technology, provided it has the design and the correct materials." icon_state = "protolathe" - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER idle_power_usage = 30 active_power_usage = 5000 diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index f69880c4e28..b077321b5c4 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -11,7 +11,7 @@ amount_per_transfer_from_this = 1 possible_transfer_amounts = list(1, 2) volume = 2 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER /obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/living/user as mob) if(W.ispen()) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 06dde2cf4e6..2ee97ec2d39 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -4,7 +4,7 @@ desc = "A specialised, complex scanner for gleaning information on all manner of small things." anchored = 1 density = 1 - flags = OPENCONTAINER + atom_flags = ATOM_FLAG_OPEN_CONTAINER icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "spectrometer" diff --git a/code/modules/shieldgen/shieldwallgen.dm b/code/modules/shieldgen/shieldwallgen.dm index e93e39c7876..48de60da10a 100644 --- a/code/modules/shieldgen/shieldwallgen.dm +++ b/code/modules/shieldgen/shieldwallgen.dm @@ -19,7 +19,7 @@ var/check_delay = 10 var/locked = TRUE var/storedpower = 0 - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE //There have to be at least two posts, so these are effectively doubled var/power_draw = 30000 //30 kW. How much power is drawn from powernet. Increase this to allow the generator to sustain longer shields, at the cost of more power draw. diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 3fbe029c78f..2eab5d17e61 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -181,7 +181,7 @@ if((flags & SHUTTLE_FLAGS_ZERO_G)) var/new_grav = 1 - if(destination.flags & SLANDMARK_FLAG_ZERO_G) + if(destination.landmark_flags & SLANDMARK_FLAG_ZERO_G) var/area/new_area = get_area(destination) new_grav = new_area.has_gravity for(var/area/our_area in shuttle_area) diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 3920b6a4296..f2cb088209c 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -89,7 +89,7 @@ layer = 5 climbable = FALSE //flipping tables allows them to be used as makeshift barriers flipped = 1 - flags |= ON_BORDER + atom_flags |= ATOM_FLAG_CHECKS_BORDER for(var/D in list(turn(direction, 90), turn(direction, -90))) var/obj/structure/table/T = locate() in get_step(src,D) if(T && T.flipped == 0 && material && T.material && T.material.name == material.name) @@ -107,7 +107,7 @@ layer = initial(layer) flipped = 0 climbable = initial(climbable) - flags &= ~ON_BORDER + atom_flags &= ~ATOM_FLAG_CHECKS_BORDER for(var/D in list(turn(dir, 90), turn(dir, -90))) var/obj/structure/table/T = locate() in get_step(src.loc,D) if(T && T.flipped == 1 && T.dir == src.dir && material && T.material&& T.material.name == material.name) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index ecf3544e8b8..7c80c49d076 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -107,7 +107,7 @@ desc = "Use this to send crates and closets to cargo telepads." icon = 'icons/obj/telescience.dmi' icon_state = "rcs" - flags = CONDUCT + obj_flags = OBJ_FLAG_CONDUCTABLE force = 10 throwforce = 10 throw_speed = 2 diff --git a/html/changelogs/GeneralCamo - Flag split.yml b/html/changelogs/GeneralCamo - Flag split.yml new file mode 100644 index 00000000000..ccb691611ab --- /dev/null +++ b/html/changelogs/GeneralCamo - Flag split.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Split and rename flag variables to be easier to work with in the future." + - bugfix: "Fixed monocles and standard HUDs being considered airtight and chemical blocking." diff --git a/maps/_common/areas/ai.dm b/maps/_common/areas/ai.dm index cff2129399f..d10f205031d 100644 --- a/maps/_common/areas/ai.dm +++ b/maps/_common/areas/ai.dm @@ -15,7 +15,7 @@ /area/turret_protected station_area = 1 - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/turret_protected/ai_upload name = "AI Upload Chamber" diff --git a/maps/_common/areas/asteroid_areas.dm b/maps/_common/areas/asteroid_areas.dm index 2a719d1016c..1debc39055b 100644 --- a/maps/_common/areas/asteroid_areas.dm +++ b/maps/_common/areas/asteroid_areas.dm @@ -12,7 +12,7 @@ /area/mine/unexplored name = "Mine" icon_state = "unexplored" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP // Smalls /area/outpost diff --git a/maps/_common/areas/holodeck.dm b/maps/_common/areas/holodeck.dm index 02c91d872ea..a04c9c85466 100644 --- a/maps/_common/areas/holodeck.dm +++ b/maps/_common/areas/holodeck.dm @@ -5,7 +5,7 @@ no_light_control = TRUE station_area = TRUE dynamic_lighting = FALSE - flags = NO_GHOST_TELEPORT_ACCESS + area_flags = AREA_FLAG_NO_GHOST_TELEPORT_ACCESS /area/holodeck/alphadeck name = "Holodeck Alpha" diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm index a1b8b81e5af..8884a885ff2 100644 --- a/maps/_common/areas/shuttles.dm +++ b/maps/_common/areas/shuttles.dm @@ -7,7 +7,7 @@ requires_power = 0 sound_env = SMALL_ENCLOSED no_light_control = 1 - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF centcomm_area = 1 /area/shuttle/arrival @@ -66,17 +66,17 @@ /area/shuttle/burglar name = "Unidentified Transport" - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED /area/shuttle/skipjack - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED /area/shuttle/mercenary - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED /area/shuttle/syndicate_elite name = "Naval Transport Shuttle" - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED /area/shuttle/administration name = "Unidentified Corvette" @@ -90,7 +90,7 @@ /area/shuttle/legion name = "Foreign Legion Shuttle" base_turf = /turf/unsimulated/floor/plating - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED /area/shuttle/distress name = "Unidentified Shuttle" @@ -100,4 +100,4 @@ name = "Merchant Ship" base_turf = /turf/space sound_env = LARGE_ENCLOSED - flags = RAD_SHIELDED | SPAWN_ROOF | NO_CREW_EXPECTED + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm index eae02c96b4a..e77aa5dae13 100644 --- a/maps/_common/areas/special.dm +++ b/maps/_common/areas/special.dm @@ -5,7 +5,7 @@ name = "CentComm Solitary Confinement" icon_state = "brig" centcomm_area = 1 - flags = PRISON + area_flags = AREA_FLAG_PRISON /area/centcom name = "Centcom" @@ -79,7 +79,7 @@ /area/centcom/legion name = "BLV The Tower - Deck 1" icon_state = "blvtower" - flags = NO_CREW_EXPECTED + area_flags = AREA_FLAG_NO_CREW_EXPECTED /area/centcom/legion/hangar5 name = "BLV The Tower - Hangar 5" @@ -98,7 +98,7 @@ dynamic_lighting = 1 no_light_control = 1 centcomm_area = 1 - flags = NO_CREW_EXPECTED + area_flags = AREA_FLAG_NO_CREW_EXPECTED ambience = AMBIENCE_HIGHSEC /area/merchant_station/warehouse @@ -114,7 +114,7 @@ requires_power = FALSE no_light_control = TRUE centcomm_area = TRUE - flags = NO_CREW_EXPECTED + area_flags = AREA_FLAG_NO_CREW_EXPECTED /area/antag/mercenary name = "Mercenary Barracks" @@ -155,7 +155,7 @@ sound_env = ARENA no_light_control = 1 centcomm_area = 1 - flags = NO_CREW_EXPECTED + area_flags = AREA_FLAG_NO_CREW_EXPECTED /area/tdome/tdome1 name = "Thunderdome (Team 1)" @@ -178,31 +178,31 @@ /area/dungeon/crashed_ship name = "Derelict Ship" icon_state = "yellow" - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF /area/dungeon/tomb name = "Burial Chamber" icon_state = "yellow" - flags = SPAWN_ROOF + area_flags = AREA_FLAG_SPAWN_ROOF /area/dungeon/syndie_listening_post name = "Abandoned Listening Post" icon_state = "red" - flags = SPAWN_ROOF + area_flags = AREA_FLAG_SPAWN_ROOF requires_power = 0 no_light_control = 1 /area/dungeon/anomaly_outpost name = "Xenoarchaeological Outpost" icon_state = "anomaly" - flags = SPAWN_ROOF + area_flags = AREA_FLAG_SPAWN_ROOF requires_power = 0 no_light_control = 1 /area/dungeon/sol_outpost name = "Solarian Outpost" icon_state = "red" - flags = SPAWN_ROOF + area_flags = AREA_FLAG_SPAWN_ROOF requires_power = 0 no_light_control = 1 @@ -214,12 +214,12 @@ /area/dungeon/skrell_ship name = "Crashed Skrell Ship" icon_state = "purple" - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF /area/dungeon/bluespace_outpost name = "Bluespace Outpost" icon_state = "purple" - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF //Away ships, third party ships, etc. Mostly for the ships that are expected to move on the overmap and/or have ghost roles. /area/ship @@ -228,4 +228,4 @@ requires_power = 0 sound_env = STANDARD_STATION no_light_control = 1 - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF diff --git a/maps/_common/areas/station/civilian.dm b/maps/_common/areas/station/civilian.dm index 0c217fe2858..15d1dd164a4 100644 --- a/maps/_common/areas/station/civilian.dm +++ b/maps/_common/areas/station/civilian.dm @@ -2,7 +2,7 @@ /area/crew_quarters name = "Dormitories" icon_state = "Sleep" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED station_area = 1 holomap_color = HOLOMAP_AREACOLOR_CIVILIAN @@ -104,7 +104,7 @@ name = "Bar - Sublevel" icon_state = "red" sound_env = TUNNEL_ENCLOSED - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/crew_quarters/theatre name = "Theatre" diff --git a/maps/_common/areas/station/command.dm b/maps/_common/areas/station/command.dm index 25fe8e73808..0e61736c37a 100644 --- a/maps/_common/areas/station/command.dm +++ b/maps/_common/areas/station/command.dm @@ -18,7 +18,7 @@ /area/bridge/aibunker name = "Command - Bunker" icon_state = "ai_foyer" - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP /area/bridge/centcom_meetingroom name = "Level A Meeting Room" @@ -48,7 +48,7 @@ /area/bridge/controlroom // Horizon. name = "Command - Control Room" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/crew_quarters/captain name = "Command - Captain's Office" diff --git a/maps/_common/areas/station/maintenance.dm b/maps/_common/areas/station/maintenance.dm index 2587595b563..116f5628a16 100644 --- a/maps/_common/areas/station/maintenance.dm +++ b/maps/_common/areas/station/maintenance.dm @@ -1,7 +1,7 @@ //Maintenance /area/maintenance - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP sound_env = TUNNEL_ENCLOSED turf_initializer = new /datum/turf_initializer/maintenance() ambience = AMBIENCE_MAINTENANCE @@ -229,7 +229,7 @@ /area/maintenance/interstitial_construction_site name = "Construction Zone" icon_state = "engineering_workshop" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/maintenance/interstitial_construction_site/zone_2 name = "Secondary Construction Zone" diff --git a/maps/_common/areas/station/research.dm b/maps/_common/areas/station/research.dm index dc725726579..a8a29e3dee0 100644 --- a/maps/_common/areas/station/research.dm +++ b/maps/_common/areas/station/research.dm @@ -85,7 +85,7 @@ /area/rnd/xenobiology/cells name = "Research - Xenobiology Cell" no_light_control = TRUE - flags = RAD_SHIELDED | SPAWN_ROOF + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF /area/rnd/xenobiology/cells/alpha name = "Research - Xenobiology Alpha" @@ -165,7 +165,7 @@ /area/rnd/test_range name = "Research - Weapons Testing Range" - flags = FIRING_RANGE + area_flags = AREA_FLAG_FIRING_RANGE /area/toxins station_area = 1 diff --git a/maps/_common/areas/station/security.dm b/maps/_common/areas/station/security.dm index db8289602ad..0d8272e9278 100644 --- a/maps/_common/areas/station/security.dm +++ b/maps/_common/areas/station/security.dm @@ -20,7 +20,7 @@ /area/security/brig name = "Security - Brig" lightswitch = TRUE - flags = PRISON + area_flags = AREA_FLAG_PRISON icon_state = "brig" /area/security/brig/prison_break() @@ -50,7 +50,7 @@ /area/security/prison name = "Security - Prison Wing" lightswitch = TRUE - flags = PRISON + area_flags = AREA_FLAG_PRISON icon_state = "sec_prison" /area/security/prison/prison_break() @@ -129,7 +129,7 @@ /area/security/range name = "Security - Firing Range" icon_state = "firingrange" - flags = FIRING_RANGE + area_flags = AREA_FLAG_FIRING_RANGE no_light_control = 0 /area/security/tactical @@ -165,7 +165,7 @@ icon_state = "nuke_storage" ambience = AMBIENCE_HIGHSEC holomap_color = null - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP no_light_control = 0 /area/security/checkpoint @@ -212,7 +212,7 @@ icon_state = "security" icon_state = "security" holomap_color = null - flags = HIDE_FROM_HOLOMAP | PRISON + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_PRISON sound_env = LARGE_ENCLOSED ambience = AMBIENCE_HIGHSEC diff --git a/maps/away/away_site/abandoned_mining/cursed.dm b/maps/away/away_site/abandoned_mining/cursed.dm index 68152e4b419..4d83890a496 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dm +++ b/maps/away/away_site/abandoned_mining/cursed.dm @@ -22,7 +22,7 @@ name="cursed station" icon_state = "outpost_mine_main" requires_power = TRUE - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/cursed/hangar name="hangar" diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm index cfe6621d315..e1b9813e16b 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm @@ -60,7 +60,7 @@ landmark_tag = "nav_crashed_elyran_tanker_west" /area/crashed_elyran_tanker - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP // ---------------- areas /area/crashed_elyran_tanker/bridge diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant_areas.dm b/maps/away/away_site/konyang/point_verdant/point_verdant_areas.dm index db1a5367f2f..4ecb14f3864 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant_areas.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant_areas.dm @@ -2,7 +2,7 @@ name = "Point Verdant - Conglomerate Spaceport" requires_power = 0 no_light_control = 1 - flags = HIDE_FROM_HOLOMAP | RAD_SHIELDED + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_RAD_SHIELDED base_turf = /turf/simulated/floor/exoplanet/dirt_konyang ambience = AMBIENCE_KONYANG_TRAFFIC sound_env = CITY diff --git a/maps/away/away_site/magshield/magshield_areas.dm b/maps/away/away_site/magshield/magshield_areas.dm index da44c764d20..266cc2f41b2 100644 --- a/maps/away/away_site/magshield/magshield_areas.dm +++ b/maps/away/away_site/magshield/magshield_areas.dm @@ -1,5 +1,5 @@ /area/magshield - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP icon = 'maps/away/away_site/magshield/magshield_sprites.dmi' /area/magshield/south diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm index 2ae4ee1338b..820119e4552 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dm @@ -18,7 +18,7 @@ desc = "An abandoned space structure." /area/overgrown_mining_station - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP name = "Overgrown Mining Station" icon_state = "overgrown_mining_station" requires_power = FALSE diff --git a/maps/away/away_site/racers/racers.dm b/maps/away/away_site/racers/racers.dm index 53f327bb84d..09698f0fcdc 100644 --- a/maps/away/away_site/racers/racers.dm +++ b/maps/away/away_site/racers/racers.dm @@ -20,7 +20,7 @@ comms_name = "station" /area/racers - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP name = "unregistered station" icon_state = "bar" requires_power = FALSE diff --git a/maps/away/away_site/romanovich/grand_romanovich.dm b/maps/away/away_site/romanovich/grand_romanovich.dm index 0949f24b9e1..fd1eb4ed80a 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dm +++ b/maps/away/away_site/romanovich/grand_romanovich.dm @@ -22,7 +22,7 @@ use_common = TRUE /area/grand_romanovich - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP name = "Grand Romanovich Casino" icon_state = "away" requires_power = FALSE diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dm b/maps/away/away_site/sensor_relay/sensor_relay.dm index 0d7ccc7fc74..7875b5bfecf 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dm @@ -31,7 +31,7 @@ icon = 'maps/away/away_site/sensor_relay/sensor_relay_sprites.dmi' name = "Sensor Relay" icon_state = "sensor_relay_area" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP requires_power = TRUE base_turf = /turf/space no_light_control = TRUE diff --git a/maps/away/away_site/shady/shady.dm b/maps/away/away_site/shady/shady.dm index 20272f1cad2..0d95ecab339 100644 --- a/maps/away/away_site/shady/shady.dm +++ b/maps/away/away_site/shady/shady.dm @@ -19,7 +19,7 @@ icon_state = "object" /area/hideout - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP name = "hideout outpost" icon_state = "outpost_mine_main" requires_power = FALSE diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack_areas.dm b/maps/away/away_site/tajara/mining_jack/mining_jack_areas.dm index 8a552adcafd..9ac76be91f1 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack_areas.dm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP /area/mining_jack_outpost/quarters name = "Mining Jack Outpost Crew Quarters" diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm b/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm index 6293c0e3c3b..8a256617ec0 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = TRUE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/peoples_station/barracks name = "People's Space Station Barracks" diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm index d4430d192e0..851f2889ee3 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dm @@ -50,7 +50,7 @@ /area/pra_satellite name = "Hadiist Satellite" icon_state = "research" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED requires_power = TRUE base_turf = /turf/simulated/floor/plating no_light_control = TRUE diff --git a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm index e3998c1ad17..67e9f547c2b 100644 --- a/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm +++ b/maps/away/away_site/tajara/saniorios_smuggler/saniorios_smuggler.dm @@ -49,4 +49,4 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED diff --git a/maps/away/away_site/tajara/scrapper/scrapper_areas.dm b/maps/away/away_site/tajara/scrapper/scrapper_areas.dm index 2447313ea04..69b0a319f00 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper_areas.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP /area/scrapper_base/quarters name = "Scrapper Outpost Crew Quarters" @@ -25,7 +25,7 @@ //Shuttle /area/shuttle/scrapper_ship - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP requires_power = TRUE /area/shuttle/scrapper_ship/bridge diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm index 4c8e0db4e19..bb198edce50 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm @@ -30,7 +30,7 @@ /area/tajara_safehouse name = "Abandoned Outpost" icon_state = "bar" - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP requires_power = FALSE base_turf = /turf/simulated/floor/plating no_light_control = TRUE diff --git a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm index 9083fdb6f51..d6d9e9ddd0e 100644 --- a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm +++ b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dm @@ -25,7 +25,7 @@ /area/shuttle/unathi_pirate_izharshan name = "Izharshan Freighter" requires_power = TRUE - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/shuttle/unathi_pirate_izharshan/operations name = "Izharshan Freighter Operations" diff --git a/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa_areas.dm b/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa_areas.dm index 13dd9f07eae..4708ffa75c9 100644 --- a/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa_areas.dm +++ b/maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/tarwa_ship/hangar name = "Tarwa Conglomerate Freighter - Hangar" diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm index d4ea503cb38..c05f3211d2b 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm @@ -23,4 +23,4 @@ requires_power = FALSE base_turf = /turf/space no_light_control = TRUE - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor_areas.dm b/maps/away/ships/coc/coc_surveyor/coc_surveyor_areas.dm index ddb72c610e3..171ba005ed1 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor_areas.dm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 1 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/coc_survey_ship/bridge name = "Coalition Survey Ship - Bridge" diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_areas.dm b/maps/away/ships/dpra/hailstorm/hailstorm_areas.dm index 55a7614326f..592c060460a 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_areas.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/hailstorm_ship/bridge name = "Hailstorm Ship Bridge" diff --git a/maps/away/ships/golden_deep/golden_deep_areas.dm b/maps/away/ships/golden_deep/golden_deep_areas.dm index e7de3323e69..0cf198f7b4e 100644 --- a/maps/away/ships/golden_deep/golden_deep_areas.dm +++ b/maps/away/ships/golden_deep/golden_deep_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/golden_deep/hangar name = "Golden Deep Merchant Ship - Hangar" diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette_areas.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette_areas.dm index 41a058b97e1..67c89084108 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette_areas.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 1 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/hegemony_ship/bridge name = "Hegemony Corvette - Bridge" diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_areas.dm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_areas.dm index 20b52ffe112..33e3dc36333 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_areas.dm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/merchants_guild/hangar name = "Merchants' Guild - Hangar" diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_areas.dm b/maps/away/ships/hegemony/miners_guild/miners_guild_areas.dm index 8845d5f6801..50b22d3b637 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_areas.dm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP /area/miners_guild/crew name = "Miners' Guild - Crew Quarters" diff --git a/maps/away/ships/heph/cyclops/cyclops_mining_areas.dm b/maps/away/ships/heph/cyclops/cyclops_mining_areas.dm index 52c8817d7b3..46917fde2c8 100644 --- a/maps/away/ships/heph/cyclops/cyclops_mining_areas.dm +++ b/maps/away/ships/heph/cyclops/cyclops_mining_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/hephmining_ship/cyclops/cyclops_bridge name = "Cyclops Bridge" diff --git a/maps/away/ships/kataphracts/kataphract_areas.dm b/maps/away/ships/kataphracts/kataphract_areas.dm index 4bc300a37ad..7cd1a70ab5e 100644 --- a/maps/away/ships/kataphracts/kataphract_areas.dm +++ b/maps/away/ships/kataphracts/kataphract_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/kataphract_chapter/bridge name = "Kataphract Chapter - Bridge" diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm index 8459969b900..1273b2ccb06 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm @@ -30,7 +30,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/shuttle/einstein_shuttle/helm name = "Einstein Shuttle - Helm" diff --git a/maps/away/ships/konyang/water_barge/water_barge_areas.dm b/maps/away/ships/konyang/water_barge/water_barge_areas.dm index 45cbe9d260a..169c5b66e28 100644 --- a/maps/away/ships/konyang/water_barge/water_barge_areas.dm +++ b/maps/away/ships/konyang/water_barge/water_barge_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/water_barge/helm name = "Water Barge - Helm" diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant_areas.dm b/maps/away/ships/nka/nka_merchant/nka_merchant_areas.dm index 89b30417009..1c79f8ae76a 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant_areas.dm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/nka_merchant/hangar name = "Her Majesty's Mercantile Flotilla Ship Hangar" diff --git a/maps/away/ships/pra/database_freighter/database_freighter_areas.dm b/maps/away/ships/pra/database_freighter/database_freighter_areas.dm index 66a32439873..ee8b431f4e1 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter_areas.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/database_freighter/bridge name = "Database Freighter Bridge" diff --git a/maps/away/ships/pra/headmaster/headmaster_areas.dm b/maps/away/ships/pra/headmaster/headmaster_areas.dm index 4d7e650fe4a..ffdedd7c286 100644 --- a/maps/away/ships/pra/headmaster/headmaster_areas.dm +++ b/maps/away/ships/pra/headmaster/headmaster_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/headmaster_ship/bridge name = "Headmaster Ship Bridge" diff --git a/maps/away/ships/tajara/circus/adhomian_circus_areas.dm b/maps/away/ships/tajara/circus/adhomian_circus_areas.dm index f434c3315b4..152180adece 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus_areas.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus_areas.dm @@ -6,7 +6,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/adhomian_circus/port name = "Adhomian Traveling Circus Port Wing" diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_areas.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_areas.dm index 1141680c872..e1347f23dfb 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_areas.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_areas.dm @@ -5,7 +5,7 @@ dynamic_lighting = 1 no_light_control = 0 base_turf = /turf/space - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/tajaran_smuggler/bridge name = "Adhomian Freighter Bridge" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm index 49eaa79fc8f..6f452993761 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm index 6d87c02f632..2661effb48b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm index 30ca2d8e26e..aa28c8192f0 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm @@ -13,5 +13,5 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm index 392e1d38ac4..50b0b5c446f 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm index 288f4da4680..d936ca54854 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm @@ -14,5 +14,5 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm index a8c47ba0085..74f401440d1 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm @@ -14,4 +14,4 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm index adf7629c8e0..cf3a3f8ee81 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED turf_initializer = new /datum/turf_initializer/maintenance/raskariim() ambience = AMBIENCE_GHOSTLY diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm index b456f75d95b..ed985ccdb04 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm @@ -14,4 +14,4 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm index 0d5c1e00303..4a211a35ecb 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -15,7 +15,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm index c3eb3fe80b2..6998236ccd3 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dm b/maps/random_ruins/exoplanets/adhomai/ala_base.dm index c94ad4fe88c..f2dc3670d88 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index f1aa5f8bdd3..cf4a42cbcb0 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghostroles diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dm b/maps/random_ruins/exoplanets/adhomai/pra_base.dm index f7bc5d97078..c696d571037 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm index 5dcb8f53bc6..c7b4a2b9e3f 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED //ghostroles diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm index b935a19b21b..9178b064f74 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC //ghost roles diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm index 65c50a08db1..34d329118af 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dm @@ -16,7 +16,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/barren - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED /area/burzsia_mining/mess_hall name = "Hephaestus Burzsia Mining Outpost Mess Hall" diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dm b/maps/random_ruins/exoplanets/konyang/landing_zone.dm index 6671ed9d8f1..d84b099cd69 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dm @@ -14,7 +14,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/mineral - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/konyang_landing_zone/command_center name = "SCC Expedition Command Center" diff --git a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm index 94f5ac7faed..8dc9c8e25b1 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm +++ b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm @@ -14,7 +14,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/mineral - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /datum/ghostspawner/human/konyang_moonshine short_name = "konyang_moonshine" diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm index 1f6c2992f54..106e45ae758 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dm @@ -15,7 +15,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/mineral - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/shuttle/konyang_pirate name = "Repaired Shuttle" diff --git a/maps/random_ruins/exoplanets/konyang/village.dm b/maps/random_ruins/exoplanets/konyang/village.dm index 67897c75171..8e25a7601dd 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dm +++ b/maps/random_ruins/exoplanets/konyang/village.dm @@ -14,7 +14,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/mineral - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /datum/ghostspawner/human/konyang_villager short_name = "konyang_villager" diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dm index f1198d02b70..9cc8699b115 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dm @@ -14,7 +14,7 @@ dynamic_lighting = TRUE no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/barren/raskara - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_EXPOUTPOST /area/raskara_okon/observatory diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 76ede394a6b..1692f4c03ae 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -329,7 +329,7 @@ /area/horizon/maintenance name = "Horizon - Maintenance (PARENT AREA - DON'T USE)" icon_state = "maintenance" - flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP sound_env = TUNNEL_ENCLOSED turf_initializer = new /datum/turf_initializer/maintenance() ambience = AMBIENCE_MAINTENANCE @@ -384,7 +384,7 @@ // Stairwells /area/horizon/stairwell name = "Horizon - Stairwell (PARENT AREA - DON'T USE)" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/horizon/stairwell/central @@ -403,7 +403,7 @@ // Crew Quarters /area/horizon/crew_quarters name = "Horizon - Crew Quarters (PARENT AREA - DON'T USE)" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED holomap_color = HOLOMAP_AREACOLOR_CIVILIAN // Cryogenics @@ -482,7 +482,7 @@ // Holodeck /area/horizon/holodeck_control name = "Horizon - Holodeck Alpha" - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED holomap_color = HOLOMAP_AREACOLOR_CIVILIAN /area/horizon/holodeck_control/beta @@ -494,7 +494,7 @@ sound_env = LARGE_ENCLOSED no_light_control = TRUE dynamic_lighting = FALSE - flags = RAD_SHIELDED | NO_GHOST_TELEPORT_ACCESS + area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_NO_GHOST_TELEPORT_ACCESS holomap_color = HOLOMAP_AREACOLOR_CIVILIAN /area/horizon/holodeck/alphadeck @@ -658,7 +658,7 @@ /area/horizon/bar/backroom name = "Horizon - Bar - Backroom" holomap_color = HOLOMAP_AREACOLOR_CIVILIAN - flags = RAD_SHIELDED + area_flags = AREA_FLAG_RAD_SHIELDED // Cafeteria /area/horizon/cafeteria @@ -731,7 +731,7 @@ /area/horizon/security/brig name = "Horizon - Security - Brig" icon_state = "brig" - flags = HIDE_FROM_HOLOMAP | PRISON + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_PRISON ambience = AMBIENCE_HIGHSEC /area/horizon/security/holding_cell_a @@ -745,21 +745,21 @@ /area/horizon/security/head_of_security name = "Horizon - Security - Head of Security's Office" icon_state = "head_quarters" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP ambience = AMBIENCE_HIGHSEC sound_env = SMALL_ENCLOSED /area/horizon/security/warden name = "Horizon - Security - Warden's Office" icon_state = "Warden" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP ambience = AMBIENCE_HIGHSEC sound_env = SMALL_ENCLOSED /area/horizon/security/armoury name = "Horizon - Security - Armoury" icon_state = "Warden" - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP ambience = AMBIENCE_HIGHSEC sound_env = LARGE_ENCLOSED @@ -821,7 +821,7 @@ icon_state = "zta" sound_env = LARGE_ENCLOSED ambience = AMBIENCE_SINGULARITY - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP // Longbow /area/horizon/longbow @@ -829,13 +829,13 @@ icon_state = "bridge_weapon" sound_env = LARGE_ENCLOSED ambience = AMBIENCE_HIGHSEC - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /area/horizon/grauwolf name = "Horizon - Grauwolf Weapon System" icon_state = "bridge_weapon" sound_env = LARGE_ENCLOSED ambience = AMBIENCE_HIGHSEC - flags = HIDE_FROM_HOLOMAP + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP /********** Weapon Systems End **********/ diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm index 3242bd4c51a..9c2d33a85fb 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -94,7 +94,7 @@ /obj/effect/shuttle_landmark/lift/morgue_bottom name = "Morgue Bottom" landmark_tag = "nav_morgue_lift_bottom" - flags = SLANDMARK_FLAG_AUTOSET + landmark_flags = SLANDMARK_FLAG_AUTOSET base_area = /area/medical/morgue/lower base_turf = /turf/simulated/floor/plating @@ -117,7 +117,7 @@ /obj/effect/shuttle_landmark/lift/operations_first_deck name = "Operations Lift - First Deck" landmark_tag = "nav_operations_lift_first_deck" - flags = SLANDMARK_FLAG_AUTOSET + landmark_flags = SLANDMARK_FLAG_AUTOSET base_area = /area/operations/loading base_turf = /turf/simulated/floor/plating @@ -160,7 +160,7 @@ /obj/effect/shuttle_landmark/lift/robotics_first_deck name = "Robotics Lift - First Deck" landmark_tag = "nav_robotics_lift_first_deck" - flags = SLANDMARK_FLAG_AUTOSET + landmark_flags = SLANDMARK_FLAG_AUTOSET base_area = /area/rnd/eva base_turf = /turf/simulated/floor/plating