diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index a20a860b02..f130252434 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -108,7 +108,7 @@ if((M.pipe_flags & pipe_flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. visible_message("\The [src]'s cannot be connected, something is hogging the tile!") return TRUE - if((M.piping_layer != piping_layer) && !((M.pipe_flags | flags) & PIPING_ALL_LAYER)) // Pipes on different layers can't block each other unless they are ALL_LAYER + if((M.piping_layer != piping_layer) && !((M.pipe_flags | atom_flags) & PIPING_ALL_LAYER)) // Pipes on different layers can't block each other unless they are ALL_LAYER continue if(M.get_init_dirs() & get_init_dirs()) // matches at least one direction on either type of pipe visible_message("\The [src]'s connector can't be connected, there is already a pipe at that location!") diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 85550c64d3..477082fb74 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -43,7 +43,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi' /obj/item/proc/can_contaminate() //Clothing and backpacks can be contaminated. - if(flags & PHORONGUARD) + if(item_flags & PHORONGUARD) return 0 else if(istype(src,/obj/item/storage/backpack)) return 0 //Cannot be washed :( @@ -96,7 +96,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi' if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron")) if(!pl_head_protected() || !pl_suit_protected()) burn_skin(0.75) - if(prob(20)) + if(prob(20)) to_chat(src, "Your skin burns!") updatehealth() @@ -142,7 +142,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi' //Checks if the head is adequately sealed. //This is just odd. TODO: Make this respect the body_parts_covered stuff like thermal gear does. if(head) if(vsc.plc.PHORONGUARD_ONLY) - if(head.flags & PHORONGUARD) + if(head.item_flags & PHORONGUARD) return 1 else if(head.body_parts_covered & EYES) return 1 @@ -154,7 +154,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi' for(var/obj/item/protection in list(wear_suit, gloves, shoes)) //This is why it's odd. If I'm in a full suit, but my shoes and gloves aren't phoron proof, damage. if(!protection) continue - if(vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD)) + if(vsc.plc.PHORONGUARD_ONLY && !(protection.item_flags & PHORONGUARD)) return 0 coverage |= protection.body_parts_covered diff --git a/code/__defines/dcs/helpers.dm b/code/__defines/dcs/helpers.dm index 144e94f1fe..e74f656c5c 100644 --- a/code/__defines/dcs/helpers.dm +++ b/code/__defines/dcs/helpers.dm @@ -2,7 +2,7 @@ /// The datum hosting the signal is automaticaly added as the first argument /// Returns a bitfield gathered from all registered procs /// Arguments given here are packaged in a list and given to _SendSignal -#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.comp_lookup || !target.comp_lookup[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) ) +#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.comp_lookup || !target.comp_lookup[sigtype] ? EMPTY_BITFIELD : target._SendSignal(sigtype, list(target, ##arguments)) ) #define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) ) diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm index 1de72edde7..0744653794 100644 --- a/code/__defines/flags.dm +++ b/code/__defines/flags.dm @@ -1,9 +1,5 @@ -//MARK ALL FLAG CHANGES IN _globals/bitfields.dm! -//All flags should go in here if possible. -#define ALL (~0) //For convenience. -#define NONE 0 +#define EMPTY_BITFIELD 0 -//for convenience #define ENABLE_BITFIELD(variable, flag) (variable |= (flag)) #define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag)) #define CHECK_BITFIELD(variable, flag) (variable & (flag)) @@ -22,28 +18,42 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define DF_ISPROCESSING (1<<1) #define DF_USE_TAG (1<<2) -// /atom/movable movement_type + +/* -- /atom/movable/var/movement_type -- */ + #define UNSTOPPABLE (1<<0) //Can not be stopped from moving from Cross(), CanPass(), or Uncross() failing. Still bumps everything it passes through, though. -// Flags bitmasks. - Used in /atom/var/flags -#define NOBLUDGEON (1<<0) // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. + +/* -- /atom/var/atom_flags -- */ + +/// The atom has been initialized. +#define ATOM_INITIALIZED (1<<0) + #define NOCONDUCT (1<<1) // Conducts electricity. (metal etc.) #define ON_BORDER (1<<2) // Item has priority to check when entering or leaving. -#define NOBLOODY (1<<3) // Used for items if they don't want to get a blood overlay. -#define OPENCONTAINER (1<<4) // Is an open container for chemistry purposes. -#define PHORONGUARD (1<<5) // Does not get contaminated by phoron. -#define NOREACT (1<<6) // Reagents don't react inside this container. -#define OVERLAY_QUEUED (1<<7) // Atom is queued for an overlay update +#define OPENCONTAINER (1<<3) // Is an open container for chemistry purposes. +#define NOREACT (1<<4) // Reagents don't react inside this container. +#define OVERLAY_QUEUED (1<<5) // Atom is queued for an overlay update +#define NOJAUNT (1<<6) // blocks ethereal jaunt from landing/leaving on flagged turfs. +#define SLANDMARK_FLAG_AUTOSET (1<<7) // If set, will set base area and turf type to same as where it was spawned at +#define SLANDMARK_FLAG_ZERO_G (1<<8) // Zero-G shuttles moved here will lose gravity unless the area has ambient gravity. + + +/* -- /obj/item/var/item_flags -- */ -//Flags for items (equipment) - Used in /obj/item/var/item_flags #define THICKMATERIAL (1<<0) // Prevents syringes, parapens and hyposprays if equipped to slot_suit or slot_head. #define AIRTIGHT (1<<1) // Functions with internals. #define NOSLIP (1<<2) // Prevents from slipping on wet floors, in space, etc. #define BLOCK_GAS_SMOKE_EFFECT (1<<3) // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) #define FLEXIBLEMATERIAL (1<<4) // At the moment, masks with this flag will not prevent eating even if they are covering your face. #define ALLOW_SURVIVALFOOD (1<<5) // Allows special survival food items to be eaten through it +#define NOBLOODY (1<<6) // Used for items if they don't want to get a blood overlay. +#define NOBLUDGEON (1<<7) // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. +#define PHORONGUARD (1<<8) // Item does not get contaminated by phoron. + + +/* -- /atom/var/pass_flags -- */ -// Flags for pass_flags. - Used in /atom/var/pass_flags #define PASSTABLE (1<<0) #define PASSGLASS (1<<1) #define PASSGRILLE (1<<2) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 63db36395e..a06a3eaf8d 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -1,6 +1,5 @@ #define DEBUG // Turf-only flags. -#define NOJAUNT 1 // This is used in literally one place, turf.dm, to block ethereal jaunt. #define TRANSITIONEDGE 1 // Distance from edge to move to another z-level. diff --git a/code/__defines/shuttle.dm b/code/__defines/shuttle.dm index 9bf7dcad6f..cccc50d2d7 100644 --- a/code/__defines/shuttle.dm +++ b/code/__defines/shuttle.dm @@ -5,10 +5,6 @@ #define SHUTTLE_FLAGS_ZERO_G 4 // Shuttle has no internal gravity generation #define SHUTTLE_FLAGS_ALL (~SHUTTLE_FLAGS_NONE) -// shuttle_landmark flags -#define SLANDMARK_FLAG_AUTOSET 1 // If set, will set base area and turf type to same as where it was spawned at -#define SLANDMARK_FLAG_ZERO_G 2 // Zero-G shuttles moved here will lose gravity unless the area has ambient gravity. - // Overmap landable shuttles (/obj/effect/overmap/visitable/ship/landable on a /datum/shuttle/autodock/overmap) #define SHIP_STATUS_LANDED 1 // Ship is at any other shuttle landmark. #define SHIP_STATUS_TRANSIT 2 // Ship is at it's shuttle datum's transition shuttle landmark. diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm index ad4c343d9c..5efb6676e3 100644 --- a/code/_helpers/turfs.dm +++ b/code/_helpers/turfs.dm @@ -183,7 +183,7 @@ //Used for border objects. This returns true if this atom is on the border between the two specified turfs //This assumes that the atom is located inside the target turf /atom/proc/is_between_turfs(var/turf/origin, var/turf/target) - if (flags & ON_BORDER) + if (atom_flags & ON_BORDER) var/testdir = get_dir(target, origin) return (dir & testdir) return TRUE diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 47e7e99a92..9fbf705737 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -121,7 +121,7 @@ Quick adjacency (to turf): for(var/obj/O in src) 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&ON_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 var/obj/structure/window/W = target_atom if(istype(W)) @@ -141,4 +141,4 @@ Quick adjacency (to turf): useless. Throwpass may later need to be removed and replaced with a passcheck (bitfield on movable atom passflags). Since I don't want to complicate the click code rework by messing with unrelated systems it won't be changed here. -*/ \ No newline at end of file +*/ diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index fc35ade227..93244b80ea 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -90,7 +90,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, var/attack_modifier) - if(!force || (flags & NOBLUDGEON)) + if(!force || (item_flags & NOBLUDGEON)) return 0 if(M == user && user.a_intent != I_HURT) return 0 @@ -128,4 +128,4 @@ avoid code duplication. This includes items that may sometimes act as a standard power *= attack_modifier - return target.hit_with_weapon(src, user, power, hit_zone) \ No newline at end of file + return target.hit_with_weapon(src, user, power, hit_zone) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index d2b6b02d9c..ea94d211eb 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -65,7 +65,7 @@ var/global/const/tk_maxrange = 15 desc = "Magic" icon = 'icons/obj/magic.dmi'//Needs sprites icon_state = "2" - flags = NOBLUDGEON + item_flags = NOBLUDGEON //item_state = null w_class = ITEMSIZE_NO_CONTAINER layer = HUD_LAYER diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm index 3516470a23..a8c22e5ff3 100644 --- a/code/controllers/subsystems/atoms.dm +++ b/code/controllers/subsystems/atoms.dm @@ -45,14 +45,14 @@ SUBSYSTEM_DEF(atoms) var/list/arguments for (var/i = 1 to length(created_atoms)) created = created_atoms[i] - if (!created.initialized) + if (!(created.atom_flags & ATOM_INITIALIZED)) arguments = created_atoms[created] ? mapload_arg + created_atoms[created] : mapload_arg InitAtom(created, arguments) CHECK_TICK created_atoms.Cut() if (!subsystem_initialized) for (var/atom/atom in world) - if (!atom.initialized) + if (!(atom.atom_flags & ATOM_INITIALIZED)) InitAtom(atom, mapload_arg) ++count CHECK_TICK @@ -90,7 +90,7 @@ SUBSYSTEM_DEF(atoms) bad_init_calls[atom_type] |= DID_NOT_RETURN_HINT if (!atom) qdeleted = TRUE - else if (!atom.initialized) + else if (!(atom.atom_flags & ATOM_INITIALIZED)) bad_init_calls[atom_type] |= DID_NOT_SET_INITIALIZED return qdeleted || QDELING(atom) diff --git a/code/controllers/subsystems/overlays.dm b/code/controllers/subsystems/overlays.dm index 49d89195ac..5c5359e97d 100644 --- a/code/controllers/subsystems/overlays.dm +++ b/code/controllers/subsystems/overlays.dm @@ -24,7 +24,7 @@ SUBSYSTEM_DEF(overlays) icon_cache.Cut() cache_size = 0 for (var/atom/atom) - atom.flags &= ~OVERLAY_QUEUED + atom.atom_flags &= ~OVERLAY_QUEUED CHECK_TICK @@ -85,7 +85,7 @@ SUBSYSTEM_DEF(overlays) result += GetIconAppearance(entry) else if (isloc(entry)) - if (entry.flags & OVERLAY_QUEUED) + if (entry.atom_flags & OVERLAY_QUEUED) entry.ImmediateOverlayUpdate() if (!ispath(entry)) result += entry.appearance @@ -97,10 +97,10 @@ SUBSYSTEM_DEF(overlays) /// Enqueues the atom for an overlay update if not already queued /atom/proc/QueueOverlayUpdate() - if (flags & OVERLAY_QUEUED) + if (atom_flags & OVERLAY_QUEUED) return SSoverlays.queue += src - flags |= OVERLAY_QUEUED + atom_flags |= OVERLAY_QUEUED /// Builds the atom's overlay state from caches @@ -109,7 +109,7 @@ SUBSYSTEM_DEF(overlays) if (length(overlays)) overlays.Cut() return - flags &= ~OVERLAY_QUEUED + atom_flags &= ~OVERLAY_QUEUED if (length(priority_overlays)) if (length(our_overlays)) overlays = priority_overlays + our_overlays diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm index a11ed9adc4..08b45db0d6 100644 --- a/code/controllers/subsystems/persistence.dm +++ b/code/controllers/subsystems/persistence.dm @@ -28,7 +28,7 @@ SUBSYSTEM_DEF(persistence) return var/area/A = get_area(T) - if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) + if(!A || (A.atom_flags & AREA_FLAG_IS_NOT_PERSISTENT)) return // if((!T.z in GLOB.using_map.station_levels) || !initialized) diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm index 8746477f5a..67bb7b3678 100644 --- a/code/controllers/subsystems/radiation.dm +++ b/code/controllers/subsystems/radiation.dm @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(radiation) if(source.respect_maint) var/area/A = T.loc - if(A.flags & RAD_SHIELDED) + if(A.atom_flags & RAD_SHIELDED) continue // In shielded area var/dist = get_dist(source.source_turf, T) @@ -145,4 +145,4 @@ SUBSYSTEM_DEF(radiation) if(!(power && source)) return var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z) - flat_radiate(epicentre, power, world.maxx, respect_maint) \ No newline at end of file + flat_radiate(epicentre, power, world.maxx, respect_maint) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index c4ee090ce8..86d093a134 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -312,10 +312,10 @@ if(!length(target)) var/datum/C = target if(!C.signal_enabled) - return NONE + return EMPTY_BITFIELD var/proctype = C.signal_procs[src][sigtype] - return NONE | CallAsync(C, proctype, arguments) - . = NONE + return EMPTY_BITFIELD | CallAsync(C, proctype, arguments) + . = EMPTY_BITFIELD for(var/I in target) var/datum/C = I if(!C.signal_enabled) diff --git a/code/datums/datum.dm b/code/datums/datum.dm index abf86694f5..21e9c247e7 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -11,7 +11,7 @@ var/list/list/signal_procs // List of lists var/signal_enabled = FALSE var/weakref/weakref // Holder of weakref instance pointing to this datum - var/datum_flags = NONE + var/datum_flags = EMPTY_BITFIELD #ifdef TESTING var/tmp/running_find_references diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 7b09c83308..540eb18b38 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -60,7 +60,7 @@ IF_VV_OPTION(VV_HK_CALLPROC) usr.client.callproc_datum(src) IF_VV_OPTION(VV_HK_ADDCOMPONENT) - if(!check_rights(NONE)) + if(!check_rights(EMPTY_BITFIELD)) return var/list/names = list() var/list/componentsubtypes = sortTim(subtypesof(/datum/component), /proc/cmp_typepaths_asc) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index 46a295f90b..01e15f03fb 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -6,7 +6,7 @@ */ /datum/element /// Option flags for element behaviour - var/element_flags = NONE + var/element_flags = EMPTY_BITFIELD /** * The index of the first attach argument to consider for duplicate elements * diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index a50f0970bf..7859a949ef 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -10,7 +10,7 @@ /// When the TGUI window is opened, "wires" will be appended to it's title, and it would become "APC wires". var/proper_name = "Unknown" /// The total number of wires that our holder atom has. - var/wire_count = NONE + var/wire_count = 0 /// A list of all wires. For a list of valid wires defines that can go here, see `code/__DEFINES/wires.dm` var/list/wires /// A list of all cut wires. The same values that can go into `wires` will get added and removed from this list. diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index f1aad991fd..4d695a1028 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -33,7 +33,7 @@ gender = PLURAL icon = 'icons/obj/soap.dmi' icon_state = "soap" - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_SMALL slot_flags = SLOT_HOLSTER throwforce = 0 diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index c8d0e46f6f..9a7ea5ff15 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -31,7 +31,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_environ = 0 base_turf = /turf/space ambience = AMBIENCE_SPACE - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/space/atmosalert() return @@ -69,7 +69,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/shuttle requires_power = 0 - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT sound_env = SMALL_ENCLOSED base_turf = /turf/space forbid_events = TRUE @@ -202,7 +202,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Alien base" icon_state = "yellow" requires_power = 0 - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT // CENTCOM @@ -211,7 +211,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "centcom" requires_power = 0 dynamic_lighting = 0 - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/centcom/control name = "\improper CentCom Control" @@ -290,7 +290,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 0 dynamic_lighting = 0 ambience = AMBIENCE_HIGHSEC - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/syndicate_mothership/control name = "\improper Mercenary Control Room" @@ -307,7 +307,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "asteroid" requires_power = 0 sound_env = ASTEROID - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/asteroid/cave // -- TLE name = "\improper Moon - Underground" @@ -331,7 +331,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 0 dynamic_lighting = 0 sound_env = ARENA - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/tdome/tdome1 name = "\improper Thunderdome (Team 1)" @@ -354,7 +354,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "Virtual_Reality" dynamic_lighting = 0 requires_power = 0 - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT //ENEMY @@ -363,10 +363,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Independent Station" icon_state = "yellow" requires_power = 0 - flags = RAD_SHIELDED + area_flags = AREA_FLAG_IS_NOT_PERSISTENT | RAD_SHIELDED base_turf = /turf/space ambience = AMBIENCE_HIGHSEC - flags = AREA_FLAG_IS_NOT_PERSISTENT /area/syndicate_station/start name = "\improper Mercenary Forward Operating Base" @@ -422,7 +421,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 0 dynamic_lighting = 0 ambience = AMBIENCE_OTHERWORLDLY - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/skipjack_station name = "\improper Skipjack" @@ -430,7 +429,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 0 base_turf = /turf/space ambience = AMBIENCE_HIGHSEC - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/skipjack_station/start name = "\improper Skipjack" @@ -465,7 +464,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Prison Station" icon_state = "brig" ambience = AMBIENCE_HIGHSEC - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/prison/arrival_airlock name = "\improper Prison Station Airlock" @@ -555,7 +554,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Maintenance /area/maintenance - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED sound_env = TUNNEL_ENCLOSED turf_initializer = new /datum/turf_initializer/maintenance() ambience = AMBIENCE_MAINTENANCE @@ -651,7 +650,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/disposal name = "Waste Disposal" icon_state = "disposal" - flags = AREA_FLAG_IS_NOT_PERSISTENT //If trash items got this far, they can be safely deleted. + area_flags = AREA_FLAG_IS_NOT_PERSISTENT //If trash items got this far, they can be safely deleted. /area/maintenance/engineering name = "Engineering Maintenance" @@ -966,12 +965,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/heads/hop name = "\improper Command - HoP's Office" icon_state = "head_quarters" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/crew_quarters/heads/hor name = "\improper Research - RD's Office" icon_state = "head_quarters" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/crew_quarters/heads/chief name = "\improper Engineering - CE's Office" @@ -984,7 +983,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/heads/cmo name = "\improper Medbay - CMO's Office" icon_state = "head_quarters" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/crew_quarters/courtroom name = "\improper Courtroom" @@ -1007,7 +1006,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters name = "\improper Dormitories" icon_state = "Sleep" - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_GENERIC forbid_events = TRUE @@ -1312,7 +1311,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station dynamic_lighting = 0 sound_env = LARGE_ENCLOSED forbid_events = TRUE - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/holodeck/alphadeck name = "\improper Holodeck Alpha" @@ -1675,12 +1674,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/surgery name = "\improper Operating Theatre 1" icon_state = "surgery" - flags = AREA_FLAG_IS_NOT_PERSISTENT //This WOULD become a filth pit + area_flags = AREA_FLAG_IS_NOT_PERSISTENT //This WOULD become a filth pit /area/medical/surgery2 name = "\improper Operating Theatre 2" icon_state = "surgery" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/medical/surgeryobs name = "\improper Operation Observation Room" @@ -1717,7 +1716,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/sleeper name = "\improper Emergency Treatment Centre" icon_state = "exam_room" - flags = AREA_FLAG_IS_NOT_PERSISTENT //Trust me. + area_flags = AREA_FLAG_IS_NOT_PERSISTENT //Trust me. /area/medical/first_aid_station_starboard name = "\improper Starboard First-Aid Station" @@ -1915,7 +1914,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/delivery name = "\improper Cargo - Delivery Office" icon_state = "quart" - flags = AREA_FLAG_IS_NOT_PERSISTENT //So trash doesn't pile up too hard. + area_flags = AREA_FLAG_IS_NOT_PERSISTENT //So trash doesn't pile up too hard. /area/quartermaster/miningdock name = "\improper Cargo Mining Dock" @@ -1956,7 +1955,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/rdoffice name = "\improper Research Director's Office" icon_state = "head_quarters" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/rnd/supermatter name = "\improper Supermatter Lab" @@ -2079,7 +2078,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Derelict Station" icon_state = "storage" ambience = AMBIENCE_RUINS - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/derelict/hallway/primary name = "\improper Derelict Primary Hallway" @@ -2180,7 +2179,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/constructionsite name = "\improper Construction Site" icon_state = "storage" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/constructionsite/storage name = "\improper Construction Site Storage Area" @@ -2366,7 +2365,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/wreck ambience = AMBIENCE_RUINS - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/wreck/ai name = "\improper AI Chamber" @@ -2443,7 +2442,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Strange Location" icon_state = "away" ambience = AMBIENCE_FOREBODING - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/awaymission/example name = "\improper Strange Station" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index c8dfa0dc1b..cb9fc65809 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -13,12 +13,17 @@ plane = PLANE_LIGHTING_ABOVE //In case we color them luminosity = 0 mouse_opacity = 0 + + var/area_flags = 0 + var/lightswitch = 1 var/eject = null var/debug = 0 + var/requires_power = 1 + var/always_unpowered = 0 //this gets overriden to 1 for space in area/Initialize() // Power channel status - Is it currently energized? @@ -541,4 +546,4 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image) if(should_obfuscate) add_overlay(GLOB.spoiler_obfuscation_image) else - cut_overlay(GLOB.spoiler_obfuscation_image) \ No newline at end of file + cut_overlay(GLOB.spoiler_obfuscation_image) diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm index 2beaa88613..9e0c22335f 100644 --- a/code/game/area/asteroid_areas.dm +++ b/code/game/area/asteroid_areas.dm @@ -3,7 +3,7 @@ /area/mine icon_state = "mining" sound_env = ASTEROID - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/mine/explored name = "Mine" @@ -28,22 +28,22 @@ /area/outpost/mining_north name = "North Mining Outpost" icon_state = "outpost_mine_north" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/outpost/mining_west name = "West Mining Outpost" icon_state = "outpost_mine_west" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/outpost/abandoned name = "Abandoned Outpost" icon_state = "dark" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT // Main mining outpost /area/outpost/mining_main icon_state = "outpost_mine_main" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/outpost/mining_main/airlock name = "Mining Outpost Airlock" @@ -95,7 +95,7 @@ // Engineering Outpost /area/outpost/engineering icon_state = "outpost_engine" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/outpost/engineering/hallway name = "Engineering Outpost Hallway" @@ -169,7 +169,7 @@ // Research Outpost /area/outpost/research icon_state = "outpost_research" - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT /area/outpost/research/hallway name = "Research Outpost Hallway" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index caba1e7578..1b3db4cef8 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1,7 +1,7 @@ /atom layer = TURF_LAYER //This was here when I got here. Why though? var/level = 2 - var/flags = 0 + var/atom_flags = 0 var/list/fingerprints var/list/fingerprintshidden var/fingerprintslast = null @@ -55,7 +55,7 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf //atom creation method that preloads variables at creation if(global.use_preloader && (src.type == global._preloader.target_path))//in case the instanciated atom is creating other atoms in New() global._preloader.load(src) - + var/do_initialize = SSatoms?.atom_init_stage if(do_initialize > INITIALIZATION_INSSATOMS_LATE) args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD @@ -79,11 +79,16 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf /atom/proc/Initialize(mapload, ...) SHOULD_CALL_PARENT(TRUE) SHOULD_NOT_SLEEP(TRUE) - if(QDELETED(src)) - crash_with("GC: -- [type] had initialize() called after qdel() --") - if(initialized) + if (atom_flags & ATOM_INITIALIZED) crash_with("Warning: [src]([type]) initialized multiple times!") - initialized = TRUE + atom_flags |= ATOM_INITIALIZED + if (QDELING(src)) + crash_with("GC: -- [type] had Initialize() called after qdel() --") + if (light_power && light_range) + update_light() + if (opacity && isturf(loc)) + var/turf/T = loc + T.has_opaque_atom = TRUE return INITIALIZE_HINT_NORMAL // Called after all object's normal initialize() if initialize() returns INITIALIZE_HINT_LATELOAD @@ -121,7 +126,7 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf // returns true if open // false if closed /atom/proc/is_open_container() - return flags & OPENCONTAINER + return atom_flags & OPENCONTAINER /*//Convenience proc to see whether a container can be accessed in a certain way. @@ -429,8 +434,10 @@ var/global/list/pre_init_created_atoms // atom creation ordering means some stuf //returns 1 if made bloody, returns 0 otherwise /atom/proc/add_blood(mob/living/carbon/human/M as mob) - if(flags & NOBLOODY) - return 0 + if (isitem(src)) + var/obj/item/item = src + if(item.item_flags & NOBLOODY) + 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. blood_DNA = list() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 93d670504e..c80b06401c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -25,7 +25,7 @@ var/old_y = 0 var/datum/riding/riding_datum = null var/does_spin = TRUE // Does the atom spin when thrown (of course it does :P) - var/movement_type = NONE + var/movement_type = EMPTY_BITFIELD var/cloaked = FALSE //If we're cloaked or not var/image/cloaked_selfimage //The image we use for our client to let them see where we are @@ -337,7 +337,7 @@ return // Call our thingy to inform everyone we moved - Moved(oldloc, NONE, TRUE) + Moved(oldloc, EMPTY_BITFIELD, TRUE) // Break pulling if we are too far to pull now. if(pulledby && (pulledby.z != src.z || get_dist(pulledby, src) > 1)) @@ -698,4 +698,4 @@ return selfimage /atom/movable/proc/get_cell() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index 28a9586505..b6d8b5fa0c 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -37,8 +37,7 @@ name = "flesh mass" icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." - flags = 0 //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, - //it still ends up in your blood. (also balance but muh fluff) + item_flags = 0 allowed = list(/obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/tank/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. canremove = 0 @@ -57,7 +56,7 @@ name = "flesh mass" icon_state = "lingspacehelmet" desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front." - flags = BLOCKHAIR //Again, no THICKMATERIAL. + flags_inv = BLOCKHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) body_parts_covered = HEAD|FACE|EYES canremove = 0 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 770df250cc..afcd35c6d6 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -10,7 +10,7 @@ health = 150 visible = 0.0 use_power = USE_POWER_OFF - flags = ON_BORDER + atom_flags = ON_BORDER opacity = 0 var/obj/item/airlock_electronics/electronics = null explosion_resistance = 5 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 0aa583e1a2..ceb4f9ef28 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -167,7 +167,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 & NOCONDUCT)) + if(!M.anchored && !(M.atom_flags & NOCONDUCT)) step_towards(M, center) for(var/mob/living/silicon/S in orange(magnetic_field, center)) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 5b4e065073..19f2d33105 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -19,7 +19,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize() . = ..() - flags |= NOREACT + atom_flags |= NOREACT syringes = new known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene") processed_reagents = new @@ -31,7 +31,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/critfail() ..() - flags &= ~NOREACT + atom_flags &= ~NOREACT return /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/get_equip_info() diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 066f2844cf..011417e9e7 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -13,7 +13,7 @@ /obj/item/reagent_containers/glass/beaker/vial/random - flags = 0 + atom_flags = 0 var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1) @@ -28,7 +28,7 @@ /obj/item/reagent_containers/glass/beaker/vial/random/Initialize() . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= OPENCONTAINER var/list/picked_reagents = pickweight(random_reagent_list) for(var/reagent in picked_reagents) reagents.add_reagent(reagent, picked_reagents[reagent]) diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 06995d12d7..0685032214 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -105,7 +105,7 @@ plane = TURF_PLANE layer = ABOVE_TURF_LAYER w_class = ITEMSIZE_LARGE - flags = NOBLOODY + item_flags = NOBLOODY var/circuit = /obj/item/circuitboard/geiger var/number = 0 var/last_tick //used to delay the powercheck @@ -170,4 +170,4 @@ /obj/item/geiger/wall/west pixel_x = -28 - dir = WEST \ No newline at end of file + dir = WEST diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 036491dfef..ba35128225 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -6,7 +6,7 @@ anchored = 1 w_class = ITEMSIZE_LARGE canhear_range = 2 - flags = NOBLOODY + item_flags = NOBLOODY var/circuit = /obj/item/circuitboard/intercom var/number = 0 var/wiresexposed = 0 @@ -195,4 +195,4 @@ /obj/item/radio/intercom/locked/confessional name = "confessional intercom" - frequency = 1480 \ No newline at end of file + frequency = 1480 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 38d77abb2b..4331a7c99d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -381,7 +381,7 @@ HALOGEN COUNTER - Radcount on mobs drop_sound = 'sound/items/drop/device.ogg' icon_state = "spectrometer" w_class = ITEMSIZE_SMALL - flags = OPENCONTAINER + atom_flags = OPENCONTAINER slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -463,7 +463,7 @@ HALOGEN COUNTER - Radcount on mobs return if(!isnull(O.reagents)) - if(!(O.flags & OPENCONTAINER)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors. + if(!(O.atom_flags & OPENCONTAINER)) // The idea is that the scanner has to touch the reagents somehow. This is done to prevent cheesing unidentified autoinjectors. to_chat(user, span("warning", "\The [O] is sealed, and cannot be scanned by \the [src] until unsealed.")) return diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 84d8067150..9dcc56157f 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -11,7 +11,7 @@ icon_state = "jar" w_class = ITEMSIZE_SMALL matter = list("glass" = 200) - flags = NOBLUDGEON + item_flags = NOBLUDGEON var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly) var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling drop_sound = 'sound/items/drop/glass.ogg' diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 38cd81aa39..8f0b15f49a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -36,7 +36,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 origin_tech = list(TECH_BIO = 1) no_variants = FALSE drop_sound = 'sound/items/drop/herb.ogg' @@ -64,7 +64,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 no_variants = FALSE drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' @@ -112,7 +112,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 no_variants = FALSE drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' @@ -244,7 +244,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 no_variants = FALSE /obj/item/stack/tile/wmarble @@ -256,7 +256,7 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 no_variants = FALSE /obj/item/stack/tile/bmarble @@ -268,7 +268,7 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 + atom_flags = 0 no_variants = FALSE /obj/item/stack/tile/roofing @@ -283,4 +283,4 @@ uses_charge = 1 charge_costs = list(250) stacktype = /obj/item/stack/tile/roofing - build_type = /obj/item/stack/tile/roofing \ No newline at end of file + build_type = /obj/item/stack/tile/roofing diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index a5e74a1794..2bf345a16d 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -7,7 +7,7 @@ item_state = "rcd" drop_sound = 'sound/items/drop/gun.ogg' pickup_sound = 'sound/items/pickup/gun.ogg' - flags = NOBLUDGEON + item_flags = NOBLUDGEON force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 0ffcc1fe5e..cb771f60b9 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -16,8 +16,8 @@ item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand.dmi', slot_r_hand_str = 'icons/mob/items/righthand.dmi', - ) - flags = NOBLUDGEON + ) + item_flags = NOBLUDGEON force = 10 throwforce = 10 throw_speed = 1 @@ -183,7 +183,7 @@ activate() animate_deletion(A) return - + if((mode & PAINT_MODE)) //Paint pipes if(istype(A, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = A @@ -291,4 +291,4 @@ #undef BUILD_MODE #undef WRENCH_MODE #undef DESTROY_MODE -#undef PAINT_MODE \ No newline at end of file +#undef PAINT_MODE diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index d187029d61..b996eb1fb5 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -27,7 +27,7 @@ /obj/item/clothing/mask/chewable/Initialize() . = ..() - flags |= NOREACT // so it doesn't react until you light it + atom_flags |= NOREACT // 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 for(var/R in filling) reagents.add_reagent(R, filling[R]) @@ -262,4 +262,4 @@ if(chewtime < 1) if(ismob(loc)) to_chat(loc, SPAN_NOTICE("There's no more of \the [name] left!")) - spitout(0) \ No newline at end of file + spitout(0) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5831c8a0f0..8a002d81d4 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -105,7 +105,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 |= NOREACT // 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 if(smoketime && !max_smoketime) max_smoketime = smoketime @@ -118,7 +118,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(ishuman(loc)) var/mob/living/carbon/human/C = loc if (src == C.wear_mask && C.check_has_mouth()) // if it's in the human/monkey mouth, transfer reagents to the mob - reagents.trans_to_mob(C, amount, CHEM_INGEST, 1.5) // I don't predict significant balance issues by letting blunts actually WORK. + reagents.trans_to_mob(C, amount, CHEM_INGEST, 1.5) // I don't predict significant balance issues by letting blunts actually WORK. else // else just remove some of the reagents reagents.remove_any(REM) @@ -183,7 +183,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM e.start() qdel(src) return - flags &= ~NOREACT // allowing reagents to react after being lit + atom_flags &= ~NOREACT // allowing reagents to react after being lit reagents.handle_reactions() var/turf/T = get_turf(src) T.visible_message(flavor_text) @@ -705,4 +705,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/flame/lighter/zippo/rainbow name = "\improper rainbow Zippo lighter" - icon_state = "rainbowzippo" \ No newline at end of file + icon_state = "rainbowzippo" diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 02a4ad6da3..20e8e6007c 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -153,7 +153,7 @@ icon_state = "ecartridge" matter = list("metal" = 50, "glass" = 10) volume = 20 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/ecig_cartridge/Initialize() . = ..() diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 65ad72c49a..a429c17399 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 = NOBLUDGEON w_class = ITEMSIZE_SMALL origin_tech = list(TECH_ILLEGAL = 2) var/datum/wires/explosive/c4/wires = null @@ -81,7 +81,7 @@ target = get_atom_on_turf(src) if(!target) target = src - + var/turf/T = get_turf(target) if (!T && length(location)) T = locate(location[1], location[2], location[3]) @@ -126,4 +126,4 @@ blast_flash = blast_light + round(new_blast_power * 0.75) else to_chat(user, "The [I] is not any better than the component already installed into this charge!") - return . \ No newline at end of file + return . diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 2b3ec121b1..a42b35951b 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -44,7 +44,7 @@ matter[material_type] *= force_divisor // May require a new var instead. if(!(material.conductive)) - src.flags |= NOCONDUCT + atom_flags |= NOCONDUCT /obj/item/material/get_material() return material diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index e13353f022..aee9f49572 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -7,7 +7,8 @@ sharp = 0 edge = 0 armor_penetration = 50 - flags = NOCONDUCT | NOBLOODY + atom_flags = NOCONDUCT + item_flags = NOBLOODY var/lrange = 2 var/lpower = 2 var/lcolor = "#0099FF" @@ -267,7 +268,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + item_flags = NOBLOODY origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) sharp = 1 edge = 1 @@ -354,7 +355,7 @@ sharp = 1 edge = 1 armor_penetration = 0 - flags = NOBLOODY + item_flags = NOBLOODY lrange = 2 lpower = 2 lcolor = "#0000FF" @@ -427,7 +428,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 + item_flags = NOBLOODY attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") var/mob/living/creator var/datum/effect_system/spark_spread/spark_system diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index f310e1ad90..769e90dc72 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop) throw_speed = 5 throw_range = 10 w_class = ITEMSIZE_NORMAL - flags = NOCONDUCT + atom_flags = NOCONDUCT attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") var/mopping = 0 var/mopcount = 0 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 7e556a517d..60df03c5bf 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -15,7 +15,7 @@ var/global/list/cached_icons = list() possible_transfer_amounts = list(10,20,30,60) volume = 60 unacidable = 0 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/paint_type = "red" /obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity) @@ -67,4 +67,3 @@ var/global/list/cached_icons = list() /obj/item/reagent_containers/glass/paint/white icon_state = "paint_white" paint_type = "white" - diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 68d799580a..4dad5e226c 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -118,7 +118,7 @@ icon_state = "eshield" item_state = "eshield" slot_flags = SLOT_EARS - flags = NOCONDUCT + atom_flags = NOCONDUCT force = 3.0 throwforce = 5.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 146d6d875c..44435812f7 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -219,9 +219,9 @@ /obj/item/storage/fancy/cigarettes/Initialize() . = ..() - flags |= NOREACT + atom_flags |= NOREACT create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER if(brand) for(var/obj/item/clothing/mask/smokable/cigarette/C in src) C.brand = brand @@ -333,7 +333,7 @@ /obj/item/storage/fancy/cigar/Initialize() . = ..() - flags |= NOREACT + atom_flags |= NOREACT create_reagents(15 * storage_slots) /obj/item/storage/fancy/cigar/update_icon() diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5f4d8217d0..5c2aec2e7a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -9,7 +9,7 @@ sharp = 0 edge = 0 throwforce = 7 - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' @@ -264,4 +264,4 @@ // Borg version, for the lost module. /obj/item/melee/baton/shocker/robot - use_external_power = TRUE \ No newline at end of file + use_external_power = TRUE diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 3eccb48678..9cb1ae03b4 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -16,7 +16,7 @@ for (var/obj/item/grab/G in H.grabbed_by) if (G.loc == user && G.state >= GRAB_AGGRESSIVE) return TRUE - + return FALSE /obj/item/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user) @@ -116,15 +116,13 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "tape" w_class = ITEMSIZE_TINY + item_flags = NOBLUDGEON plane = MOB_PLANE anchored = FALSE drop_sound = null var/obj/item/stuck = null -/obj/item/ducttape/Initialize() - . = ..() - flags |= NOBLUDGEON /obj/item/ducttape/examine(mob/user) return stuck.examine(user) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index f878f508a5..609e6635a1 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -237,7 +237,7 @@ if(!istype(W)) return - if((W.flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND))) + if((W.atom_flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND))) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) playsound(src, 'sound/effects/grillehit.ogg', 40, 1) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index f81419be75..aff6013aa3 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -8,7 +8,7 @@ var/parts var/list/climbers = list() var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies. - + var/list/connections = list("0", "0", "0", "0") var/list/other_connections = list("0", "0", "0", "0") var/list/blend_objects = newlist() // Objects which to blend with @@ -93,7 +93,7 @@ if(istype(O,/obj/structure)) 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 & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check. return O return 0 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 0c50d4618f..3b263b757f 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -150,7 +150,7 @@ return //window placing end - else if((W.flags & NOCONDUCT) || !shock(user, 70)) + else if((W.atom_flags & NOCONDUCT) || !shock(user, 70)) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) playsound(src, 'sound/effects/grillehit.ogg', 80, 1) @@ -286,4 +286,3 @@ health -= damage spawn(1) healthcheck() return 1 - diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 5d09f66ec2..6a2924f5b3 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) icon_state = "cart" anchored = 0 density = 1 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER climbable = TRUE //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite @@ -304,7 +304,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) icon_state = "pussywagon" anchored = 1 density = 1 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite var/obj/item/storage/bag/trash/mybag = null diff --git a/code/game/objects/structures/ledges.dm b/code/game/objects/structures/ledges.dm index 1afa2efb01..2c1a71fb77 100644 --- a/code/game/objects/structures/ledges.dm +++ b/code/game/objects/structures/ledges.dm @@ -7,13 +7,13 @@ climbable = 1 anchored = 1 var/solidledge = 1 - flags = ON_BORDER + atom_flags = ON_BORDER layer = STAIRS_LAYER icon_state = "ledge" /obj/structure/ledge_corner icon_state = "ledge-corner" - flags = 0 + atom_flags = 0 name = "rock ledge" desc = "An easily scaleable rocky ledge." icon = 'icons/obj/ledges.dmi' @@ -82,4 +82,4 @@ if(occupied) to_chat(user, "You can't climb there, there's \a [occupied] in the way.") return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 9a3f2ae14a..4211feec08 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -7,7 +7,7 @@ climbable = 1 w_class = ITEMSIZE_NORMAL pressure_resistance = 5 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket) diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index d3026c2859..65257383d7 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -8,7 +8,7 @@ climbable = 1 layer = WINDOW_LAYER anchored = 1 - flags = ON_BORDER + atom_flags = ON_BORDER icon_state = "railing0" var/broken = FALSE var/health = 70 @@ -326,5 +326,5 @@ if(istype(O,/obj/structure)) var/obj/structure/S = O if(S.climbable) continue - if(O && O.density && !(O.flags & ON_BORDER && !(turn(O.dir, 180) & dir))) + if(O && O.density && !(O.atom_flags & ON_BORDER && !(turn(O.dir, 180) & dir))) return O diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index c70cf37449..fc85e669cc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -9,7 +9,7 @@ layer = WINDOW_LAYER pressure_resistance = 4*ONE_ATMOSPHERE anchored = 1.0 - flags = ON_BORDER + atom_flags = ON_BORDER var/maxhealth = 14.0 var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire var/damage_per_fire_tick = 2.0 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly. @@ -262,7 +262,7 @@ hit(50) return - if(W.flags & NOBLUDGEON) return + if(W.item_flags & NOBLUDGEON) return if(W.is_screwdriver()) if(reinf && state >= 1) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 701a5d7573..d0409dbf4d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -37,7 +37,7 @@ /turf/Initialize(mapload) . = ..() - + for(var/atom/movable/AM in src) Entered(AM) @@ -196,7 +196,7 @@ mover.Bump(thing) continue else - if(!firstbump || ((thing.layer > firstbump.layer || thing.flags & ON_BORDER) && !(firstbump.flags & ON_BORDER))) + if(!firstbump || ((thing.layer > firstbump.layer || thing.atom_flags & ON_BORDER) && !(firstbump.atom_flags & ON_BORDER))) firstbump = thing if(QDELETED(mover)) //Mover deleted from Cross/CanPass/Bump, do not proceed. return FALSE @@ -216,7 +216,7 @@ continue var/atom/movable/thing = i if(!thing.Uncross(mover, newloc)) - if(thing.flags & ON_BORDER) + if(thing.atom_flags & ON_BORDER) mover.Bump(thing) if(!CHECK_BITFIELD(mover.movement_type, UNSTOPPABLE)) return FALSE @@ -271,7 +271,7 @@ if(density) return 1 for(var/atom/A in src) - if(A.density && !(A.flags & ON_BORDER)) + if(A.density && !(A.atom_flags & ON_BORDER)) return 1 return 0 diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index f00af626bf..ebe1bd2f66 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -5,7 +5,7 @@ description_info = "Some blob types will have core effects when the chunk is used in-hand, toggled with an alt click, or constantly active." icon = 'icons/mob/blob.dmi' icon_state = "blobcore" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/datum/blob_type/blob_type // The blob type this dropped from. var/active_ability_cooldown = 20 SECONDS diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index a9923101c3..588577c7fa 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -103,6 +103,6 @@ #ifdef CARDINAL_INPUT_ONLY /// Movement dir of the most recently pressed movement key. Used in cardinal-only movement mode. - var/last_move_dir_pressed = NONE + var/last_move_dir_pressed = EMPTY_BITFIELD - #endif \ No newline at end of file + #endif diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a108b743df..14d461ae12 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -356,7 +356,7 @@ H.drop_from_inventory(ring) //Remove the ring (or other under-glove item in the hand slot?) so you can put on the gloves. ring.forceMove(src) to_chat(user, "You slip \the [src] on over \the [src.ring].") - if(!(flags & THICKMATERIAL)) + if(!(item_flags & THICKMATERIAL)) punch_force += ring.punch_force else ring = null diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2ef38ad878..f2d1827170 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -169,7 +169,7 @@ BLIND // can't see anything /obj/item/clothing/glasses/night/vox name = "Alien Optics" species_restricted = list("Vox") - flags = PHORONGUARD + item_flags = PHORONGUARD /obj/item/clothing/glasses/night/Initialize() . = ..() @@ -542,7 +542,7 @@ BLIND // can't see anything item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") toggleable = 1 action_button_name = "Toggle Monocle" - flags = null //doesn't protect eyes because it's a monocle, duh + atom_flags = 0 body_parts_covered = 0 diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index fb4f491076..d9319e4d93 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 + atom_flags = 0 //doesn't protect eyes because it's a monocle, duh origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 2) /obj/item/clothing/glasses/hud/health diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index bb0ca1ee39..1ee2c0a2ff 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -109,7 +109,7 @@ name = "insulated gauntlets" icon_state = "gloves-vox" item_state = "gloves-vox" - flags = PHORONGUARD + item_flags = PHORONGUARD siemens_coefficient = 0 permeability_coefficient = 0.05 species_restricted = list("Vox") @@ -127,7 +127,7 @@ icon_state = "knuckledusters" matter = list(MAT_STEEL = 500) attack_verb = list("punched", "beaten", "struck") - flags = THICKMATERIAL // Stops rings from increasing hit strength + item_flags = THICKMATERIAL // Stops rings from increasing hit strength siemens_coefficient = 1 fingerprint_chance = 100 overgloves = 1 @@ -166,4 +166,4 @@ glovecolor = "orange" /obj/item/clothing/gloves/ranger/yellow - glovecolor = "yellow" \ No newline at end of file + glovecolor = "yellow" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e9fab5dc2a..8ff991f7c5 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -4,7 +4,7 @@ icon_state = "helmet" valid_accessory_slots = (ACCESSORY_SLOT_HELM_C) restricted_accessory_slots = (ACCESSORY_SLOT_HELM_C) - flags = THICKMATERIAL + item_flags = THICKMATERIAL armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0) flags_inv = HIDEEARS|BLOCKHEADHAIR cold_protection = HEAD @@ -127,7 +127,7 @@ name = "explorer hood" desc = "An armoured hood for exploring harsh environments." icon_state = "explorer" - flags = THICKMATERIAL + item_flags = THICKMATERIAL min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) @@ -267,4 +267,3 @@ name = "emergency response team medical helmet" desc = "A set of armor worn by medical members of the NanoTrasen Emergency Response Team. Has red and white highlights." icon_state = "erthelmet_med" - diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index f863142fe0..decd5258d9 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -188,7 +188,7 @@ name = "explorer hood" desc = "An armoured hood for exploring harsh environments." icon_state = "explorer" - flags = THICKMATERIAL + item_flags = THICKMATERIAL min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 519f7cd1a7..e1079e239c 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -8,7 +8,7 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi' ) - flags = THICKMATERIAL + item_flags = THICKMATERIAL armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) flags_inv = HIDEEARS cold_protection = HEAD @@ -198,4 +198,4 @@ else src.icon_state = initial(icon_state) to_chat(user, "You lower the visor on the pilot helmet.") - update_clothing_icon() //so our mob-overlays update \ No newline at end of file + update_clothing_icon() //so our mob-overlays update diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 78ce763e67..3438150771 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -85,8 +85,7 @@ /obj/item/clothing/mask/gas/swat/vox name = "alien mask" desc = "Clearly not designed for a human face." - flags = PHORONGUARD - item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT + item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | PHORONGUARD species_restricted = list(SPECIES_VOX) filtered_gases = list("oxygen", "phoron", "nitrous_oxide") action_button_name = "Toggle Feeding Port" diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index c131a54a95..1213f27b5a 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -31,7 +31,7 @@ //Reagent Rings /obj/item/clothing/gloves/ring/reagent - flags = OPENCONTAINER + atom_flags = OPENCONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 4) /obj/item/clothing/gloves/ring/reagent/Initialize() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index bdf2be889d..64cc41fa68 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -2,7 +2,7 @@ desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear." name = "magboots" icon_state = "magboots0" - flags = PHORONGUARD + item_flags = PHORONGUARD item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots") species_restricted = null center_of_mass = list("x" = 17,"y" = 12) @@ -88,7 +88,7 @@ name = "vox magclaws" item_state = "boots-vox" icon_state = "boots-vox" - flags = PHORONGUARD + item_flags = PHORONGUARD species_restricted = list(SPECIES_VOX) action_button_name = "Toggle the magclaws" @@ -126,4 +126,4 @@ /obj/item/clothing/shoes/magboots/vox/examine(mob/user) . = ..() if(magpulse) - . += "It would be hard to take these off without relaxing your grip first." // Theoretically this message should only be seen by the wearer when the claws are equipped. \ No newline at end of file + . += "It would be hard to take these off without relaxing your grip first." // Theoretically this message should only be seen by the wearer when the claws are equipped. diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index bc92107d1b..f6b0699d56 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -31,8 +31,7 @@ // Can't be equipped by any other species due to bone structure and vox cybernetics. /obj/item/clothing/suit/space/vox w_class = ITEMSIZE_NORMAL - flags = PHORONGUARD - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL | PHORONGUARD allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank) armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 100, rad = 50) siemens_coefficient = 0.2 @@ -43,8 +42,7 @@ /obj/item/clothing/head/helmet/space/vox armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50) siemens_coefficient = 0.2 - flags = PHORONGUARD - item_flags = THICKMATERIAL | AIRTIGHT + item_flags = THICKMATERIAL | AIRTIGHT | PHORONGUARD flags_inv = 0 species_restricted = list(SPECIES_VOX) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c942df5a9a..c179e988e6 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -11,7 +11,7 @@ name = "hardsuit control module" icon = 'icons/obj/rig_modules.dmi' desc = "A back-mounted hardsuit deployment and control mechanism." - flags = PHORONGUARD + item_flags = PHORONGUARD slot_flags = SLOT_BACK req_one_access = list() req_access = list() diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index a34abe7882..e7b0948dc4 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -23,8 +23,7 @@ /obj/item/clothing/gloves/gauntlets/rig name = "gauntlets" - flags = PHORONGUARD - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL | PHORONGUARD body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS @@ -119,7 +118,7 @@ body_parts_covered = HEAD|FACE|EYES heat_protection = HEAD|FACE|EYES cold_protection = HEAD|FACE|EYES - flags = THICKMATERIAL|AIRTIGHT + item_flags = THICKMATERIAL|AIRTIGHT species_restricted = null /obj/item/clothing/suit/lightrig @@ -129,7 +128,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT - flags = THICKMATERIAL + item_flags = THICKMATERIAL species_restricted = null /obj/item/clothing/shoes/lightrig @@ -142,7 +141,7 @@ /obj/item/clothing/gloves/gauntlets/lightrig name = "gloves" - flags = THICKMATERIAL + item_flags = THICKMATERIAL body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 98021976bb..a2cc6ddca2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -47,8 +47,7 @@ suit_type = "alien" icon_state = "vox_rig" armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50) - flags = PHORONGUARD - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL | PHORONGUARD siemens_coefficient = 0.2 offline_slowdown = 2.5 allowed = list( @@ -123,4 +122,4 @@ /obj/item/rig_module/vision, /obj/item/rig_module/power_sink, /obj/item/rig_module/self_destruct - ) \ No newline at end of file + ) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index e8081194cd..a8127e3784 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -80,7 +80,7 @@ /obj/item/clothing/shoes/lightrig/hacker siemens_coefficient = 0.4 step_volume_mod = 0.3 //Special sneaky cyber-soles, for infiltration. - flags = NOSLIP //They're not magboots, so they're not super good for exterior hull walking, BUT for interior infiltration they'll do swell. + item_flags = NOSLIP //They're not magboots, so they're not super good for exterior hull walking, BUT for interior infiltration they'll do swell. /obj/item/clothing/gloves/gauntlets/rig/light/hacker siemens_coefficient = 0 diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 4155b44a1a..71a45a2c46 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -8,8 +8,7 @@ desc = "A special helmet designed for work in a hazardous, low-pressure environment." randpixel = 0 center_of_mass = null - flags = PHORONGUARD - item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD + item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD | PHORONGUARD permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR @@ -72,8 +71,7 @@ w_class = ITEMSIZE_HUGE // So you can't fit this in your bag and be prepared at all times. gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = PHORONGUARD - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL | PHORONGUARD body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit) slowdown = 1.5 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c79f3ba446..952c1411f7 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -543,7 +543,7 @@ name = "explorer suit" desc = "A lightweight explorer plate carrier. It can be equipped with armor plates, but only protects from the cold on it's own." icon_state = "explorer" - flags = THICKMATERIAL + item_flags = THICKMATERIAL min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -639,4 +639,4 @@ starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/bulletproof, /obj/item/clothing/accessory/armor/armguards/bulletproof, /obj/item/clothing/accessory/armor/legguards/bulletproof, /obj/item/clothing/accessory/storage/pouches) /obj/item/clothing/suit/armor/pcarrier/riot/full - starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/legguards/riot, /obj/item/clothing/accessory/storage/pouches) \ No newline at end of file + starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/legguards/riot, /obj/item/clothing/accessory/storage/pouches) diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 028f15cff6..078e0a78e8 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -10,8 +10,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES siemens_coefficient = 0.9 - flags = PHORONGUARD - item_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD + item_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD | PHORONGUARD /obj/item/clothing/suit/bio_suit name = "bio suit" @@ -26,8 +25,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER siemens_coefficient = 0.9 - flags = PHORONGUARD - item_flags = THICKMATERIAL + item_flags = THICKMATERIAL | PHORONGUARD //Standard biosuit, orange stripe /obj/item/clothing/head/bio_hood/general @@ -92,4 +90,4 @@ desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses." icon_state = "plaguedoctor" item_state_slots = list(slot_r_hand_str = "bio", slot_l_hand_str = "bio") - flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER \ No newline at end of file + flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index e71a4cf0c1..08a267359e 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -381,7 +381,7 @@ desc = "An armoured suit for exploring harsh environments." icon_state = "explorer" item_state = "explorer" - flags = THICKMATERIAL + item_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS diff --git a/code/modules/clothing/under/xenos/vox.dm b/code/modules/clothing/under/xenos/vox.dm index 189b708789..505a6191d2 100644 --- a/code/modules/clothing/under/xenos/vox.dm +++ b/code/modules/clothing/under/xenos/vox.dm @@ -2,7 +2,7 @@ has_sensor = 0 species_restricted = list(SPECIES_VOX) starting_accessories = list(/obj/item/clothing/accessory/storage/vox) // Dont' start with a backback, so free webbing - flags = PHORONGUARD + item_flags = PHORONGUARD /obj/item/clothing/under/vox/vox_utility name = "alien clothing" @@ -22,9 +22,7 @@ name = "alien mesh" desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh." icon_state = "webbing-vox" - - flags = PHORONGUARD - + item_flags = PHORONGUARD slots = 3 /obj/item/clothing/accessory/storage/vox/Initialize() diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 2afde1c327..a9d8cf8ce8 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 = OPENCONTAINER + item_flags = NOBLUDGEON unacidable = 0 drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm index 10bf683915..cb3189c197 100644 --- a/code/modules/detectivework/tools/scanner.dm +++ b/code/modules/detectivework/tools/scanner.dm @@ -5,7 +5,7 @@ var/list/stored = list() w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = NOBLUDGEON + item_flags = NOBLUDGEON slot_flags = SLOT_BELT var/reveal_fingerprints = TRUE diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index 31f845ca74..a594e453f7 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -3,7 +3,6 @@ desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/stationobjs.dmi' icon_state = "register_idle" - flags = NOBLUDGEON req_access = list(access_heads) anchored = 1 diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index c62b794542..1fd99600e3 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -5,7 +5,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' icon_state = "retail_idle" - flags = NOBLUDGEON + item_flags = NOBLUDGEON slot_flags = SLOT_BELT req_access = list(access_heads) w_class = ITEMSIZE_SMALL @@ -425,4 +425,4 @@ account_to_connect = "Cargo" /obj/item/retail_scanner/civilian - account_to_connect = "Civilian" \ No newline at end of file + account_to_connect = "Civilian" diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 3600dd23aa..d93b120535 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -37,7 +37,7 @@ if(!(S.z in affecting_z)) continue var/area/A = get_area(S) - if(!A || A.flags & RAD_SHIELDED) // Rad shielding will protect from ions too + if(!A || A.area_flags & RAD_SHIELDED) // Rad shielding will protect from ions too continue to_chat(S, "Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart.") var/ionbug = rand(3, 9) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 85bc8cff23..d215593c5d 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -37,7 +37,7 @@ var/area/A = get_area(C) if(!A) continue - if(A.flags & RAD_SHIELDED) + if(A.area_flags & RAD_SHIELDED) continue if(istype(C,/mob/living/carbon/human)) var/mob/living/carbon/human/H = C diff --git a/code/modules/examine/descriptions/armor.dm b/code/modules/examine/descriptions/armor.dm index 39c5ccde92..b535792c0e 100644 --- a/code/modules/examine/descriptions/armor.dm +++ b/code/modules/examine/descriptions/armor.dm @@ -43,7 +43,7 @@ armor_stats += "\n" - if(flags & AIRTIGHT) + if(item_flags & AIRTIGHT) armor_stats += "It is airtight. \n" if(min_pressure_protection == 0) @@ -54,7 +54,7 @@ if(max_pressure_protection != null) armor_stats += "Wearing this will protect you from high pressures. \n" - if(flags & THICKMATERIAL) + if(item_flags & THICKMATERIAL) armor_stats += "The material is exceptionally thick. \n" if(max_heat_protection_temperature == FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE) @@ -80,4 +80,4 @@ if(slots.len) armor_stats += "It can be worn on your [english_list(slots)]. \n" - return armor_stats \ No newline at end of file + return armor_stats diff --git a/code/modules/fishing/fishing_net.dm b/code/modules/fishing/fishing_net.dm index 179c655a6f..5c581a6c89 100644 --- a/code/modules/fishing/fishing_net.dm +++ b/code/modules/fishing/fishing_net.dm @@ -12,7 +12,7 @@ var/contain_state = "net_full" w_class = ITEMSIZE_SMALL - flags = NOBLUDGEON + item_flags = NOBLUDGEON slowdown = 0.5 diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 64ab230fe6..c0564c2b55 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -23,7 +23,7 @@ var/global/const/DRINK_ICON_NOISY = "_noise" amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5,10,15,30) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER matter = list("glass" = 60) @@ -163,4 +163,4 @@ var/global/const/DRINK_ICON_NOISY = "_noise" if(afterattack(target, user)) //Check to see if harm intent & splash. return else - ..() //If they're splashed, no need to do anything else. \ No newline at end of file + ..() //If they're splashed, no need to do anything else. diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index c1be50127b..f068bab222 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -1,7 +1,7 @@ /obj/item/reagent_containers/food/drinks/cans volume = 40 //just over one and a half cups amount_per_transfer_from_this = 5 - flags = 0 //starts closed + atom_flags = 0 //starts closed drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' @@ -371,4 +371,4 @@ /obj/item/reagent_containers/food/drinks/cans/alecan/Initialize() . = ..() - reagents.add_reagent("ale", 30) \ No newline at end of file + reagents.add_reagent("ale", 30) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index bfe8627d29..05f8b1dff0 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -10,7 +10,7 @@ desc = "Just your average condiment container." icon = 'icons/obj/food.dmi' icon_state = "emptycondiment" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER possible_transfer_amounts = list(1,5,10) center_of_mass = list("x"=16, "y"=6) volume = 50 diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index cf2e2ebdcc..f9a7a40a5e 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -8,7 +8,7 @@ drop_sound = 'sound/items/drop/drinkglass.ogg' pickup_sound = 'sound/items/pickup/drinkglass.ogg' icon_state = null - flags = OPENCONTAINER + atom_flags = OPENCONTAINER amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5,10,15,25,30) volume = 50 @@ -49,10 +49,10 @@ playsound(src,"canopen", rand(10,50), 1) GLOB.cans_opened_roundstat++ to_chat(user, "You open [src] with an audible pop!") - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER /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 && !(item_flags & NOBLUDGEON) && user.a_intent == I_HURT) return ..() if(standard_feed_mob(user, M)) @@ -124,7 +124,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = null volume = 150 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/food/drinks/golden_cup/on_reagent_change() ..() @@ -418,4 +418,4 @@ desc = "Keeping your drinks at the perfect temperature since 1892." icon_state = "vacuumflask" volume = 60 - center_of_mass = list("x"=15, "y"=4) \ No newline at end of file + center_of_mass = list("x"=15, "y"=4) diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index c2c9ead932..639db5038f 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -119,14 +119,14 @@ to_chat(user, "You stuff [R] into [src].") rag = R rag.forceMove(src) - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER update_icon() /obj/item/reagent_containers/food/drinks/bottle/proc/remove_rag(mob/user) if(!rag) return user.put_in_hands(rag) rag = null - flags |= (initial(flags) & OPENCONTAINER) + atom_flags |= (initial(atom_flags) & OPENCONTAINER) update_icon() /obj/item/reagent_containers/food/drinks/bottle/open(mob/user) @@ -182,7 +182,7 @@ throw_speed = 3 throw_range = 5 item_state = "beer" - flags = NOCONDUCT + atom_flags = NOCONDUCT attack_verb = list("stabbed", "slashed", "attacked") sharp = 1 edge = 0 @@ -625,7 +625,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small volume = 50 smash_duration = 1 - flags = 0 //starts closed + atom_flags = 0 //starts closed rag_underlay = "rag_small" /obj/item/reagent_containers/food/drinks/bottle/small/beer @@ -732,4 +732,4 @@ /obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize() . = ..() - reagents.add_reagent("dr_gibb", 50) \ No newline at end of file + reagents.add_reagent("dr_gibb", 50) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index fda5450c4e..25f76199f0 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1816,7 +1816,7 @@ filling_color = "#ADAC7F" center_of_mass = list("x"=16, "y"=14) w_class = ITEMSIZE_TINY - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/wrapped = 0 var/contents_type = "item" var/monkey_type = "Monkey" @@ -1849,7 +1849,7 @@ desc = "Just add water!" to_chat(user, "You unwrap the cube.") wrapped = 0 - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER return /obj/item/reagent_containers/food/snacks/cube/On_Consume(var/mob/M) @@ -1884,7 +1884,7 @@ /obj/item/reagent_containers/food/snacks/cube/monkeycube/wrapped desc = "Still wrapped in some paper." icon_state = "monkeycubewrap" - flags = 0 + atom_flags = 0 wrapped = 1 /obj/item/reagent_containers/food/snacks/cube/monkeycube/farwacube @@ -6856,7 +6856,7 @@ /obj/item/reagent_containers/food/snacks/canned name = "void can" icon = 'icons/obj/food_canned.dmi' - flags = 0 + atom_flags = 0 var/sealed = TRUE /obj/item/reagent_containers/food/snacks/canned/Initialize() @@ -6869,7 +6869,7 @@ to_chat(user, "It is [sealed ? "" : "un"]sealed.") /obj/item/reagent_containers/food/snacks/canned/proc/unseal() - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER sealed = FALSE update_icon() diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index d9914537e9..50206e47dc 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -9,7 +9,7 @@ item_state = "atoxinbottle" amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60) - flags = 0 + atom_flags = 0 volume = 60 drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' diff --git a/code/modules/food/glass/bottle/robot.dm b/code/modules/food/glass/bottle/robot.dm index a3da0e3b9f..cfc9609abe 100644 --- a/code/modules/food/glass/bottle/robot.dm +++ b/code/modules/food/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 = OPENCONTAINER volume = 60 var/reagent = "" diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index a8287e1981..87c50b3ab8 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -8,7 +8,7 @@ var/max_space = 20//Maximum sum of w-classes of foods in this container at once var/max_reagents = 80//Maximum units of reagents var/food_items = 0 // Used for icon updates - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT var/list/insertable = list( /obj/item/reagent_containers/food/snacks, /obj/item/holder, @@ -22,7 +22,7 @@ /obj/item/reagent_containers/cooking_container/Initialize() . = ..() create_reagents(max_reagents) - flags |= OPENCONTAINER | NOREACT + atom_flags |= OPENCONTAINER | NOREACT /obj/item/reagent_containers/cooking_container/examine(var/mob/user) diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index c09c821f02..16faf255a4 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -15,7 +15,7 @@ density = 1 anchored = 0 use_power = USE_POWER_OFF - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA @@ -193,4 +193,4 @@ #undef ICECREAM_STRAWBERRY #undef ICECREAM_BLUE #undef CONE_WAFFLE -#undef CONE_CHOC \ No newline at end of file +#undef CONE_CHOC diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index bb82ebb111..35c7f4fea1 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -11,7 +11,7 @@ active_power_usage = 2000 clicksound = "button" clickvol = "30" - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT circuit = /obj/item/circuitboard/microwave var/operating = 0 // Is it on? var/dirty = 0 // = {0..100} Does it need cleaning? @@ -100,7 +100,7 @@ src.icon_state = "mw" src.broken = 0 // Fix it! src.dirty = 0 // just to be sure - src.flags = OPENCONTAINER | NOREACT + src.atom_flags = OPENCONTAINER | NOREACT else to_chat(user, "It's broken!") return 1 @@ -119,7 +119,7 @@ src.dirty = 0 // It's clean! src.broken = 0 // just to be sure src.icon_state = "mw" - src.flags = OPENCONTAINER | NOREACT + src.atom_flags = OPENCONTAINER | NOREACT else //Otherwise bad luck!! to_chat(user, "It's dirty!") return 1 @@ -422,7 +422,7 @@ /obj/machinery/microwave/proc/muck_finish() src.visible_message("The microwave gets covered in muck!") src.dirty = 100 // Make it dirty so it can't be used util cleaned - src.flags = null //So you can't add condiments + src.atom_flags = 0 //So you can't add condiments src.icon_state = "mwbloody" // Make it look dirty too src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() @@ -436,7 +436,7 @@ src.icon_state = "mwb" // Make it look all busted up and shit src.visible_message("The microwave breaks!") //Let them know they're stupid src.broken = 2 // Make it broken so it can't be used util fixed - src.flags = null //So you can't add condiments + src.atom_flags = 0 //So you can't add condiments src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() soundloop.stop() diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index 329de31ba8..5d3a9ebdfe 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -12,7 +12,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 - flags = NOREACT + atom_flags = NOREACT var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. var/list/item_records = list() var/datum/stored_item/currently_vending = null //What we're putting out of the machine. @@ -234,14 +234,14 @@ amount = params["amount"] else amount = input("How many items?", "How many items would you like to take out?", 1) as num|null - + if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) return FALSE - + var/index = text2num(params["index"]) if(index < 1 || index > LAZYLEN(item_records)) return TRUE - + vend(item_records[index], amount) return TRUE return FALSE diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 8cc4a3911b..09b031a43c 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -201,7 +201,7 @@ hit(50) return - if(W.flags & NOBLUDGEON) return + if(W.item_flags & NOBLUDGEON) return if(W.is_screwdriver()) to_chat(user, "It's a holowindow, you can't unfasten it!") @@ -288,7 +288,7 @@ throw_range = 5 throwforce = 0 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + item_flags = NOBLOODY var/active = 0 /obj/item/holo/esword/green diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index 2c1e3b5cce..f9f7404cf1 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -31,7 +31,7 @@ /obj/machinery/station_map/Initialize() . = ..() - flags |= ON_BORDER // Why? It doesn't help if its not density + atom_flags |= ON_BORDER // Why? It doesn't help if its not density /obj/machinery/station_map/Initialize() . = ..() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index f5f251d305..5762934a40 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/hydroponics_products.dmi' icon_state = "blank" desc = "Nutritious! Probably." - flags = NOCONDUCT + atom_flags = NOCONDUCT slot_flags = SLOT_HOLSTER drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index a91e188f96..8c8cf5b5b1 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -35,7 +35,7 @@ desc = "A reminder of meals gone by." icon = 'icons/obj/trash.dmi' icon_state = "corncob" - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_SMALL throwforce = 0 throw_speed = 4 @@ -54,7 +54,7 @@ desc = "A peel from a banana." icon = 'icons/obj/items.dmi' icon_state = "banana_peel" - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_SMALL throwforce = 0 throw_speed = 4 diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index cebd8fae3a..c8cf551592 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 = OPENCONTAINER volume = 100 var/mechanical = 1 // Set to 0 to stop it from drawing the alert lights. diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm index 36b326c329..7bc9324b3e 100644 --- a/code/modules/hydroponics/trays/tray_reagents.dm +++ b/code/modules/hydroponics/trays/tray_reagents.dm @@ -1,7 +1,7 @@ /obj/item/plantspray icon = 'icons/obj/hydroponics_machines.dmi' item_state = "spraycan" - flags = NOBLUDGEON + item_flags = NOBLUDGEON slot_flags = SLOT_BELT throwforce = 4 w_class = ITEMSIZE_SMALL diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 86a49d4625..4b00620c82 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -110,7 +110,7 @@ icon_state = "chemical_cell" 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 = OPENCONTAINER 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 094a6faccc..14510d4011 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -15,7 +15,7 @@ icon_state = "smoke" extended_desc = "This smoke generator creates clouds of smoke on command. It can also hold liquids inside, which will go \ into the smoke clouds when activated. The reagents are consumed when smoke is made." - flags = OPENCONTAINER + atom_flags = OPENCONTAINER complexity = 20 cooldown_per_use = 30 SECONDS inputs = list() @@ -52,7 +52,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. A negative amount makes the injector draw out reagents." - flags = OPENCONTAINER + atom_flags = OPENCONTAINER complexity = 20 cooldown_per_use = 6 SECONDS inputs = list("target" = IC_PINTYPE_REF, "injection amount" = IC_PINTYPE_NUMBER) @@ -186,7 +186,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 = OPENCONTAINER complexity = 8 inputs = list("source" = IC_PINTYPE_REF, "target" = IC_PINTYPE_REF, "injection amount" = IC_PINTYPE_NUMBER) inputs_default = list("3" = 5) @@ -240,7 +240,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 = OPENCONTAINER complexity = 4 inputs = list() outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF) @@ -264,7 +264,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 = OPENCONTAINER | NOREACT complexity = 8 spawn_flags = IC_SPAWN_RESEARCH origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) @@ -274,7 +274,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 = OPENCONTAINER complexity = 16 volume = 180 spawn_flags = IC_SPAWN_RESEARCH @@ -285,7 +285,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." icon_state = "reagent_scan" extended_desc = "Mostly useful for reagent filter." - flags = OPENCONTAINER + atom_flags = OPENCONTAINER complexity = 8 outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF,"list of reagents" = IC_PINTYPE_LIST) activators = list("scan" = IC_PINTYPE_PULSE_IN) @@ -308,7 +308,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 = OPENCONTAINER 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) @@ -356,6 +356,3 @@ source.reagents.trans_id_to(target, G.id, transfer_amount) activate_pin(2) push_data() - - - diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 31653d22e2..6a73cf0778 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -174,7 +174,7 @@ Book Cart End item_state = "book" throw_speed = 1 throw_range = 5 - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb = list("bashed", "whacked", "educated") var/dat // Actual page content @@ -405,4 +405,4 @@ Book Cart End to_chat(user, "Computer has been associated with this unit.") else to_chat(user, "No associated computer found. Only local scans will function properly.") - to_chat(user, "\n") \ No newline at end of file + to_chat(user, "\n") diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 6e509db5fa..b5a8e016e5 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -43,15 +43,6 @@ else light = new /datum/light_source(src, .) -/atom/Initialize() - . = ..() - - if(light_power && light_range) - update_light() - - if(opacity && isturf(loc)) - var/turf/T = loc - T.has_opaque_atom = TRUE // No need to recalculate it in this case, it's guranteed to be on afterwards anyways. /atom/Destroy() if(light) diff --git a/code/modules/materials/sheets/_sheets.dm b/code/modules/materials/sheets/_sheets.dm index 933b792789..58595e4da6 100644 --- a/code/modules/materials/sheets/_sheets.dm +++ b/code/modules/materials/sheets/_sheets.dm @@ -41,7 +41,7 @@ color = material.icon_colour if(!material.conductive) - flags |= NOCONDUCT + atom_flags |= NOCONDUCT matter = material.get_matter() update_strings() diff --git a/code/modules/materials/sheets/supermatter.dm b/code/modules/materials/sheets/supermatter.dm index c56f298088..8f7165c4e6 100644 --- a/code/modules/materials/sheets/supermatter.dm +++ b/code/modules/materials/sheets/supermatter.dm @@ -29,7 +29,7 @@ if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user var/obj/item/clothing/gloves/G = H.gloves - if(istype(G) && ((G.flags & THICKMATERIAL && prob(70)) || istype(G, /obj/item/clothing/gloves/gauntlets))) + if(istype(G) && ((G.item_flags & THICKMATERIAL && prob(70)) || istype(G, /obj/item/clothing/gloves/gauntlets))) burn_user = FALSE if(burn_user) @@ -52,4 +52,4 @@ qdel(src) return SSradiation.radiate(get_turf(src), amount * 2) - ..() \ No newline at end of file + ..() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index edd7da3dc7..717874d836 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -751,7 +751,7 @@ var/global/list/mining_overlay_cache = list() if(mineral_name && (mineral_name in GLOB.ore_data)) mineral = GLOB.ore_data[mineral_name] - if(initialized) + if(atom_flags & ATOM_INITIALIZED) UpdateMineral() update_icon() @@ -767,7 +767,7 @@ var/global/list/mining_overlay_cache = list() if(isnull(T.geologic_data)) T.geologic_data = new /datum/geosample(T) - + if(isnull(T.finds) || isemptylist(T.finds)) T.finds = list() if(prob(50)) @@ -792,4 +792,3 @@ var/global/list/mining_overlay_cache = list() T.artifact_find = new() T.update_icon() - diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index dc55e668ce..842b464e54 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -415,7 +415,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 & ON_BORDER)) return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 9f1cb56570..5993667d2b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -308,7 +308,7 @@ emp_act if(!((I.damtype == BRUTE) || (I.damtype == HALLOSS))) return - if(!(I.flags & NOBLOODY)) + if(!(I.item_flags & NOBLOODY)) I.add_blood(src) var/bloody = 0 diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 6f83805372..e681fc8136 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -145,7 +145,7 @@ Whatever you did that made the last camera window disappear-- don't do that agai name = "" icon = 'icons/misc/pic_in_pic.dmi' icon_state = "room_background" - flags = NOJAUNT + atom_flags = NOJAUNT plane = SPACE_PLANE layer = AREA_LAYER + 0.1 diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index e94ce6c135..84c770f46e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -10,7 +10,7 @@ drop_sound = 'sound/items/drop/device.ogg' icon_state = "gripper" - flags = NOBLUDGEON + item_flags = NOBLUDGEON //Has a list of items that it can hold. var/list/can_hold = list( diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index f0d9be34a7..70d4c7b469 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -19,7 +19,7 @@ name = "grab" icon = 'icons/mob/screen1.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 diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 86dec11eb2..d694c9e96f 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -357,14 +357,14 @@ // Called on everything that falling_atom might hit. Return TRUE if you're handling it so find_fall_target() will stop checking. /atom/proc/CheckFall(var/atom/movable/falling_atom) - if(density && !(flags & ON_BORDER)) + if(density && !(atom_flags & ON_BORDER)) return TRUE // If you are hit: how is it handled. // Return TRUE if the generic fall_impact should be called // Return FALSE if you handled it yourself or if there's no effect from hitting you /atom/proc/check_impact(var/atom/movable/falling_atom) - if(density && !(flags & ON_BORDER)) + if(density && !(atom_flags & ON_BORDER)) return TRUE // By default all turfs are gonna let you hit them regardless of density. diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 932b9b52d0..df437fb489 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -181,7 +181,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) decays = FALSE parent_organ = BP_TORSO clone_source = TRUE - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/list/owner_flavor_text = list() /obj/item/organ/internal/brain/slime/is_open_container() diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index 88a5a704fa..69e55d8184 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -84,7 +84,7 @@ /obj/effect/shuttle_landmark/ship name = "Open Space" landmark_tag = "ship" - flags = SLANDMARK_FLAG_ZERO_G // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work. + atom_flags = SLANDMARK_FLAG_ZERO_G // *Not* AUTOSET, these must be world.turf and world.area for lazy loading to work. var/shuttle_name var/list/visitors // landmark -> visiting shuttle stationed there @@ -117,7 +117,7 @@ // /obj/effect/shuttle_landmark/visiting_shuttle - flags = SLANDMARK_FLAG_AUTOSET | SLANDMARK_FLAG_ZERO_G + atom_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) @@ -207,4 +207,4 @@ if(SHIP_STATUS_TRANSIT) return "Maneuvering under secondary thrust." if(SHIP_STATUS_OVERMAP) - return "In open space." \ No newline at end of file + return "In open space." diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index 1a6fb2efbd..47777c6742 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -17,7 +17,7 @@ pixel_x = rand(-9, 9) if(newPaper) internalPaper = newPaper - flags = newPaper.flags + atom_flags = newPaper.atom_flags color = newPaper.color newPaper.forceMove(src) else diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index a37810d539..94b6e6b13e 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -116,7 +116,7 @@ */ /obj/item/pen/reagent - flags = OPENCONTAINER + atom_flags = OPENCONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/pen/reagent/Initialize() diff --git a/code/modules/persistence/datum/persistence_datum.dm b/code/modules/persistence/datum/persistence_datum.dm index a52b57fb66..563291b922 100644 --- a/code/modules/persistence/datum/persistence_datum.dm +++ b/code/modules/persistence/datum/persistence_datum.dm @@ -77,7 +77,7 @@ if(!T || !(T.z in using_map.station_levels) ) return FALSE var/area/A = get_area(T) - if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) + if(!A || (A.area_flags & AREA_FLAG_IS_NOT_PERSISTENT)) return FALSE return TRUE @@ -104,7 +104,7 @@ /datum/persistent/proc/Shutdown() if(fexists(filename)) fdel(filename) - + var/list/to_store = list() for(var/thing in SSpersistence.tracking_values[type]) if(!IsValidEntry(thing)) @@ -121,10 +121,10 @@ var/list/my_tracks = SSpersistence.tracking_values[type] if(!my_tracks?.len) return - + . = list("[capitalize(name)]") . += "
" - + for(var/thing in my_tracks) . += "[GetAdminDataStringFor(thing, can_modify, user)]" . += "
" @@ -147,4 +147,4 @@ if(.) var/mob/user = locate(href_list["caller"]) if(user) - SSpersistence.show_info(user) \ No newline at end of file + SSpersistence.show_info(user) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 7058f36363..c9b2c6f82d 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -231,7 +231,7 @@ var/global/list/possible_cable_coil_colours = list( shock(user, 5, 0.2) else - if(!(W.flags & NOCONDUCT)) + if(!(W.atom_flags & NOCONDUCT)) shock(user, 50, 0.7) src.add_fingerprint(user) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index dd4abb7852..438f4e7ad8 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -550,7 +550,7 @@ var/global/list/light_type_cache = list() if(M == user) continue M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) - if(on && !(W.flags & NOCONDUCT)) + if(on && !(W.atom_flags & NOCONDUCT)) //if(!user.mutations & COLD_RESISTANCE) if (prob(12)) electrocute_mob(user, get_area(src), src, 0.3) @@ -570,7 +570,7 @@ var/global/list/light_type_cache = list() return to_chat(user, "You stick \the [W] into the light socket!") - if(has_power() && !(W.flags & NOCONDUCT)) + if(has_power() && !(W.atom_flags & NOCONDUCT)) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 3f45556ec6..756acb0ab3 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -135,7 +135,7 @@ var/impact_effect_type = null var/list/impacted_mobs = list() - + // TGMC Ammo HUD Port var/hud_state = "unknown" // What HUD state we use when we have ammunition. var/hud_state_empty = "unknown" // The empty state. DON'T USE _FLASH IN THE NAME OF THE EMPTY STATE STRING, THAT IS ADDED BY THE CODE. @@ -636,7 +636,7 @@ return 1 /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, flags) + check_trajectory(target, user, pass_flags, atom_flags) /obj/item/projectile/CanPass() return TRUE diff --git a/code/modules/projectiles/projectile/trace.dm b/code/modules/projectiles/projectile/trace.dm index aaf7b9a7b6..66610c5939 100644 --- a/code/modules/projectiles/projectile/trace.dm +++ b/code/modules/projectiles/projectile/trace.dm @@ -1,6 +1,6 @@ // Helper proc to check if you can hit them or not. // Will return a list of hit mobs/objects. -/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=null) +/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=0) if(!istype(target) || !istype(firer)) return 0 @@ -8,13 +8,13 @@ //Set the flags and pass flags to that of the real projectile... if(!isnull(flags)) - trace.flags = flags + trace.atom_flags = 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) + check_trajectory(target, user, pass_flags, atom_flags) //"Tracing" projectile /obj/item/projectile/test //Used to see if you can hit them. diff --git a/code/modules/reagents/holder/distilling.dm b/code/modules/reagents/holder/distilling.dm index 1599f395d9..36bc3a8ab0 100644 --- a/code/modules/reagents/holder/distilling.dm +++ b/code/modules/reagents/holder/distilling.dm @@ -1,7 +1,7 @@ /datum/reagents/distilling/handle_reactions() if(QDELETED(my_atom)) return FALSE - if(my_atom.flags & NOREACT) + if(my_atom.atom_flags & NOREACT) return FALSE var/reaction_occurred var/list/eligible_reactions = list() @@ -23,4 +23,4 @@ for(var/i in effect_reactions) var/decl/chemical_reaction/C = i C.post_reaction(src) - update_total() \ No newline at end of file + update_total() diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm index 0efa61409e..69f7c81d27 100644 --- a/code/modules/reagents/holder/holder.dm +++ b/code/modules/reagents/holder/holder.dm @@ -78,7 +78,7 @@ /datum/reagents/proc/handle_reactions() if(QDELETED(my_atom)) return FALSE - if(my_atom.flags & NOREACT) + if(my_atom.atom_flags & NOREACT) return FALSE var/reaction_occurred var/list/eligible_reactions = list() diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index c4e1cf9241..71bfd54202 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -19,7 +19,7 @@ var/pillsprite = 1 var/max_pill_count = 20 var/printing = FALSE - flags = OPENCONTAINER + atom_flags = OPENCONTAINER clicksound = "button" /obj/machinery/chem_master/Initialize() @@ -495,4 +495,4 @@ /obj/machinery/chem_master/condimaster name = "CondiMaster 3000" - condi = 1 \ No newline at end of file + condi = 1 diff --git a/code/modules/reagents/machinery/chemalyzer.dm b/code/modules/reagents/machinery/chemalyzer.dm index de59088c51..1aa22f20c0 100644 --- a/code/modules/reagents/machinery/chemalyzer.dm +++ b/code/modules/reagents/machinery/chemalyzer.dm @@ -53,11 +53,11 @@ to_chat(user, span("notice", "Contains [R.volume]u of [R.name].
[R.description]
")) // Last, unseal it if it's an autoinjector. - if(istype(I,/obj/item/reagent_containers/hypospray/autoinjector/biginjector) && !(I.flags & OPENCONTAINER)) - I.flags |= OPENCONTAINER + if(istype(I,/obj/item/reagent_containers/hypospray/autoinjector/biginjector) && !(I.atom_flags & OPENCONTAINER)) + I.atom_flags |= OPENCONTAINER to_chat(user, span("notice", "Sample container unsealed.
")) to_chat(user, span("notice", "Scanning of \the [I] complete.")) analyzing = FALSE update_icon() - return \ No newline at end of file + return diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index 99ac998e1a..eb044bcf89 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -55,10 +55,10 @@ ..() if (is_open_container()) to_chat(usr, "You put the cap on \the [src].") - flags ^= OPENCONTAINER + atom_flags ^= OPENCONTAINER else to_chat(usr, "You take the cap off \the [src].") - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER /obj/item/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag) if (!is_open_container() || !flag) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7a98da1bca..eeb3440be0 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -14,7 +14,7 @@ possible_transfer_amounts = list(5,10,15,25,30,60) volume = 60 w_class = ITEMSIZE_SMALL - flags = OPENCONTAINER | NOCONDUCT + atom_flags = OPENCONTAINER | NOCONDUCT unacidable = 1 //glass doesn't dissolve in acid drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' @@ -74,14 +74,14 @@ ..() if(is_open_container()) to_chat(usr, "You put the lid on \the [src].") - flags ^= OPENCONTAINER + atom_flags ^= OPENCONTAINER else to_chat(usr, "You take the lid off \the [src].") - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER update_icon() /obj/item/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, def_zone) - if(force && !(flags & NOBLUDGEON) && user.a_intent == I_HURT) + if(force && !(item_flags & NOBLUDGEON) && user.a_intent == I_HURT) return ..() if(standard_feed_mob(user, M)) @@ -134,7 +134,7 @@ update_name_label() if(istype(W,/obj/item/storage/bag)) ..() - if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP) + if(W && W.w_class <= w_class && (atom_flags & OPENCONTAINER) && user.a_intent != I_HELP) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) @@ -209,7 +209,7 @@ volume = 120 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/glass/beaker/noreact name = "cryostasis beaker" @@ -219,7 +219,7 @@ matter = list("glass" = 500) volume = 60 amount_per_transfer_from_this = 10 - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT /obj/item/reagent_containers/glass/beaker/bluespace name = "bluespace beaker" @@ -230,7 +230,7 @@ volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120,300) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/glass/beaker/vial name = "vial" @@ -242,7 +242,7 @@ w_class = ITEMSIZE_TINY amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,30) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/glass/beaker/cryoxadone name = "beaker (cryoxadone)" @@ -259,7 +259,7 @@ volume = 120 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/reagent_containers/glass/bucket desc = "It's a bucket." @@ -273,7 +273,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10,20,30,60,120) volume = 120 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER unacidable = 0 drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' @@ -331,7 +331,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10,20,30,60,120) volume = 120 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER unacidable = 0 drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f632358d3d..afe1d4492b 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -12,7 +12,7 @@ unacidable = 1 volume = 30 possible_transfer_amounts = null - flags = OPENCONTAINER + atom_flags = OPENCONTAINER slot_flags = SLOT_BELT drop_sound = 'sound/items/drop/gun.ogg' pickup_sound = 'sound/items/pickup/gun.ogg' @@ -115,7 +115,7 @@ if(!do_after(user,30) || loaded_vial || !(W in user)) return 0 if(W.is_open_container()) - W.flags ^= OPENCONTAINER + W.atom_flags ^= OPENCONTAINER W.update_icon() user.drop_item() W.loc = src @@ -152,13 +152,13 @@ /obj/item/reagent_containers/hypospray/autoinjector/used/Initialize() . = ..() - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER icon_state = "[initial(icon_state)]0" /obj/item/reagent_containers/hypospray/autoinjector/do_injection(mob/living/carbon/human/H, mob/living/user) . = ..() if(.) // Will occur if successfully injected. - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER update_icon() /obj/item/reagent_containers/hypospray/autoinjector/update_icon() diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 02071fad0a..806b6f5864 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -5,7 +5,8 @@ icon_state = "cleaner" item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) - flags = OPENCONTAINER|NOBLUDGEON + atom_flags = OPENCONTAINER + item_flags = NOBLUDGEON matter = list("glass" = 300, MAT_STEEL = 300) slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm index fc14436b24..0d215df647 100644 --- a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm +++ b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm @@ -7,102 +7,102 @@ // The good. /obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 // The somewhat bad. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 // The very bad. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = 0 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified init_hide_identity = TRUE - flags = 0 \ No newline at end of file + atom_flags = 0 diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 80918684a6..dc2f4583f1 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 diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 78bdf7b27a..cd5d838e93 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -7,7 +7,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter name = "Circuit Imprinter" icon_state = "circuit_imprinter" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER circuit = /obj/item/circuitboard/circuit_imprinter var/list/datum/design/queue = list() var/progress = 0 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6b17cac379..59c0b2ee45 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -1,7 +1,7 @@ /obj/machinery/r_n_d/protolathe name = "Protolathe" icon_state = "protolathe" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER circuit = /obj/item/circuitboard/protolathe use_power = USE_POWER_IDLE idle_power_usage = 30 @@ -237,4 +237,4 @@ return materials[material] -= ejected * S.perunit if(recursive && materials[material] >= S.perunit) - eject_materials(material, -1) \ No newline at end of file + eject_materials(material, -1) diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 3c9fc4449d..e46a79eb75 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -7,7 +7,7 @@ unacidable = 1 simulated = 0 invisibility = 101 - flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base. + atom_flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base. //ID of the landmark var/landmark_tag @@ -30,7 +30,7 @@ . = INITIALIZE_HINT_LATELOAD // Even if this flag is set, hardcoded values take precedence. - if(flags & SLANDMARK_FLAG_AUTOSET) + if(atom_flags & SLANDMARK_FLAG_AUTOSET) if(ispath(base_area)) var/area/A = locate(base_area) if(!istype(A)) @@ -123,7 +123,7 @@ /obj/effect/shuttle_landmark/automatic name = "Navpoint" landmark_tag = "navpoint" - flags = SLANDMARK_FLAG_AUTOSET + atom_flags = SLANDMARK_FLAG_AUTOSET /obj/effect/shuttle_landmark/automatic/Initialize() landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]" diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 2131a337c0..89deeb5b4a 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -290,7 +290,7 @@ // If shuttle has no internal gravity, update our gravity with destination gravity if((flags & SHUTTLE_FLAGS_ZERO_G)) var/new_grav = 1 - if(destination.flags & SLANDMARK_FLAG_ZERO_G) + if(destination.atom_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/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm index beb0bab011..3f28d46146 100644 --- a/code/modules/shuttles/shuttle_autodock.dm +++ b/code/modules/shuttles/shuttle_autodock.dm @@ -215,4 +215,4 @@ return //do nothing for now /obj/effect/shuttle_landmark/transit - flags = SLANDMARK_FLAG_ZERO_G|SLANDMARK_FLAG_AUTOSET + atom_flags = SLANDMARK_FLAG_ZERO_G|SLANDMARK_FLAG_AUTOSET diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm index 6d55fd9545..89f9e43d72 100644 --- a/code/modules/spells/targeted/ethereal_jaunt.dm +++ b/code/modules/spells/targeted/ethereal_jaunt.dm @@ -91,7 +91,7 @@ /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction) if (!src.canmove || reappearing) return var/turf/newLoc = get_step(src,direction) - if(!(newLoc.flags & NOJAUNT)) + if(!(newLoc.atom_flags & NOJAUNT)) loc = newLoc var/turf/T = get_turf(loc) if(!T.contains_dense_objects()) @@ -104,4 +104,4 @@ /obj/effect/dummy/spell_jaunt/ex_act(blah) return /obj/effect/dummy/spell_jaunt/bullet_act(blah) - return \ No newline at end of file + return diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 18bcc4fe58..333ff989df 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -88,7 +88,7 @@ layer = ABOVE_MOB_LAYER climbable = 0 //flipping tables allows them to be used as makeshift barriers flipped = 1 - flags |= ON_BORDER + atom_flags |= ON_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) @@ -106,7 +106,7 @@ reset_plane_and_layer() flipped = 0 climbable = initial(climbable) - flags &= ~ON_BORDER + atom_flags &= ~ON_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) @@ -115,4 +115,4 @@ update_connections(1) update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index 113da1fb06..330f4a6e8d 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -12,7 +12,7 @@ origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = FALSE - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /obj/item/slime_extract/Initialize() @@ -986,6 +986,3 @@ /decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder) new /obj/item/slimepotion/unity(get_turf(holder.my_atom)) ..() - - - diff --git a/code/unit_tests/subsystem_tests.dm b/code/unit_tests/subsystem_tests.dm index eab1f91445..6e06a03e5b 100644 --- a/code/unit_tests/subsystem_tests.dm +++ b/code/unit_tests/subsystem_tests.dm @@ -34,7 +34,7 @@ set background = TRUE // avoid infinite loop warning; SS will still wait for us. var/fail = FALSE for(var/atom/atom in world) - if(!atom.initialized && !QDELETED(atom)) // Not ideal to skip over qdeleted atoms, but a lot of current code uses pre-init qdels + if(!QDELETED(atom) && !(atom.atom_flags & ATOM_INITIALIZED)) // Not ideal to skip over qdeleted atoms, but a lot of current code uses pre-init qdels log_bad("Uninitialized atom: [atom.type] - [atom.get_log_info_line()]") fail = TRUE if(fail) diff --git a/maps/cynosure/cynosure_areas.dm b/maps/cynosure/cynosure_areas.dm index 16d988107e..8f3db9b2e0 100644 --- a/maps/cynosure/cynosure_areas.dm +++ b/maps/cynosure/cynosure_areas.dm @@ -2,7 +2,7 @@ /area/surface name = "The Surface (Don't Use)" - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED /area/surface/center name = "Center" @@ -43,7 +43,7 @@ /area/surface/outside ambience = AMBIENCE_SIF always_unpowered = TRUE - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT outdoors = OUTDOORS_YES // The area near the station, so POIs don't show up right next to the outpost. @@ -102,7 +102,7 @@ name = "Gautelfr River" /area/surface/cave - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT always_unpowered = TRUE // The bottom half that connects to the outpost and is safer. @@ -509,13 +509,13 @@ /area/surface/station/crew_quarters/heads/cmo name = "\improper Medbay - CMO's Office" icon_state = "head_quarters" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/surface/station/crew_quarters/heads/hop name = "\improper Head of Personnel's Office" icon_state = "head_quarters" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/surface/station/crew_quarters/heads/hos @@ -669,7 +669,7 @@ //Maintenance /area/surface/station/maintenance - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED sound_env = TUNNEL_ENCLOSED turf_initializer = new /datum/turf_initializer/maintenance() ambience = AMBIENCE_MAINTENANCE @@ -803,7 +803,7 @@ /area/surface/station/construction name = "\improper Engineering Construction Area" icon_state = "yellow" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT /area/surface/station/construction/bar name = "\improper Bar Basement" @@ -865,7 +865,7 @@ /area/surface/station/medical/etc name = "\improper Medical - Emergency Treatment Centre" icon_state = "exam_room" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //Trust me. + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //Trust me. /area/surface/station/medical/hallway name = "\improper Medbay - Hallway" @@ -937,12 +937,12 @@ /area/surface/station/medical/surgery name = "\improper Medbay - Operating Theatre 1" icon_state = "surgery" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //This WOULD become a filth pit + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //This WOULD become a filth pit /area/surface/station/medical/surgery2 name = "\improper Medbay - Operating Theatre 2" icon_state = "surgery" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT /area/surface/station/medical/surgeryobs name = "\improper Medbay - Operation Observation" @@ -990,7 +990,7 @@ /area/surface/outside/station name = "\improper Station" ambience = AMBIENCE_SIF - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT /area/surface/outside/station/roof name = "\improper Roof" @@ -1067,7 +1067,7 @@ /area/surface/station/quartermaster/delivery name = "\improper Cargo - Delivery Office" - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //So trash doesn't pile up too hard. + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT //So trash doesn't pile up too hard. /area/surface/station/quartermaster/lockerroom name = "\improper Cargo Locker Room" @@ -1344,7 +1344,7 @@ icon_state = "shuttle" requires_power = 0 dynamic_lighting = 1 - flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT + area_flags = RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT /area/turbolift/start name = "\improper Turbolift Start" @@ -1551,7 +1551,7 @@ name = "\improper Response Team Ship" icon_state = "centcom" requires_power = 0 - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_HIGHSEC /area/shuttle/response_ship/start @@ -1631,7 +1631,7 @@ icon_state = "syndie-ship" requires_power = 0 dynamic_lighting = 0 - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_HIGHSEC /area/syndicate_station @@ -1639,7 +1639,7 @@ icon_state = "syndie-ship" requires_power = 0 dynamic_lighting = 0 - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_HIGHSEC /area/syndicate_station/start @@ -1700,7 +1700,7 @@ icon_state = "yellow" requires_power = 0 dynamic_lighting = 0 - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_HIGHSEC /area/skipjack_station/transit @@ -1754,7 +1754,7 @@ name = "\improper Ninja Base" icon_state = "green" requires_power = 0 - flags = RAD_SHIELDED + area_flags = RAD_SHIELDED ambience = AMBIENCE_HIGHSEC /area/ninja_dojo/dojo diff --git a/maps/cynosure/cynosure_shuttles.dm b/maps/cynosure/cynosure_shuttles.dm index fff6c8b241..b72f3868b2 100644 --- a/maps/cynosure/cynosure_shuttles.dm +++ b/maps/cynosure/cynosure_shuttles.dm @@ -316,7 +316,7 @@ } \ /obj/effect/shuttle_landmark/cynosure/escape_pod##NUMBER/transit { \ landmark_tag = "escape_pod_"+ #NUMBER +"_transit"; \ - flags = SLANDMARK_FLAG_AUTOSET; \ + atom_flags = SLANDMARK_FLAG_AUTOSET; \ } ESCAPE_POD(1) @@ -349,7 +349,7 @@ ESCAPE_POD(1) /obj/effect/shuttle_landmark/cynosure/large_escape_pod1/transit landmark_tag = "large_escape_pod1_transit" - flags = SLANDMARK_FLAG_AUTOSET + atom_flags = SLANDMARK_FLAG_AUTOSET // Large Escape Pod 2 /datum/shuttle/autodock/ferry/escape_pod/large_escape_pod2 @@ -377,7 +377,7 @@ ESCAPE_POD(1) /obj/effect/shuttle_landmark/cynosure/large_escape_pod2/transit landmark_tag = "large_escape_pod2_transit" - flags = SLANDMARK_FLAG_AUTOSET + atom_flags = SLANDMARK_FLAG_AUTOSET //Cynosure Station Docks @@ -505,4 +505,4 @@ ESCAPE_POD(1) vessel_mass = 1000 vessel_size = SHIP_SIZE_TINY shuttle = "Private Vessel" -*/ \ No newline at end of file +*/ diff --git a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm index 2b8dc4073a..f6f97e2da8 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm @@ -1,11 +1,10 @@ /area/submap name = "Submap Area" icon_state = "submap" - flags = RAD_SHIELDED ambience = AMBIENCE_RUINS secret_name = TRUE forbid_events = TRUE - flags = AREA_FLAG_IS_NOT_PERSISTENT + area_flags = AREA_FLAG_IS_NOT_PERSISTENT | RAD_SHIELDED /area/submap/event //To be used for Events not for regular PoIs name = "Unknown"