diff --git a/_maps/templates/shuttles/overmaps/generic/cruiser.dmm b/_maps/templates/shuttles/overmaps/generic/cruiser.dmm index b9e5a33db21..7db92835041 100644 --- a/_maps/templates/shuttles/overmaps/generic/cruiser.dmm +++ b/_maps/templates/shuttles/overmaps/generic/cruiser.dmm @@ -41,7 +41,6 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - flags = 2; landmark_tag = "cruiser_fore"; name = "Vessel fore" }, @@ -4335,7 +4334,6 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - flags = 2; landmark_tag = "cruiser_port"; name = "Vessel port" }, @@ -7867,7 +7865,6 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - flags = 2; landmark_tag = "cruiser_starboard"; name = "Vessel starboard" }, @@ -8618,7 +8615,6 @@ /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; - flags = 2; landmark_tag = "cruiser_aft"; name = "Vessel aft" }, diff --git a/code/__DEFINES/_flags/atom_flags.dm b/code/__DEFINES/_flags/atom_flags.dm index ade721cff58..a0a6db0d78e 100644 --- a/code/__DEFINES/_flags/atom_flags.dm +++ b/code/__DEFINES/_flags/atom_flags.dm @@ -1,17 +1,18 @@ ///FLAG BITMASKS - Used in /atom/var/flags /// The atom is initialized -#define INITIALIZED (1<<0) +#define ATOM_INITIALIZED (1<<0) /// Item has priority to check when entering or leaving. -#define ON_BORDER (1<<1) +#define ATOM_BORDER (1<<1) /// Atom is admin spawned -#define ADMIN_SPAWNED (1<<2) +#define ATOM_ADMINSPAWNED (1<<2) /// get_hearers_in_view() returns us, meaning we intercept usually for-players messages. Mobs, mechas, etc should all have this! -#define HEAR (1<<3) +#define ATOM_HEAR (1<<3) /// Atom queued to SSoverlay for COMPILE_OVERLAYS -#define OVERLAY_QUEUED (1<<4) +#define ATOM_OVERLAY_QUEUED (1<<4) /// atom is absolute-abstract - should not be interactable or movable in any way shape or form #define ATOM_ABSTRACT (1<<5) /// we are an holographic atom from a holodeck/AR system +// todo: should this be an atom flag? #define HOLOGRAM (1<<6) /// Used for items if they don't want to get a blood overlay. // TODO: item flag @@ -48,12 +49,12 @@ */ #define HTML_USE_INITAL_ICON (1<<23) -DEFINE_BITFIELD(flags, list( - BITFIELD(INITIALIZED), - BITFIELD(ON_BORDER), - BITFIELD(ADMIN_SPAWNED), - BITFIELD(HEAR), - BITFIELD(OVERLAY_QUEUED), +DEFINE_BITFIELD(atom_flags, list( + BITFIELD(ATOM_INITIALIZED), + BITFIELD(ATOM_BORDER), + BITFIELD(ATOM_ADMINSPAWNED), + BITFIELD(ATOM_HEAR), + BITFIELD(ATOM_OVERLAY_QUEUED), BITFIELD(ATOM_ABSTRACT), BITFIELD(HOLOGRAM), BITFIELD(NOBLOODY), diff --git a/code/__DEFINES/controllers/_subsystems.dm b/code/__DEFINES/controllers/_subsystems.dm index 3c38a5c7322..1d64d08ab4a 100644 --- a/code/__DEFINES/controllers/_subsystems.dm +++ b/code/__DEFINES/controllers/_subsystems.dm @@ -32,7 +32,7 @@ ///type and all subtypes should always immediately call Initialize in New() #define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\ ..();\ - if(!(flags & INITIALIZED)) {\ + if(!(atom_flags & ATOM_INITIALIZED)) {\ args[1] = TRUE;\ SSatoms.InitAtom(src, args);\ }\ @@ -151,6 +151,6 @@ DEFINE_BITFIELD(runlevels, list( * Arguments: * * callback the callback to call on timer finish * * wait deciseconds to run the timer for - * * flags flags for this timer, see: code\__DEFINES\subsystems.dm + * * atom_flags atom_flags for this timer, see: code\__DEFINES\subsystems.dm */ #define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__) diff --git a/code/__DEFINES/controllers/overlays.dm b/code/__DEFINES/controllers/overlays.dm index b3293f9622d..11c4254d4dc 100644 --- a/code/__DEFINES/controllers/overlays.dm +++ b/code/__DEFINES/controllers/overlays.dm @@ -18,5 +18,5 @@ AA.copy_overlays(A, TRUE);\ }\ }\ - A.flags &= ~OVERLAY_QUEUED;\ + A.atom_flags &= ~ATOM_OVERLAY_QUEUED;\ } while (FALSE) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index a5fb061d7e3..3b2c346d512 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -88,7 +88,7 @@ var/i = 0 while(i < length(processing)) var/atom/A = processing[++i] - if(A.flags & HEAR) + if(A.atom_flags & ATOM_HEAR) . += A SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing, .) processing += A.contents diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 70ce04f4b1b..44b3c1f735c 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -150,7 +150,7 @@ */ /atom/proc/smooth_icon() smoothing_flags &= ~SMOOTH_QUEUED - flags |= HTML_USE_INITAL_ICON + atom_flags |= HTML_USE_INITAL_ICON if (!z) CRASH("[type] called smooth_icon() without being on a z-level") if(smoothing_flags & SMOOTH_CORNERS) diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index 9b870c8c4cf..525909e53c3 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -16,7 +16,7 @@ /proc/turf_clear(turf/T) for(var/atom/A in T) - if(!(A.flags & ATOM_ABSTRACT)) + if(!(A.atom_flags & ATOM_ABSTRACT)) return 0 return 1 @@ -136,7 +136,7 @@ // Move the objects. Not forceMove because the object isn't "moving" really, it's supposed to be on the "same" turf. for(var/obj/O in Origin) - if(O.flags & ATOM_ABSTRACT) + if(O.atom_flags & ATOM_ABSTRACT) continue O.loc = X O.update_light() @@ -146,7 +146,7 @@ // Move the mobs unless it's an AI eye or other eye type. for(var/mob/M in Origin) - if (M.flags & ATOM_ABSTRACT) + if (M.atom_flags & ATOM_ABSTRACT) continue if (isEye(M)) // If we need to check for more mobs, I'll add a variable. @@ -174,7 +174,7 @@ * This assumes that the atom is located inside the target turf. */ /atom/proc/is_between_turfs(turf/origin, turf/target) - if (flags & ON_BORDER) + if (atom_flags & ATOM_BORDER) var/testdir = get_dir(target, origin) return (dir & testdir) return TRUE diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 215870f78f3..26d851d2c90 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1185,9 +1185,9 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /// Properly prevents this mob from gaining huds or joining any global lists. /mob/dview/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) - if(flags & INITIALIZED) + if(atom_flags & ATOM_INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED return INITIALIZE_HINT_NORMAL /mob/dview/Destroy(force = FALSE) diff --git a/code/__HELPERS/vfx/see_anywhere.dm b/code/__HELPERS/vfx/see_anywhere.dm index 1a0ac308d28..e5ab31f5700 100644 --- a/code/__HELPERS/vfx/see_anywhere.dm +++ b/code/__HELPERS/vfx/see_anywhere.dm @@ -24,7 +24,7 @@ GLOBAL_DATUM_INIT(see_anywhere_appearance, /mutable_appearance, init_see_anywher mouse_opacity = MOUSE_OPACITY_TRANSPARENT appearance_flags = KEEP_TOGETHER anchored = TRUE - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT /proc/init_see_anywhere_overlay() var/mutable_appearance/I = new diff --git a/code/_onclick/adjacency.dm b/code/_onclick/adjacency.dm index a1630fa75c7..85fe1660b9c 100644 --- a/code/_onclick/adjacency.dm +++ b/code/_onclick/adjacency.dm @@ -88,7 +88,7 @@ var/turf/going_to = get_step(src, d) if(border_only) for(var/obj/O in src) - if(!(O.flags & ON_BORDER)) + if(!(O.atom_flags & ATOM_BORDER)) continue if(O == target || O == mover || (O.pass_flags_self & ATOM_PASS_CLICK)) continue diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index c7a9383f887..d456d4a4ead 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -17,7 +17,7 @@ */ /atom/Click(var/location, var/control, var/params) // This is their reaction to being clicked on (standard proc) - if(!(flags & INITIALIZED)) + if(!(atom_flags & ATOM_INITIALIZED)) to_chat(usr, SPAN_WARNING("[type] initialization failure. Click dropped. Contact a coder or admin.")) return if(src) @@ -25,7 +25,7 @@ usr.ClickOn(src, params) /atom/DblClick(var/location, var/control, var/params) - if(!(flags & INITIALIZED)) + if(!(atom_flags & ATOM_INITIALIZED)) to_chat(usr, SPAN_WARNING("[type] initialization failure. Click dropped. Contact a coder or admin.")) return if(src) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 3608c866d1a..bc356a8993a 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -33,7 +33,7 @@ avoid code duplication. This includes items that may sometimes act as a standard //I would prefer to rename this to attack(), but that would involve touching hundreds of files. /obj/item/proc/resolve_attackby(atom/A, mob/user, params, attack_modifier = 1) pre_attack(A, user) - if(!(flags & NOPRINT)) + if(!(atom_flags & NOPRINT)) add_fingerprint(user) return A.attackby(src, user, params, NONE, attack_modifier) diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index b3f03517d7f..bf7a1aa2e30 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -35,13 +35,13 @@ SUBSYSTEM_DEF(atoms) count = atoms.len for(var/I in atoms) var/atom/A = I - if(!(A.flags & INITIALIZED)) + if(!(A.atom_flags & ATOM_INITIALIZED)) InitAtom(I, mapload_arg) CHECK_TICK else count = 0 for(var/atom/A in world) - if(!(A.flags & INITIALIZED)) + if(!(A.atom_flags & ATOM_INITIALIZED)) InitAtom(A, mapload_arg) ++count CHECK_TICK @@ -88,7 +88,7 @@ SUBSYSTEM_DEF(atoms) if(!A) //possible harddel qdeleted = TRUE - else if(!(A.flags & INITIALIZED)) + else if(!(A.atom_flags & ATOM_INITIALIZED)) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT return qdeleted || QDELING(A) diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 1c8806ad31c..2e56abca70a 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(icon_smooth) cached.len-- if(QDELETED(smoothing_atom) || !(smoothing_atom.smoothing_flags & SMOOTH_QUEUED)) continue - if(smoothing_atom.flags & INITIALIZED) + if(smoothing_atom.atom_flags & ATOM_INITIALIZED) smoothing_atom.smooth_icon() else deferred += smoothing_atom diff --git a/code/controllers/subsystem/mapping/misc.dm b/code/controllers/subsystem/mapping/misc.dm index 391ed92971a..60a315fdfd3 100644 --- a/code/controllers/subsystem/mapping/misc.dm +++ b/code/controllers/subsystem/mapping/misc.dm @@ -25,7 +25,7 @@ for(var/atom/movable/AM as anything in T) if(AM.anchored) continue - if((AM.flags & ATOM_ABSTRACT)) + if((AM.atom_flags & ATOM_ABSTRACT)) continue if(istype(AM, /obj/effect/decal)) qdel(AM) diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 97b47717a0f..825c80b2850 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -113,7 +113,7 @@ SUBSYSTEM_DEF(overlays) else if(isloc(overlay)) var/atom/A = overlay - if (A.flags & OVERLAY_QUEUED) + if (A.atom_flags & ATOM_OVERLAY_QUEUED) COMPILE_OVERLAYS(A) appearance_bro.appearance = overlay //this works for images and atoms too! if(!ispath(overlay)) @@ -122,8 +122,8 @@ SUBSYSTEM_DEF(overlays) new_overlays += appearance_bro.appearance return new_overlays -#define NOT_QUEUED_ALREADY (!(flags & OVERLAY_QUEUED)) -#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.queue += src; +#define NOT_QUEUED_ALREADY (!(atom_flags & ATOM_OVERLAY_QUEUED)) +#define QUEUE_FOR_COMPILE atom_flags |= ATOM_OVERLAY_QUEUED; SSoverlays.queue += src; /atom/proc/cut_overlays() LAZYINITLIST(remove_overlays) remove_overlays = overlays.Copy() @@ -159,7 +159,7 @@ SUBSYSTEM_DEF(overlays) return // so it's up to date - if(other.flags & OVERLAY_QUEUED) + if(other.atom_flags & ATOM_OVERLAY_QUEUED) COMPILE_OVERLAYS(other) var/list/cached_other = other.overlays.Copy() if(cut_old || !length(overlays)) @@ -187,7 +187,7 @@ SUBSYSTEM_DEF(overlays) cut_overlays() return - if(other.flags & OVERLAY_QUEUED) + if(other.atom_flags & ATOM_OVERLAY_QUEUED) COMPILE_OVERLAYS(other) var/list/cached_other = other.overlays.Copy() if(cut_old || !overlays.len) diff --git a/code/controllers/subsystem/supply.dm b/code/controllers/subsystem/supply.dm index dfca7723cb1..af3411f44f0 100644 --- a/code/controllers/subsystem/supply.dm +++ b/code/controllers/subsystem/supply.dm @@ -168,7 +168,7 @@ SUBSYSTEM_DEF(supply) continue var/occupied = 0 for(var/atom/A in T.contents) - if((A.flags & ATOM_ABSTRACT)) + if((A.atom_flags & ATOM_ABSTRACT)) continue occupied = 1 break diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index fdc8464a192..9a98872f984 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -119,7 +119,7 @@ return for(var/atom/movable/AM in range(radius_range, a)) - if(AM.flags & HOLOGRAM) + if(AM.atom_flags & HOLOGRAM) continue . += AM @@ -129,7 +129,7 @@ .["other"] = list() .["instances"] = list() for(var/obj/item/I in get_environment(a)) - if(I.flags & HOLOGRAM) + if(I.atom_flags & HOLOGRAM) continue if(.["instances"][I.type]) .["instances"][I.type] += I diff --git a/code/datums/proxfield/_proxfield.dm b/code/datums/proxfield/_proxfield.dm index 8eadb5a3d8d..40ebae3baf3 100644 --- a/code/datums/proxfield/_proxfield.dm +++ b/code/datums/proxfield/_proxfield.dm @@ -109,7 +109,7 @@ opacity = FALSE alpha = 0 pass_flags_self = ALL - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_ABSTRACT // our ONE JOB is to detect Crossed(). NOTHING ELSE. diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 894000e679d..5f25ca6596e 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1764,12 +1764,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/vacant/vacant_restaurant_upper name = "\improper Vacant Restaurant" icon_state = "vacant_site" - flags = null /area/vacant/vacant_restaurant_lower name = "\improper Vacant Restaurant" icon_state = "vacant_site" - flags = null /area/vacant/vacant_office name = "\improper Vacant Office" diff --git a/code/game/area/Tether_areas.dm b/code/game/area/Tether_areas.dm index d1b15108a7e..578e7ec277a 100644 --- a/code/game/area/Tether_areas.dm +++ b/code/game/area/Tether_areas.dm @@ -69,12 +69,10 @@ /area/vacant/vacant_restaurant_upper name = "\improper Vacant Restaurant" icon_state = "vacant_site" - flags = null /area/vacant/vacant_restaurant_lower name = "\improper Vacant Restaurant" icon_state = "vacant_site" - flags = null /area/engineering/engineering_airlock name = "\improper Engineering Airlock" @@ -243,7 +241,7 @@ icon_state = "dk_yellow" /area/vacant/vacant_site/east name = "\improper East Base Vacant Site" - flags = null + /area/vacant/vacant_library name = "\improper Atrium Construction Site" /area/vacant/vacant_bar @@ -936,7 +934,7 @@ area_flags = AREA_RAD_SHIELDED /area/tether/surfacebase/vacant_site name = "\improper Vacant Site" - flags = null + /area/crew_quarters/freezer name = "\improper Kitchen Freezer" /area/crew_quarters/panic_shelter diff --git a/code/game/atoms/atoms.dm b/code/game/atoms/atoms.dm index f4c2c9a0c55..999fd379d3c 100644 --- a/code/game/atoms/atoms.dm +++ b/code/game/atoms/atoms.dm @@ -11,7 +11,7 @@ /// Used for changing icon states for different base sprites. var/base_icon_state /// Atom flags. - var/flags = NONE + var/atom_flags = NONE /// Intearaction flags. var/interaction_flags_atom = NONE /// Holder for the last time we have been bumped. @@ -195,9 +195,9 @@ /atom/proc/Initialize(mapload, ...) SHOULD_NOT_SLEEP(TRUE) SHOULD_CALL_PARENT(TRUE) - if(flags & INITIALIZED) + if(atom_flags & ATOM_INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED if (is_datum_abstract()) log_debug("Abstract atom [type] created!") @@ -290,7 +290,7 @@ /// Convenience proc to see if a container is open for chemistry handling. /atom/proc/is_open_container() - return flags & OPENCONTAINER + return atom_flags & OPENCONTAINER ///Is this atom within 1 tile of another atom /atom/proc/HasProximity(atom/movable/proximity_check_mob as mob|obj) @@ -612,7 +612,7 @@ return if(!M || !M.key) return - if(istype(tool) && (tool.flags & NOPRINT)) + if(istype(tool) && (tool.atom_flags & NOPRINT)) return if (ishuman(M)) //Add the list if it does not exist. @@ -738,7 +738,7 @@ /// Returns 1 if made bloody, returns 0 otherwise /atom/proc/add_blood(mob/living/carbon/human/M as mob) - if(flags & NOBLOODY) + if(atom_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. @@ -766,7 +766,7 @@ this.icon_state = "vomittox_[pick(1,4)]" /atom/proc/clean_blood() - if(flags & ATOM_ABSTRACT) + if(atom_flags & ATOM_ABSTRACT) return fluorescent = 0 src.germ_level = 0 diff --git a/code/game/atoms/atoms_movable_throwing.dm b/code/game/atoms/atoms_movable_throwing.dm index 4a930cb04b1..963e8936f8d 100644 --- a/code/game/atoms/atoms_movable_throwing.dm +++ b/code/game/atoms/atoms_movable_throwing.dm @@ -251,7 +251,7 @@ // wrapper to be replaced /atom/movable/proc/throw_at_old(atom/target, range, speed, mob/thrower, spin = TRUE, datum/callback/callback) - return throw_at(target, range, speed, flags, thrower, callback, null, null) + return throw_at(target, range, speed, NONE, thrower, callback, null, null) /atom/movable/proc/overhand_throw_delay(mob/user) return 1 SECONDS diff --git a/code/game/atoms/atoms_vv.dm b/code/game/atoms/atoms_vv.dm index aec5b3a0dad..8ae4f34785c 100644 --- a/code/game/atoms/atoms_vv.dm +++ b/code/game/atoms/atoms_vv.dm @@ -11,7 +11,7 @@ */ /atom/vv_edit_var(var_name, var_value) if(!GLOB.Debug2) - flags |= ADMIN_SPAWNED + atom_flags |= ATOM_ADMINSPAWNED switch(var_name) if(NAMEOF(src, smoothing_junction)) set_smoothed_icon_state(var_value) @@ -40,7 +40,7 @@ return if(!GLOB.Debug2) - flags |= ADMIN_SPAWNED + atom_flags |= ATOM_ADMINSPAWNED . = ..() diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index c7b21e07e55..6239aeec9ed 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -9,7 +9,7 @@ continue else if(ignore_mobs && isliving(stuff)) // Ghosts aren't dense but keeping this limited to living type will probably save headaches in the future. continue - else if(ignore_border && (stuff.flags & ON_BORDER)) + else if(ignore_border && (stuff.atom_flags & ATOM_BORDER)) continue else return TRUE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index fc7ad7f2d5f..424e8ea9ab6 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -11,7 +11,7 @@ health = 150 visible = 0.0 use_power = USE_POWER_OFF - flags = ON_BORDER + atom_flags = ATOM_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 5d3ca8ff755..0f65286dd46 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -173,7 +173,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 582bde85df5..d799a629d21 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -20,7 +20,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize(mapload) . = ..() - flags |= NOREACT + atom_flags |= NOREACT syringes = new known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene") processed_reagents = new @@ -33,7 +33,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.dm b/code/game/objects/_items.dm index 2b98abe9903..ede929183a3 100644 --- a/code/game/objects/_items.dm +++ b/code/game/objects/_items.dm @@ -598,7 +598,7 @@ set category = "Object" var/obj/item/I = get_active_held_item() - if(I && !(I.flags & ATOM_ABSTRACT)) + if(I && !(I.atom_flags & ATOM_ABSTRACT)) I.showoff(src) /* diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 6f9577998d3..5b172aef0a6 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -107,7 +107,7 @@ for(var/atom/A in T.contents) if(istype(A, /obj/effect/particle_effect/smoke/chem) || istype(A, /mob)) continue - else if(isobj(A) && (A.flags & ATOM_ABSTRACT)) + else if(isobj(A) && (A.atom_flags & ATOM_ABSTRACT)) chemholder.reagents.touch_obj(A) var/color = chemholder.reagents.get_color() //build smoke icon diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 3a802527db3..6fa1e98a357 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -98,7 +98,7 @@ if(!T) T = locate(x0,y0,z0) for(var/atom/movable/AM as anything in T.contents) //bypass type checking since only atom/movable can be contained by turfs anyway - if(AM.flags & ATOM_ABSTRACT) + if(AM.atom_flags & ATOM_ABSTRACT) continue LEGACY_EX_ACT(AM, dist, null) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 7cccfc3a22d..8c305d3177a 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -14,7 +14,7 @@ starts_with = list(/obj/item/reagent_containers/pill/zoom = 7) /obj/item/reagent_containers/glass/beaker/vial/random - flags = 0 + atom_flags = NONE var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1) /obj/item/reagent_containers/glass/beaker/vial/random/toxin @@ -27,7 +27,7 @@ /obj/item/reagent_containers/glass/beaker/vial/random/Initialize(mapload) . = ..() if(is_open_container()) - flags ^= OPENCONTAINER + atom_flags ^= OPENCONTAINER var/list/picked_reagents = pickweight(random_reagent_list) for(var/reagent in picked_reagents) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 26a1aeb230b..cf68ad3aca6 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -8,7 +8,7 @@ anchored = 1 w_class = ITEMSIZE_LARGE canhear_range = 2 - flags = NOBLOODY + atom_flags = NOBLOODY var/circuit = /obj/item/circuitboard/intercom var/number = 0 var/last_tick //used to delay the powercheck diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c8de9234e73..a31d531ecc0 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -405,7 +405,7 @@ HALOGEN COUNTER - Radcount on mobs icon = 'icons/obj/device.dmi' icon_state = "spectrometer" w_class = ITEMSIZE_SMALL - flags = OPENCONTAINER + atom_flags = OPENCONTAINER slot_flags = SLOT_BELT throw_force = 5 throw_speed = 4 @@ -485,7 +485,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/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 146058facd6..33f9e3865eb 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -133,7 +133,7 @@ user_client = new_client -/obj/item/t_scanner/dropped(mob/user, flags, atom/newLoc) +/obj/item/t_scanner/dropped(mob/user, atom_flags, atom/newLoc) . = ..() set_user_client(null) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 69e2e9f97f2..56c99104685 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -36,7 +36,6 @@ throw_force = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 origin_tech = list(TECH_BIO = 1) no_variants = FALSE drop_sound = 'sound/items/drop/herb.ogg' @@ -77,7 +76,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' @@ -108,7 +106,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' @@ -253,7 +250,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 1.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/wmarble @@ -265,7 +261,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/bmarble @@ -277,7 +272,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/roofing @@ -303,7 +297,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 10.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/silencium @@ -315,7 +308,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 10.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/plasteel @@ -326,7 +318,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/durasteel @@ -337,7 +328,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/silver @@ -348,7 +338,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/gold @@ -359,7 +348,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/phoron @@ -370,7 +358,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/uranium @@ -381,7 +368,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/diamond @@ -392,7 +378,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/brass @@ -403,7 +388,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 15.0 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/wax @@ -414,7 +398,6 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 1 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE /obj/item/stack/tile/honeycomb @@ -425,5 +408,4 @@ var/global/list/datum/stack_recipe/grass_recipes = list( \ throw_force = 1 throw_speed = 5 throw_range = 20 - flags = 0 no_variants = FALSE diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2443d74b87a..aae2ab5c7d4 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -245,9 +245,9 @@ /obj/item/storage/fancy/cigarettes/Initialize(mapload) . = ..() - 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 @@ -359,7 +359,7 @@ /obj/item/storage/fancy/cigar/Initialize(mapload) . = ..() - 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/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 4803e9d01cd..a527d407f00 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -95,7 +95,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/Initialize(mapload) . = ..() - 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 @@ -173,7 +173,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) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 02b657bf9b5..a71577af073 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 + src.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 54bd76f8203..b64f47e77fd 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -8,7 +8,7 @@ sharp = 0 edge = 0 armor_penetration = 50 - flags = NOCONDUCT | NOBLOODY + atom_flags = NOCONDUCT | NOBLOODY var/lrange = 2 var/lpower = 2 var/lcolor = "#0099FF" @@ -250,7 +250,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + atom_flags = NOBLOODY origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) sharp = 1 edge = 1 @@ -259,7 +259,7 @@ pickup_sound = 'sound/items/pickup/sword.ogg' projectile_parry_chance = 65 -/obj/item/melee/energy/sword/dropped(mob/user, flags, atom/newLoc) +/obj/item/melee/energy/sword/dropped(mob/user, atom_flags, atom/newLoc) . = ..() if(!istype(loc,/mob)) deactivate(user) @@ -375,7 +375,7 @@ sharp = 1 edge = 1 armor_penetration = 0 - flags = NOBLOODY + atom_flags = NOBLOODY lrange = 2 lpower = 2 lcolor = "#0000FF" @@ -489,7 +489,7 @@ throw_speed = 1 throw_range = 1 w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such. - flags = NOBLOODY + atom_flags = NOBLOODY attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") var/mob/living/creator var/datum/effect_system/spark_spread/spark_system @@ -512,7 +512,7 @@ /obj/item/melee/energy/blade/attack_self(mob/user as mob) qdel(src) -/obj/item/melee/energy/blade/dropped(mob/user, flags, atom/newLoc) +/obj/item/melee/energy/blade/dropped(mob/user, atom_flags, atom/newLoc) . = ..() qdel(src) @@ -677,7 +677,7 @@ P.die_off() /* -/obj/item/melee/energy/hfmachete/dropped(mob/user, flags, atom/newLoc) +/obj/item/melee/energy/hfmachete/dropped(mob/user, atom_flags, atom/newLoc) user.lazy_unregister_event(/lazy_event/on_moved, src, .proc/mob_moved) /obj/item/melee/energy/hfmachete/throw_at_old(atom/target, range, speed, thrower) // todo: get silicons to interpret this because >sleeps diff --git a/code/game/objects/items/weapons/other.dm b/code/game/objects/items/weapons/other.dm index dd50b470200..9835c2277b6 100644 --- a/code/game/objects/items/weapons/other.dm +++ b/code/game/objects/items/weapons/other.dm @@ -31,7 +31,7 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "soap" - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_SMALL slot_flags = SLOT_HOLSTER throw_force = 0 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 73c85264ca3..9235cc52a25 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) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 4848673ac1c..419994f9715 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -289,7 +289,7 @@ icon_state = "eshield" item_state = "eshield" slot_flags = SLOT_EARS - flags = NOCONDUCT + atom_flags = NOCONDUCT force = 3.0 throw_force = 5.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8c34f3eb348..c7e98bc6ea8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -10,7 +10,7 @@ sharp = 0 edge = 0 throw_force = 7 - flags = NOCONDUCT + atom_flags = NOCONDUCT w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 7702e266f22..56684aa9da9 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -36,7 +36,7 @@ desc = "A versatile wooden baton from Old Earth, designed for both attack and defense." icon_state = "tonfa" item_state = "tonfa" - flags = NOBLOODY + atom_flags = NOBLOODY defend_chance = 15 //Telescopic baton diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index c74233347e2..661483de483 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -105,7 +105,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 & ATOM_BORDER)) //ATOM_BORDER structures are handled by the Adjacent() check. return O return 0 diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index f50fab1d651..3ff5b26a3b4 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -54,7 +54,7 @@ create_objects_in_loc(src, starts_with) starts_with = null for(var/obj/I in src.loc) - if(I.density || I.anchored || I == src || (I.flags & ATOM_ABSTRACT)) + if(I.density || I.anchored || I == src || (I.atom_flags & ATOM_ABSTRACT)) continue I.forceMove(src) update_icon() @@ -73,7 +73,7 @@ new /obj/item/stack/material/wood(src) for(var/atom/movable/AM in contents) - if(!(AM.flags & ATOM_ABSTRACT)) + if(!(AM.atom_flags & ATOM_ABSTRACT)) AM.forceMove(T) user.visible_message("[user] pries \the [src] open.", \ @@ -196,7 +196,7 @@ new /mob/living/simple_mob/animal/passive/bird/parrot/pink_cockatoo(src) var/turf/T = get_turf(src) for(var/atom/movable/AM in contents) - if(!(AM.flags & ATOM_ABSTRACT)) + if(!(AM.atom_flags & ATOM_ABSTRACT)) AM.forceMove(T) user.visible_message("[user] pries \the [src] open.", \ "You pry open \the [src].", \ diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index d9119aef180..5c0dd93c591 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -18,7 +18,7 @@ if(my_vehicle_type) my_vehicle = new my_vehicle_type(src) for(var/obj/I in get_turf(src)) - if(I.density || I.anchored || I == src || (I.flags & ATOM_ABSTRACT) || !istype(I, my_vehicle_type)) + if(I.density || I.anchored || I == src || (I.atom_flags & ATOM_ABSTRACT) || !istype(I, my_vehicle_type)) continue load_vehicle(I) update_icon() @@ -87,7 +87,7 @@ new /obj/item/stack/material/steel(src.loc, 5) for(var/atom/movable/AM in contents) - if(!(AM.flags & ATOM_ABSTRACT)) + if(!(AM.atom_flags & ATOM_ABSTRACT)) AM.forceMove(T) my_vehicle = null diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 837839d9f9b..6d5476bee1e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -140,7 +140,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(loc, 'sound/effects/grillehit.ogg', 80, 1) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 18c695f7a05..26546ea798b 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) anchored = 0 density = 1 climbable = 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 @@ -174,7 +174,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 7aaef0e63f9..019c292920f 100644 --- a/code/game/objects/structures/ledges.dm +++ b/code/game/objects/structures/ledges.dm @@ -7,13 +7,13 @@ climbable = TRUE anchored = TRUE var/solidledge = 1 - flags = ON_BORDER + atom_flags = ATOM_BORDER layer = STAIRS_LAYER icon_state = "ledge" /obj/structure/ledge_corner icon_state = "ledge-corner" - flags = NONE + atom_flags = NONE name = "rock ledge" desc = "An easily scaleable rocky ledge." icon = 'icons/obj/ledges.dmi' diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index fd183cf7da9..59c495d66b3 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 1785eb1ed44..6bf63d564e8 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -8,7 +8,7 @@ climbable = TRUE layer = WINDOW_LAYER anchored = TRUE - flags = ON_BORDER + atom_flags = ATOM_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 & ATOM_BORDER && !(turn(O.dir, 180) & dir))) return O diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 4ac0bc3d1ab..43a6de67dc5 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -308,7 +308,7 @@ for(var/thing in loc) var/atom/movable/AM = thing var/mob/living/L = thing - if(istype(AM) && !(AM.flags & ATOM_ABSTRACT)) + if(istype(AM) && !(AM.atom_flags & ATOM_ABSTRACT)) wash(AM) if(istype(L)) process_heat(L) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index fdb1ec7ef07..bde4ec6eb82 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -10,7 +10,7 @@ layer = WINDOW_LAYER pressure_resistance = 4*ONE_ATMOSPHERE anchored = TRUE - flags = ON_BORDER + atom_flags = ATOM_BORDER /// are we reinforced? this is only to modify our construction state/steps. var/considered_reinforced = FALSE @@ -42,7 +42,7 @@ fulltile = TRUE if(fulltile) // clickcode requires this :( - flags &= ~ON_BORDER + atom_flags &= ~ATOM_BORDER /obj/structure/window/examine(mob/user) . = ..() diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 2d6ab9ff9d3..25967906201 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -340,7 +340,7 @@ GLOBAL_LIST_INIT(multiz_hole_baseturfs, typecacheof(list( var/turf/newT if(flags & CHANGETURF_SKIP) // We haven't been initialized - if(src.flags & INITIALIZED) + if(src.atom_flags & ATOM_INITIALIZED) stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])") assemble_baseturfs() if(fake_turf_type) diff --git a/code/game/turfs/simulated/floors/lava.dm b/code/game/turfs/simulated/floors/lava.dm index 349386b65da..3234fcffe6d 100644 --- a/code/game/turfs/simulated/floors/lava.dm +++ b/code/game/turfs/simulated/floors/lava.dm @@ -10,7 +10,8 @@ light_range = 2 light_power = 0.75 light_color = LIGHT_COLOR_LAVA - flags = TURF_HAS_EDGES + // flags = TURF_HAS_EDGES + // todo: THE ABOVE FLAGS DOESNT WORK BECAUSE ITS ON FLOORING! movement_cost = 2 special_temperature = T0C + 2200 diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 0e3d1c1634f..9580f886e72 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -16,7 +16,7 @@ var/forced_dirs = 0 // Force this one to pretend it's an overedge turf /turf/space/basic - flags = INITIALIZED + atom_flags = ATOM_INITIALIZED /turf/space/basic/New() //Do not convert to Initialize //This is used to optimize the map loader diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 286e1ea23e1..a2e535c2f8f 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -87,9 +87,9 @@ */ /turf/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) - if(flags & INITIALIZED) + if(atom_flags & ATOM_INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED // by default, vis_contents is inherited from the turf that was here before vis_contents.len = 0 @@ -157,7 +157,7 @@ // SSair.remove_from_active(src) // visibilityChanged() // QDEL_LIST(blueprint_data) - flags &= ~INITIALIZED + atom_flags &= ~ATOM_INITIALIZED // requires_activation = FALSE vis_contents.len = 0 @@ -316,7 +316,7 @@ if(density) return 1 for(var/atom/A in src) - if(A.density && !(A.flags & ON_BORDER)) + if(A.density && !(A.atom_flags & ATOM_BORDER)) return 1 return 0 diff --git a/code/game/turfs/turf_movement.dm b/code/game/turfs/turf_movement.dm index e428f588e7c..0253b4b3225 100644 --- a/code/game/turfs/turf_movement.dm +++ b/code/game/turfs/turf_movement.dm @@ -45,7 +45,7 @@ var/const/enterloopsanity = 100 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 & ATOM_BORDER) && !(firstbump.atom_flags & ATOM_BORDER))) firstbump = thing if(QDELETED(mover)) //Mover deleted from Cross/CanAllowThrough/Bump, do not proceed. return FALSE @@ -65,7 +65,7 @@ var/const/enterloopsanity = 100 continue var/atom/movable/thing = i if(!thing.Uncross(mover, newloc)) - if(thing.flags & ON_BORDER) + if(thing.atom_flags & ATOM_BORDER) mover.Bump(thing) if(!(mover.movement_type & UNSTOPPABLE)) return FALSE diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index 383bf6cef05..637932b5945 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -6,7 +6,7 @@ initial_gas_mix = GAS_STRING_STP /turf/unsimulated/Initialize(mapload) - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED return INITIALIZE_HINT_NORMAL /turf/unsimulated/fake_space diff --git a/code/modules/atmospherics/environmental/zas/airflow.dm b/code/modules/atmospherics/environmental/zas/airflow.dm index 16546af3c68..4208bfab1b0 100644 --- a/code/modules/atmospherics/environmental/zas/airflow.dm +++ b/code/modules/atmospherics/environmental/zas/airflow.dm @@ -33,7 +33,7 @@ Contains helper procs for airflow, handled in /connection_group. /atom/movable/proc/check_airflow_movable(n) CACHE_VSC_PROP(atmos_vsc, /atmos/airflow/dense_pressure, dense_pressure) - if(flags & ATOM_ABSTRACT) + if(atom_flags & ATOM_ABSTRACT) return 0 if(anchored && !ismob(src)) @@ -159,6 +159,6 @@ Contains helper procs for airflow, handled in /connection_group. . = list() for(var/turf/T in contents) for(var/atom/movable/A in T) - if((A.flags & ATOM_ABSTRACT) || A.anchored || istype(A, /obj/effect) || istype(A, /mob/observer)) + if((A.atom_flags & ATOM_ABSTRACT) || A.anchored || istype(A, /obj/effect) || istype(A, /mob/observer)) continue . += A diff --git a/code/modules/atmospherics/environmental/zas/phoron.dm b/code/modules/atmospherics/environmental/zas/phoron.dm index 28d0cb90dc5..ef14ef4a5a4 100644 --- a/code/modules/atmospherics/environmental/zas/phoron.dm +++ b/code/modules/atmospherics/environmental/zas/phoron.dm @@ -5,7 +5,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') /obj/item/proc/can_contaminate() //Clothing and backpacks can be contaminated. - if(flags & PHORONGUARD) + if(atom_flags & PHORONGUARD) return 0 else if(istype(src,/obj/item/storage/backpack)) return 0 //Cannot be washed :( @@ -119,7 +119,7 @@ var/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(phoronguard_only) - if(head.flags & PHORONGUARD) + if(head.atom_flags & PHORONGUARD) return 1 else if(head.body_parts_covered & EYES) return 1 @@ -133,7 +133,7 @@ var/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(phoronguard_only && !(protection.flags & PHORONGUARD)) + if(phoronguard_only && !(protection.atom_flags & PHORONGUARD)) return 0 coverage |= protection.body_parts_covered diff --git a/code/modules/atmospherics/machinery/components/unary/unary_base.dm b/code/modules/atmospherics/machinery/components/unary/unary_base.dm index 00f66116724..7d6a8a3b521 100644 --- a/code/modules/atmospherics/machinery/components/unary/unary_base.dm +++ b/code/modules/atmospherics/machinery/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 | pipe_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/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index aa8568a5599..b5f88013ed1 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -214,7 +214,7 @@ BLIND // can't see anything icon_state = "plaingoggles" item_state_slots = list(SLOT_ID_RIGHT_HAND = "glasses", SLOT_ID_LEFT_HAND = "glasses") body_parts_covered = EYES - flags = PHORONGUARD + atom_flags = PHORONGUARD /obj/item/clothing/glasses/night name = "night vision goggles" @@ -233,7 +233,7 @@ BLIND // can't see anything /obj/item/clothing/glasses/night/vox name = "Alien Optics" species_restricted = list(SPECIES_VOX) - flags = PHORONGUARD + atom_flags = PHORONGUARD /obj/item/clothing/glasses/night/Initialize(mapload) . = ..() @@ -636,7 +636,7 @@ BLIND // can't see anything item_state_slots = list(SLOT_ID_RIGHT_HAND = "sunglasses", SLOT_ID_LEFT_HAND = "sunglasses") toggleable = 1 action_button_name = "Toggle Monocle" - flags = null //doesn't protect eyes because it's a monocle, duh + atom_flags = NONE //doesn't protect eyes because it's a monocle, duh body_parts_covered = 0 @@ -661,7 +661,7 @@ BLIND // can't see anything icon_state = "orange-g" item_state_slots = list(SLOT_ID_RIGHT_HAND = "glasses", SLOT_ID_LEFT_HAND = "glasses") action_button_name = "Adjust Orange Goggles" - flags = PHORONGUARD + atom_flags = PHORONGUARD var/up = 0 body_parts_covered = EYES species_restricted = list(SPECIES_TESHARI) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index f4c25768058..aaeace0ab48 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 = NONE//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 06378dd3931..f2b66ab3cee 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -115,7 +115,7 @@ name = "insulated gauntlets" icon_state = "gloves-vox" item_state = "gloves-vox" - flags = PHORONGUARD + atom_flags = PHORONGUARD siemens_coefficient = 0 permeability_coefficient = 0.05 species_restricted = list(SPECIES_VOX) diff --git a/code/modules/clothing/gloves/rings/rings.dm b/code/modules/clothing/gloves/rings/rings.dm index c2559a6e71d..274314aab1a 100644 --- a/code/modules/clothing/gloves/rings/rings.dm +++ b/code/modules/clothing/gloves/rings/rings.dm @@ -49,7 +49,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(mapload) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f98ce5f7d78..2a8d00c2643 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -103,7 +103,7 @@ /obj/item/clothing/mask/gas/swat/vox name = "\improper alien mask" desc = "Clearly not designed for a human face." - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS species_restricted = list(SPECIES_VOX) filtered_gases = list(/datum/gas/oxygen, /datum/gas/nitrous_oxide) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 5a8b2c697b4..790f53e07ca 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -71,7 +71,7 @@ name = "vox magclaws" item_state = "boots-vox" icon_state = "boots-vox" - flags = PHORONGUARD + atom_flags = PHORONGUARD species_restricted = list(SPECIES_VOX) action_button_name = "Toggle the magclaws" diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 0c882d63560..9f3fcab7cdf 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -31,7 +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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL 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) @@ -43,7 +43,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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL | ALLOWINTERNALS flags_inv = 0 species_restricted = list(SPECIES_VOX) diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index e98d41d0915..651c6cbf885 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -6,7 +6,7 @@ name = "Space helmet" icon_state = "space" desc = "A special helmet designed for work in a hazardous, low-pressure environment." - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL | ALLOWINTERNALS | ALLOW_SURVIVALFOOD permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) @@ -69,7 +69,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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL 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) @@ -90,7 +90,7 @@ check_limb_support(M) return ..() -/obj/item/clothing/suit/space/dropped(mob/user, flags, atom/newLoc) +/obj/item/clothing/suit/space/dropped(mob/user, atom_flags, atom/newLoc) check_limb_support(user) return ..() diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 96676f82207..af293a1d4f1 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -8,7 +8,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES siemens_coefficient = 0.9 - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD /obj/item/clothing/suit/bio_suit @@ -24,7 +24,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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL //Standard biosuit, orange stripe @@ -102,7 +102,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES siemens_coefficient = 0.9 - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD /obj/item/clothing/suit/beekeeper @@ -118,5 +118,5 @@ 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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 04a44ec2502..d763762b967 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -58,10 +58,10 @@ to_chat(H, "You're already wearing something on your head!") return else - if(flags & PHORONGUARD) - hood.flags |= PHORONGUARD + if(atom_flags & PHORONGUARD) + hood.atom_flags |= PHORONGUARD else - hood.flags &= ~PHORONGUARD + hood.atom_flags &= ~PHORONGUARD H.equip_to_slot_if_possible(hood, SLOT_ID_HEAD) if(armor) hood.armor = armor.Copy() @@ -128,7 +128,7 @@ icon_state = "coatwinter" item_state_slots = list(SLOT_ID_RIGHT_HAND = "coatwinter", SLOT_ID_LEFT_HAND = "coatwinter") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - flags = PHORONGUARD + atom_flags = PHORONGUARD flags_inv = HIDEHOLSTER cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE @@ -428,7 +428,7 @@ desc = "An armoured suit for exploring harsh environments." icon_state = "explorer" item_state = "explorer" - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE @@ -453,7 +453,7 @@ desc = "An armoured suit for mining in harsh environments." icon = 'icons/clothing/suit/mining.dmi' icon_state = "miner" - flags = PHORONGUARD + atom_flags = PHORONGUARD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL clothing_flags = THICKMATERIAL body_parts_covered = 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 606282fd7d1..924c023eca6 100644 --- a/code/modules/clothing/under/xenos/vox.dm +++ b/code/modules/clothing/under/xenos/vox.dm @@ -2,7 +2,7 @@ has_sensors = UNIFORM_HAS_NO_SENSORS species_restricted = list(SPECIES_VOX) starting_accessories = list(/obj/item/clothing/accessory/storage/vox) // Dont' start with a backback, so free webbing - flags = PHORONGUARD + atom_flags = PHORONGUARD /obj/item/clothing/under/vox/vox_casual name = "alien clothing" @@ -29,7 +29,7 @@ desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh." icon_state = "webbing-vox" - flags = PHORONGUARD + atom_flags = PHORONGUARD slots = 3 @@ -47,7 +47,7 @@ icon_override = 'icons/mob/clothing/species/vox/uniform.dmi' flags_inv = HIDEGLOVES|HIDESHOES body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags = PHORONGUARD + atom_flags = PHORONGUARD /obj/item/clothing/under/pressuresuit/voxcivassistant name = "assistant pressure suit" diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 3ad1d53fdcf..5626e9d3b1b 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -24,7 +24,7 @@ volume = 4 can_be_placed_into = null item_flags = ITEM_NOBLUDGEON - flags = OPENCONTAINER + atom_flags = OPENCONTAINER unacidable = 0 drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index 2cf99999070..981f89b48e6 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -1,7 +1,7 @@ /obj/item/sample name = "forensic sample" icon = 'icons/obj/forensics.dmi' - flags = NOPRINT + atom_flags = NOPRINT w_class = ITEMSIZE_TINY var/list/evidence = list() @@ -122,7 +122,7 @@ supplied.fingerprints.Cut() /obj/item/forensics - flags = NOPRINT + atom_flags = NOPRINT /obj/item/forensics/sample_kit name = "fiber collection kit" diff --git a/code/modules/economy/machines/mint.dm b/code/modules/economy/machines/mint.dm index 26acb475529..5f7d00886bb 100644 --- a/code/modules/economy/machines/mint.dm +++ b/code/modules/economy/machines/mint.dm @@ -346,7 +346,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/icon_on = "coinvend" var/icon_off = "coinvent-off" diff --git a/code/modules/examine/descriptions/armor.dm b/code/modules/examine/descriptions/armor.dm index 509b4ded7be..87814b57456 100644 --- a/code/modules/examine/descriptions/armor.dm +++ b/code/modules/examine/descriptions/armor.dm @@ -43,7 +43,7 @@ armor_stats += "\n" - if(flags & ALLOWINTERNALS) + if(atom_flags & ALLOWINTERNALS) armor_stats += "It is airtight. \n" if(min_pressure_protection == 0) diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 4b38f7dde7b..be104c34ee6 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -23,7 +23,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5,10,15,30) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER matter = list(MAT_GLASS = 60) diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 05632542f7d..6c6049a8bc8 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 = NONE //starts closed drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' var/modified_type = /obj/item/trash/punctured_can diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 105908601b2..892e3d30edc 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 521f6ee98fb..87c3c729037 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -10,7 +10,7 @@ drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.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 @@ -35,7 +35,7 @@ else playsound(loc,"canopen", rand(10,50), 1) 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 && !(item_flags & ITEM_NOBLUDGEON) && user.a_intent == INTENT_HARM) @@ -110,7 +110,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() ..() diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 3df49e314ce..6c9bce638db 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -1,7 +1,7 @@ ///////////////////////////////////////////////Alchohol bottles! -Agouri ////////////////////////// //Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem //Bottles now weaken and break when smashed on people's heads. - Giacom -//remember to set flags = 0 on a bottle subtype to require opening, otherwise its just an open container by default -buffy +//remember to set atom_flags = 0 on a bottle subtype to require opening, otherwise its just an open container by default -buffy /obj/item/reagent_containers/food/drinks/bottle amount_per_transfer_from_this = 10 @@ -118,7 +118,7 @@ if(user.attempt_insert_item_for_installation(R, src)) to_chat(user, "You stuff [R] into [src].") rag = R - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER update_icon() /obj/item/reagent_containers/food/drinks/bottle/proc/remove_rag(mob/user) @@ -126,7 +126,7 @@ return user.put_in_hands_or_drop(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 @@ -576,7 +576,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small volume = 50 smash_duration = 1 - flags = 0 //starts closed + atom_flags = NONE //starts closed rag_underlay = "rag_small" /obj/item/reagent_containers/food/drinks/bottle/small/beer diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index a4144241bdb..93ccfbe903f 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4,7 +4,7 @@ desc = "yummy" icon = 'icons/obj/food.dmi' icon_state = null - flags = OPENCONTAINER + atom_flags = OPENCONTAINER var/bitesize = 1 var/bitecount = 0 var/trash = null @@ -1801,7 +1801,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube name = "monkey cube" desc = "Just add water!" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER icon_state = "monkeycube" bitesize = 12 filling_color = "#ADAC7F" @@ -1831,7 +1831,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/monkeycube/On_Consume(var/mob/M) @@ -1849,7 +1849,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube/wrapped desc = "Still wrapped in some paper." icon_state = "monkeycubewrap" - flags = 0 + atom_flags = 0 wrapped = 1 /obj/item/reagent_containers/food/snacks/monkeycube/farwacube diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index 4dc98425d45..dc25d244f39 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 ecd0b67fcbe..48c4ab1eac5 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 0c5d35113d5..a590e867866 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -7,7 +7,7 @@ var/shortname var/max_space = 20//Maximum sum of w-classes of foods in this container at once var/max_reagents = 80//Maximum units of reagents - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT var/list/insertable = list( /obj/item/reagent_containers/food/snacks, /obj/item/holder, @@ -18,7 +18,7 @@ /obj/item/reagent_containers/cooking_container/Initialize(mapload) . = ..() 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 d65574af97c..3fa456faf14 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 = 0 - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index aa0bac8496e..b11f425bb09 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -10,7 +10,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 2000 - flags = OPENCONTAINER | NOREACT + atom_flags = OPENCONTAINER | NOREACT var/operating = 0 // Is it on? var/dirty = 0 // = {0..100} Does it need cleaning? var/broken = 0 // ={0,1,2} How broken is it??? @@ -81,7 +81,7 @@ src.icon_state = "mw" src.broken = 0 // Fix it! src.dirty = 0 // just to be sure - src.flags |= OPENCONTAINER + src.atom_flags |= OPENCONTAINER else to_chat(user, "It's broken!") return 1 @@ -99,7 +99,7 @@ src.dirty = 0 // It's clean! src.broken = 0 // just to be sure src.icon_state = "mw" - src.flags |= OPENCONTAINER + src.atom_flags |= OPENCONTAINER else //Otherwise bad luck!! to_chat(user, "It's dirty!") return 1 @@ -381,7 +381,7 @@ playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) 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 &= ~OPENCONTAINER //So you can't add condiments + src.atom_flags &= ~OPENCONTAINER //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() @@ -393,7 +393,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 &= ~OPENCONTAINER //So you can't add condiments + src.atom_flags &= ~OPENCONTAINER //So you can't add condiments src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/kitchen/smartfridge.dm index 0803605fd28..4be348776fb 100644 --- a/code/modules/food/kitchen/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge.dm @@ -9,7 +9,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 - flags = NOREACT + atom_flags = NOREACT pass_flags = NONE var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. var/icon_on = "smartfridge" diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm index 9deb29e2ef5..8b58aa6d03c 100644 --- a/code/modules/holidays/halloween_loadout_masquarade.dm +++ b/code/modules/holidays/halloween_loadout_masquarade.dm @@ -3,7 +3,7 @@ desc = "A costume of unknown origin."; \ w_class = WEIGHT_CLASS_SMALL; \ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); \ - flags = PHORONGUARD; \ + atom_flags = PHORONGUARD; \ flags_inv = HIDEHOLSTER|HIDEFACE|BLOCKHAIR; \ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE; @@ -12,7 +12,7 @@ desc = "A costume of unknown origin."; \ w_class = WEIGHT_CLASS_SMALL; \ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); \ - flags = PHORONGUARD; \ + atom_flags = PHORONGUARD; \ flags_inv = HIDEHOLSTER; \ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE; diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 88a5ba68b7c..74b0f00c8f6 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -280,7 +280,7 @@ throw_range = 5 throw_force = 0 w_class = ITEMSIZE_SMALL - flags = NOBLOODY + atom_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 01cec16fd1a..a4c302be2c1 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -35,7 +35,7 @@ holomap_datum = new original_zLevel = loc.z SSholomaps.station_holomaps += src - flags |= ON_BORDER // Why? It doesn't help if its not density + atom_flags |= ATOM_BORDER // Why? It doesn't help if its not density if(SSholomaps.holomaps_initialized) setup_holomap() return ..() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 2fbfef84341..9697a96529b 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' @@ -154,7 +154,7 @@ var/mob/living/carbon/human/H = M if(H.shoes && H.shoes.clothing_flags & NOSLIP) return - if(H.flags & NO_SLIP)//Species that dont slip naturally + if(H.species.species_flags & NO_SLIP)//Species that dont slip naturally return M.stop_pulling() to_chat(M, "You slipped on the [name]!") diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index c87322fb3bd..b0d97a47e41 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 throw_force = 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 throw_force = 0 throw_speed = 4 diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index f91885154f6..af03f1ce86b 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -5,7 +5,7 @@ density = TRUE pass_flags_self = ATOM_PASS_TABLE | ATOM_PASS_OVERHEAD_THROW anchored = TRUE - 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/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 684d3879dfe..2e9e9f8f739 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -111,7 +111,7 @@ extended_desc = "This is effectively an internal beaker. It will consume and produce power from phoron, slime jelly, welding fuel, carbon,\ ethanol, and nutriments, in order of decreasing efficiency. It will consume fuel only if the battery can take more energy. Blood is also able to be used as \ a source of organic fuel; blood from sapient creatures is more efficient." - 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/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index c0fdd123860..5c0daa7d660 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -951,7 +951,7 @@ icon_state = "recorder" complexity = 8 inputs = list() - flags = HEAR + atom_flags = ATOM_HEAR outputs = list( "speaker" = IC_PINTYPE_STRING, "message" = IC_PINTYPE_STRING diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index bacbe7f6aef..6c5cd5b758e 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -21,7 +21,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() @@ -57,7 +57,7 @@ icon_state = "injector" extended_desc = "This autoinjector can push up to 30 units of 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 quantity inverts the injector, sucking out reagents instead." - flags = OPENCONTAINER + atom_flags = OPENCONTAINER volume = 30 complexity = 20 cooldown_per_use = 6 SECONDS @@ -199,7 +199,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) @@ -347,7 +347,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) @@ -371,7 +371,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) @@ -410,7 +410,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 @@ -455,7 +455,7 @@ desc = "A length of flexible piping that can be used to connect one container to another." extended_desc = "Use these to supply your fuel cell with never-ending phoron! Beware of leaks." icon_state = "reagent_funnel" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER inputs = list( "toggle cap" = IC_PINTYPE_BOOLEAN, "source vol" = IC_PINTYPE_NUMBER, @@ -505,7 +505,7 @@ "on fail" = IC_PINTYPE_PULSE_OUT, "push ref" = IC_PINTYPE_PULSE_IN ) - flags = OPENCONTAINER + atom_flags = OPENCONTAINER volume = 100 power_draw_per_use = 150 complexity = 16 @@ -544,7 +544,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) @@ -567,7 +567,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) @@ -623,7 +623,7 @@ extended_desc = "This circuit can hold up to 30 units of any given chemicals. On each use, it sprays these reagents like a fire extinguisher." volume = 30 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER complexity = 20 cooldown_per_use = 6 SECONDS diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 8af1a40301d..73df1a40ce8 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -202,7 +202,7 @@ icon_state = "book" throw_speed = 1 throw_range = 5 - flags = NOCONDUCT + atom_flags = NOCONDUCT worn_render_flags = WORN_RENDER_INHAND_NO_RENDER | WORN_RENDER_SLOT_NO_RENDER 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") diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index 433f722da49..71c819a7a88 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -1,7 +1,7 @@ /atom/movable/lighting_object name = "" anchored = TRUE - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT icon = LIGHTING_ICON icon_state = "transparent" diff --git a/code/modules/mapping/spawner/_spawner.dm b/code/modules/mapping/spawner/_spawner.dm index cb5b97af06c..5bf7e5608ba 100644 --- a/code/modules/mapping/spawner/_spawner.dm +++ b/code/modules/mapping/spawner/_spawner.dm @@ -11,7 +11,7 @@ /obj/spawner/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED if(!late) Spawn() // we always spawn in Initialize(), because if anything we spawn has LateInitialize behavior, that'll be really bad, huh. // keep in mind though, anything requiring even regular Initialize() behavior will be trampled, so, spawners are only good for diff --git a/code/modules/maps/overmap/planets/virgo4.dm b/code/modules/maps/overmap/planets/virgo4.dm index 98ecfd7254e..9cd94242128 100644 --- a/code/modules/maps/overmap/planets/virgo4.dm +++ b/code/modules/maps/overmap/planets/virgo4.dm @@ -57,7 +57,7 @@ //In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself /obj/away_mission_init/beachcave/Initialize(mapload) - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED // Cave submaps are first. /*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) diff --git a/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm b/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm index dd395407b82..064ba627fcc 100644 --- a/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm +++ b/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm @@ -152,7 +152,7 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor/ignore_cavegen) "lead" = 1)) if(mineral_name && (mineral_name in GLOB.ore_data)) mineral = GLOB.ore_data[mineral_name] - if(flags & INITIALIZED) + if(atom_flags & ATOM_INITIALIZED) UpdateMineral() /turf/simulated/mineral/icerock/lythios43c/rich/make_ore(var/rare_ore) @@ -185,7 +185,7 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor/ignore_cavegen) "verdantium" = 1)) if(mineral_name && (mineral_name in GLOB.ore_data)) mineral = GLOB.ore_data[mineral_name] - if(flags & INITIALIZED) + if(atom_flags & ATOM_INITIALIZED) UpdateMineral() diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index cca51d07762..e4aae3a1249 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -42,7 +42,7 @@ color = material.icon_colour if(!material.conductive) - flags |= NOCONDUCT + atom_flags |= NOCONDUCT matter = material.get_matter() update_strings() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 465196cc706..b0645f552e6 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -192,7 +192,7 @@ if(density) MineralSpread() else - UpdateMineral() // this'll work because we're INITIALIZED + UpdateMineral() // this'll work because we're initialized /* custom smoothing code */ /turf/simulated/mineral/find_type_in_direction(direction) @@ -343,7 +343,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache) target_turf.MineralSpread() /turf/simulated/mineral/proc/UpdateMineral(update_neighbors) - if(!(flags & INITIALIZED)) + if(!(atom_flags & ATOM_INITIALIZED)) return // /Initialize() will handle us clear_ore_effects() if(mineral && density) diff --git a/code/modules/mob/grab.dm b/code/modules/mob/grab.dm index 866f4c3b3c3..b1d8109c7c3 100644 --- a/code/modules/mob/grab.dm +++ b/code/modules/mob/grab.dm @@ -56,7 +56,7 @@ icon = 'icons/mob/screen1.dmi' icon_state = "reinforce" item_flags = ITEM_ABSTRACT | ITEM_DROPDEL - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT drop_sound = null pickup_sound = null equip_sound = null diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 7551d1e520a..f5aac9fb689 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -34,12 +34,12 @@ */ /mob/proc/attempt_smart_equip(obj/item/I = get_active_held_item(), silent = FALSE) if(!I) - if(!(flags & INV_OP_SUPPRESS_WARNING)) + if(!silent) to_chat(src, SPAN_WARNING("You are not holding anything to equip!")) return FALSE if(!is_holding(I)) - if(!(flags & INV_OP_SUPPRESS_WARNING)) + if(!silent) to_chat(src, SPAN_WARNING("You must be holding [I] to equip it!")) return FALSE diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index bc08f56c714..bc6d97ff8d6 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -448,7 +448,7 @@ return 1 for(var/obj/O in B) - if(O.density && !istype(O, /obj/machinery/door) && !(O.flags & ON_BORDER)) + if(O.density && !istype(O, /obj/machinery/door) && !(O.atom_flags & ATOM_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 8ad535119bd..44738b6e875 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -286,7 +286,7 @@ emp_act if(!((I.damtype == BRUTE) || (I.damtype == HALLOSS))) return - if(!(I.flags & NOBLOODY)) + if(!(I.atom_flags & NOBLOODY)) I.add_blood(src) var/bloody = 0 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 078b6fc279e..14786f417fe 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //BASE MOB SPRITE /mob/living/carbon/human/update_icons_body() - if(QDESTROYING(src) || !(flags & INITIALIZED)) + if(QDESTROYING(src) || !(atom_flags & ATOM_INITIALIZED)) return var/husk_color_mod = rgb(96,88,80) diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 71c25fa9a3d..3956874a3f4 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -11,7 +11,7 @@ origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = 0 //has it been enhanced before? - flags = OPENCONTAINER + atom_flags = OPENCONTAINER /* /obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/slimesteroid2)) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 201c5d6dca7..4e4d7be2ffc 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -4,7 +4,7 @@ layer = MOB_LAYER plane = MOB_PLANE animate_movement = 2 - flags = HEAR + atom_flags = ATOM_HEAR pass_flags_self = ATOM_PASS_MOB | ATOM_PASS_OVERHEAD_THROW sight = SIGHT_FLAGS_DEFAULT diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 13b6d6f8294..97c32b84037 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -19,7 +19,7 @@ /mob/new_player/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) // "yes i know what I'm doing" GLOB.mob_list += src - flags |= INITIALIZED + atom_flags |= ATOM_INITIALIZED return INITIALIZE_HINT_NORMAL /mob/new_player/verb/new_player_panel() diff --git a/code/modules/multiz/atoms.dm b/code/modules/multiz/atoms.dm index d7f93885dd4..149f6e1540d 100644 --- a/code/modules/multiz/atoms.dm +++ b/code/modules/multiz/atoms.dm @@ -7,7 +7,7 @@ * old_loc - old turf */ /atom/proc/z_pass_in(atom/movable/AM, dir, turf/old_loc) - if(density && !(flags & ON_BORDER)) // dense objects like machinery block by default + if(density && !(atom_flags & ATOM_BORDER)) // dense objects like machinery block by default return FALSE return !AM || Cross(AM) diff --git a/code/modules/multiz/hoist.dm b/code/modules/multiz/hoist.dm index 37fc07eb234..74ecbd8ff48 100644 --- a/code/modules/multiz/hoist.dm +++ b/code/modules/multiz/hoist.dm @@ -32,7 +32,7 @@ if (use_check(user, USE_DISALLOW_SILICONS)) return - if ((AM.flags & ATOM_ABSTRACT) || AM.anchored) + if ((AM.atom_flags & ATOM_ABSTRACT) || AM.anchored) to_chat(user, SPAN_NOTICE("You can't do that.")) return if (source_hoist.hoistee) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 8c139cd93e2..bdc2bdc643e 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -364,7 +364,7 @@ // 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 & ATOM_BORDER)) return TRUE return prevent_z_fall(falling_atom, 0, NONE) & (FALL_TERMINATED | FALL_BLOCKED) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 4562fd2b541..a85de81b082 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -164,7 +164,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() var/owner_species diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index bcdb4f8ddbb..a7c3dda53d2 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 if(isstorage(newPaper.loc)) var/obj/item/storage/S = newPaper.loc diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index c474da3525b..ec8da193201 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -96,7 +96,7 @@ */ /obj/item/pen/reagent - flags = OPENCONTAINER + atom_flags = OPENCONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/pen/reagent/Initialize(mapload) diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 48392646241..3f64ff00eb7 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -2,7 +2,7 @@ icon = 'icons/am_engine.dmi' density = 1 anchored = 1.0 - flags = ON_BORDER + atom_flags = ATOM_BORDER /obj/machinery/power/am_engine/bits name = "Antimatter Engine" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index e8bccb09d07..cc3aef3a709 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(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/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm index 7c665794f27..43068d38a9f 100644 --- a/code/modules/power/fusion/core/core_field.dm +++ b/code/modules/power/fusion/core/core_field.dm @@ -329,7 +329,7 @@ GLOBAL_VAR_INIT(max_fusion_air_heat, INFINITY) var/empsev = max(1, min(3, CEILING(size/2, 1))) for(var/atom/movable/AM in range(max(1,FLOOR(size/2, 1)), loc)) - if(AM == src || AM == owned_core || (AM.flags & ATOM_ABSTRACT)) + if(AM == src || AM == owned_core || (AM.atom_flags & ATOM_ABSTRACT)) continue if(ignore_types[AM.type]) continue diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index a721caea8b7..bb4d8ad5665 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -617,7 +617,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 & MUTATION_COLD_RESIST) if (prob(12)) electrocute_mob(user, get_area(src), src, 0.3) @@ -637,7 +637,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/power/singularity/act.dm b/code/modules/power/singularity/act.dm index fa02816e26e..37fc5f39cb7 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -37,7 +37,7 @@ ..() /obj/singularity_act() - if(flags & ATOM_ABSTRACT) + if(atom_flags & ATOM_ABSTRACT) return legacy_ex_act(1) if(!QDELETED(src)) @@ -45,7 +45,7 @@ return 2 /obj/singularity_pull(S, current_size) - if(flags & ATOM_ABSTRACT) + if(atom_flags & ATOM_ABSTRACT) return if(anchored) if(current_size >= STAGE_FIVE) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 124ece8a9f3..7f551bb7428 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -629,7 +629,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/CanAllowThrough() . = ..() diff --git a/code/modules/projectiles/projectile/trace.dm b/code/modules/projectiles/projectile/trace.dm index 47109c2c76c..94895fbb8b8 100644 --- a/code/modules/projectiles/projectile/trace.dm +++ b/code/modules/projectiles/projectile/trace.dm @@ -1,20 +1,20 @@ // 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=ATOM_PASS_TABLE|ATOM_PASS_GLASS|ATOM_PASS_GRILLE, flags=null) +/proc/check_trajectory(atom/target, atom/firer, pass_flags=ATOM_PASS_TABLE|ATOM_PASS_GLASS|ATOM_PASS_GRILLE, atom_flags) if(!istype(target) || !istype(firer)) return 0 var/obj/item/projectile/test/trace = new /obj/item/projectile/test(get_turf(firer)) //Making the test.... //Set the flags and pass flags to that of the real projectile... - if(!isnull(flags)) - trace.flags = flags + if(!isnull(atom_flags)) + trace.atom_flags = atom_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/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 8bf3578e7e0..46d8d45a00e 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -7,7 +7,7 @@ density = 0 opacity = 0 plane = ABOVE_PLANE - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT mouse_opacity = 0 var/mob/living/aiming_at // Who are we currently targeting, if anyone? diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index 825d202cb0f..bc380241c81 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -155,7 +155,7 @@ for(var/thing in T) if(istype(thing, /atom)) var/atom/A = thing - if(!(A.flags & ATOM_ABSTRACT)) + if(!(A.atom_flags & ATOM_ABSTRACT)) continue qdel(thing) diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm index b6e5660d09d..2b6f735677e 100644 --- a/code/modules/random_map/drop/droppod.dm +++ b/code/modules/random_map/drop/droppod.dm @@ -112,7 +112,7 @@ // Splatter anything under us that survived the explosion. if(value != SD_EMPTY_TILE && T.contents.len) for(var/atom/movable/AM in T) - if(!(AM.flags & ATOM_ABSTRACT) && !istype(AM, /mob/observer)) + if(!(AM.atom_flags & ATOM_ABSTRACT) && !istype(AM, /mob/observer)) qdel(AM) // Also spawn doors and loot. diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index a6529e2574c..92de6014e0c 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -53,11 +53,11 @@ // Destroy turf contents. for(var/obj/O in origin) - if((O.flags & ATOM_ABSTRACT)) + if((O.atom_flags & ATOM_ABSTRACT)) continue qdel(O) //crunch for(var/obj/O in T) - if((O.flags & ATOM_ABSTRACT)) + if((O.atom_flags & ATOM_ABSTRACT)) continue qdel(O) //crunch diff --git a/code/modules/reagents/chemistry/_readme.dm b/code/modules/reagents/chemistry/_readme.dm index e8e02e7b7ec..b6264c2d94c 100644 --- a/code/modules/reagents/chemistry/_readme.dm +++ b/code/modules/reagents/chemistry/_readme.dm @@ -105,10 +105,10 @@ About the Holder: Calls each reagent's touch_obj(target). trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0) - The general proc for applying reagents to things externally (as opposed to directly injected into the contents). + The general proc for applying reagents to things externally (as opposed to directly injected into the contents). It first calls touch, then the appropriate trans_to_*() or splash_mob(). If for some reason you want touch effects to be bypassed (e.g. injecting stuff directly into a reagent container or person), call the appropriate trans_to_*() proc. - + Calls touch() before checking the type of [target], calling splash_mob(target, amount), trans_to_turf(target, amount, multiplier, copy), or trans_to_obj(target, amount, multiplier, copy). trans_id_to(var/atom/target, var/id, var/amount = 1) @@ -295,7 +295,7 @@ About the Tools: 'pouring' our reagents into something else. atom/proc/is_open_container() - Checks atom/var/flags & OPENCONTAINER. + Checks atom/var/atom_flags & OPENCONTAINER. If this returns 1 , you can use syringes, beakers etc to manipulate the contents of this object. If it's 0, you'll need to write your own custom reagent diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index d595790528f..5a2da0bd98f 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -93,7 +93,7 @@ set waitfor = FALSE // shitcode. reagents shouldn't ever sleep but hey :^) 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/chemistry/machinery.dm b/code/modules/reagents/chemistry/machinery.dm index 80b57dc0564..3fa4ffacd63 100644 --- a/code/modules/reagents/chemistry/machinery.dm +++ b/code/modules/reagents/chemistry/machinery.dm @@ -331,8 +331,8 @@ 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.")) diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index eff707f572e..0501d050d63 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -10,7 +10,7 @@ circuit = /obj/item/circuitboard/chem_master use_power = USE_POWER_IDLE idle_power_usage = 20 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER clicksound = "button" /// Input reagents container. diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index 6aeafd21316..c9e2e8c3800 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 cc63b8d9e3b..20f8e02741b 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' @@ -65,10 +65,10 @@ ..() 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) @@ -127,7 +127,7 @@ ..() if(istype(W,/obj/item/reagent_containers/glass) || istype(W,/obj/item/reagent_containers/food/drinks) || istype(W,/obj/item/reagent_containers/food/condiment)) return - if(W && W.w_class <= w_class && (flags & OPENCONTAINER)) + if(W && W.w_class <= w_class && (atom_flags & OPENCONTAINER)) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) @@ -206,7 +206,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" @@ -216,7 +216,7 @@ matter = list(MAT_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" @@ -227,7 +227,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" @@ -239,7 +239,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 prefill = list("cryoxadone" = 30) @@ -262,7 +262,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' @@ -318,7 +318,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 5e18cda7519..b7317561e66 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' @@ -121,7 +121,7 @@ if(!user.attempt_insert_item_for_installation(W, src)) return if(W.is_open_container()) - W.flags ^= OPENCONTAINER + W.atom_flags ^= OPENCONTAINER W.update_icon() loaded_vial = W reagents.maximum_volume = loaded_vial.reagents.maximum_volume @@ -156,13 +156,13 @@ /obj/item/reagent_containers/hypospray/autoinjector/used/Initialize(mapload) . = ..() - 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() @@ -375,7 +375,7 @@ amount_per_transfer_from_this = 20 volume = 20 filled = 1 - flags = OPENCONTAINER + atom_flags = OPENCONTAINER origin_tech = list(TECH_BIO = 4, TECH_ILLEGAL = 3) filled_reagents = list("impedrezene" = 15, "toxin" = 5) preserve_item = 0 @@ -390,7 +390,7 @@ /obj/item/reagent_containers/hypospray/glukoz/used/Initialize(mapload) . = ..() - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER icon_state = "[initial(icon_state)]_used" @@ -418,7 +418,7 @@ /obj/item/reagent_containers/hypospray/glukoz/do_injection(mob/living/carbon/human/H, mob/living/user) . = ..() if(.) // Will occur if successfully injected. - flags &= ~OPENCONTAINER + atom_flags &= ~OPENCONTAINER to_chat(user, "You jab the [src] needle into your skin!") icon_state = "[initial(icon_state)]_used" filled = 0 diff --git a/code/modules/reagents/reagent_containers/organic.dm b/code/modules/reagents/reagent_containers/organic.dm index 8bff574eaab..76016f38527 100644 --- a/code/modules/reagents/reagent_containers/organic.dm +++ b/code/modules/reagents/reagent_containers/organic.dm @@ -11,7 +11,7 @@ possible_transfer_amounts = list(5,10,15,25,30,60) volume = 60 w_class = ITEMSIZE_SMALL - flags = NOCONDUCT + atom_flags = NOCONDUCT unacidable = 0 //tissues does dissolve in acid drop_sound = 'sound/effects/splat.ogg' pickup_sound = 'sound/effects/squelch1.ogg' @@ -68,7 +68,7 @@ else to_chat(usr, "You peel the wax layer off \the [src].") playsound(loc, 'sound/effects/pageturn2.ogg', 50, 1) - flags |= OPENCONTAINER + atom_flags |= OPENCONTAINER update_icon() /obj/item/reagent_containers/organic/update_icon() @@ -134,7 +134,7 @@ ..() if(istype(W,/obj/item/reagent_containers/glass) || istype(W,/obj/item/reagent_containers/food/drinks) || istype(W,/obj/item/reagent_containers/food/condiment)) return - if(W && W.w_class <= w_class && (flags & OPENCONTAINER)) + if(W && W.w_class <= w_class && (atom_flags & OPENCONTAINER)) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index bfc04277e6a..a6aee8507c2 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -5,7 +5,7 @@ icon_state = "cleaner" item_state = "cleaner" item_flags = ITEM_NOBLUDGEON - flags = OPENCONTAINER + atom_flags = OPENCONTAINER slot_flags = SLOT_BELT | SLOT_HOLSTER throw_force = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm index c17dce415db..ad8dcffa4df 100644 --- a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm +++ b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm @@ -4,101 +4,102 @@ /obj/item/reagent_containers/hypospray/autoinjector identity_type = /datum/identification/hypo +// todo: this entire file needs to be transitioned to reagent holder flags wtf // The good. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE // The somewhat bad. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/space_drugs/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE // The very bad. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified init_hide_identity = TRUE - flags = 0 + atom_flags = NONE diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index a21386d06c3..8825559ac60 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -9,7 +9,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). icon = 'icons/obj/machines/fabricators/imprinter.dmi' icon_state = "imprinter" base_icon_state = "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 0b68557ecca..a2e3da6017f 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/machines/fabricators/protolathe.dmi' icon_state = "protolathe" base_icon_state = "protolathe" - flags = OPENCONTAINER + atom_flags = OPENCONTAINER circuit = /obj/item/circuitboard/protolathe use_power = USE_POWER_IDLE idle_power_usage = 30 diff --git a/code/modules/rigsuits/rig_pieces.dm b/code/modules/rigsuits/rig_pieces.dm index 913620f2132..8ea80e91e22 100644 --- a/code/modules/rigsuits/rig_pieces.dm +++ b/code/modules/rigsuits/rig_pieces.dm @@ -4,7 +4,7 @@ /obj/item/clothing/head/helmet/space/rig name = "helmet" - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL | ALLOW_SURVIVALFOOD | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB | ALLOWINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_parts_covered = HEAD|FACE|EYES @@ -45,7 +45,7 @@ /obj/item/clothing/gloves/gauntlets/rig name = "gauntlets" clothing_flags = THICKMATERIAL | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB - flags = PHORONGUARD + atom_flags = PHORONGUARD body_parts_covered = HANDS heat_protection = HANDS cold_protection = HANDS @@ -78,7 +78,7 @@ /obj/item/clothing/shoes/magboots/rig name = "boots" - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB body_parts_covered = FEET cold_protection = FEET @@ -121,7 +121,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS clothing_flags = THICKMATERIAL | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags = PHORONGUARD + atom_flags = PHORONGUARD flags_inv = HIDEJUMPSUIT|HIDETAIL heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -216,7 +216,7 @@ /obj/item/clothing/head/lightrig name = "mask" clothing_flags = THICKMATERIAL | ALLOWINTERNALS | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB - flags = PHORONGUARD + atom_flags = PHORONGUARD body_parts_covered = HEAD|FACE|EYES heat_protection = HEAD|FACE|EYES cold_protection = HEAD|FACE|EYES @@ -226,14 +226,14 @@ allowed = list(/obj/item/flashlight) flags_inv = HIDEJUMPSUIT clothing_flags = THICKMATERIAL | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB - flags = PHORONGUARD + atom_flags = PHORONGUARD body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /obj/item/clothing/shoes/lightrig name = "boots" - flags = PHORONGUARD + atom_flags = PHORONGUARD clothing_flags = EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB species_restricted = null body_parts_covered = FEET @@ -243,7 +243,7 @@ /obj/item/clothing/gloves/gauntlets/lightrig name = "gloves" clothing_flags = THICKMATERIAL | EQUIP_IGNORE_BELTLINK | EQUIP_IGNORE_DELIMB - flags = PHORONGUARD + atom_flags = PHORONGUARD species_restricted = null body_parts_covered = HANDS heat_protection = HANDS diff --git a/code/modules/rigsuits/suits/alien.dm b/code/modules/rigsuits/suits/alien.dm index 20b85c5c1ea..6c712c604b0 100644 --- a/code/modules/rigsuits/suits/alien.dm +++ b/code/modules/rigsuits/suits/alien.dm @@ -41,13 +41,13 @@ * VOX */ -/obj/item/rig/vox //Just to get the flags set up +/obj/item/rig/vox //Just to get the atom_flags set up name = "alien control module" desc = "This metal box writhes and squirms as if it were alive..." 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 + atom_flags = PHORONGUARD clothing_flags = THICKMATERIAL siemens_coefficient = 0.2 offline_slowdown = 5 diff --git a/code/modules/rigsuits/suits/light.dm b/code/modules/rigsuits/suits/light.dm index 8892f4fbee8..bc5c5c7afae 100644 --- a/code/modules/rigsuits/suits/light.dm +++ b/code/modules/rigsuits/suits/light.dm @@ -70,7 +70,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. + atom_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/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index 26d374106a7..ffcb1cca14a 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -33,7 +33,7 @@ overlays.Cut() //NOT ssoverlays else icon_state = enabled_icon_state - flags |= OVERLAY_QUEUED //Trick SSoverlays + atom_flags |= ATOM_OVERLAY_QUEUED //Trick SSoverlays SSoverlays.queue += src /obj/effect/shield/proc/update_color() diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 544de240800..190396d6a7d 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -5,7 +5,7 @@ icon_state = "energynet" anchored = 1 unacidable = 1 - flags = ATOM_ABSTRACT + atom_flags = ATOM_ABSTRACT invisibility = 101 var/shuttle_landmark_flags = SLANDMARK_FLAG_AUTOSET // We generally want to use current area/turf as base. diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index b2575d846e0..21d99600d6d 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -314,7 +314,7 @@ //if(AM.movable_flags & MOVABLE_FLAG_DEL_SHUTTLE) // qdel(AM) // continue - if((AM.flags & ATOM_ABSTRACT)) + if((AM.atom_flags & ATOM_ABSTRACT)) continue if(isliving(AM)) var/mob/living/bug = AM diff --git a/code/modules/species/station/standard/shadekin.dm b/code/modules/species/station/standard/shadekin.dm index a70449e1897..49f18f29e2d 100644 --- a/code/modules/species/station/standard/shadekin.dm +++ b/code/modules/species/station/standard/shadekin.dm @@ -47,7 +47,7 @@ heat_level_2 = 1000 heat_level_3 = 1150 - flags = NO_SCAN | NO_MINOR_CUT | CONTAMINATION_IMMUNE //shadekin biology is still unknown to the universe (unless some bullshit lore says otherwise); CitadelRP: Now able to walk over shards of glass like regular shadekins + species_flags = NO_SCAN | NO_MINOR_CUT | CONTAMINATION_IMMUNE //shadekin biology is still unknown to the universe (unless some bullshit lore says otherwise); CitadelRP: Now able to walk over shards of glass like regular shadekins species_spawn_flags = SPECIES_SPAWN_CHARACTER | SPECIES_SPAWN_WHITELISTED reagent_tag = IS_SHADEKIN // for shadekin-unique chem interactions diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 73dbe2dbc83..91c7838a6ec 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 |= ATOM_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 &= ~ATOM_BORDER for(var/D in list(turn(dir, 90), turn(dir, -90))) var/obj/structure/table/T = locate() in get_step(src.loc,D) if(T && T.flipped == 1 && T.dir == src.dir && material && T.material&& T.material.name == material.name) diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm index 64ff9245cea..75369e67f90 100644 --- a/code/modules/turbolift/turbolift.dm +++ b/code/modules/turbolift/turbolift.dm @@ -162,7 +162,7 @@ M.gib() else if(istype(AM, /mob/zshadow)) qdel(AM) - else if(!(AM.flags & ATOM_ABSTRACT) && !(istype(AM, /mob/observer))) + else if(!(AM.atom_flags & ATOM_ABSTRACT) && !(istype(AM, /mob/observer))) qdel(AM) origin.move_contents_to(destination) diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index b74515bd113..568a53d5acc 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -153,7 +153,7 @@ // Clear out contents. for(var/atom/movable/thing in checking.contents) - if(!(thing.flags & ATOM_ABSTRACT)) + if(!(thing.atom_flags & ATOM_ABSTRACT)) qdel(thing) if(tx >= ux && tx <= ex && ty >= uy && ty <= ey) @@ -170,7 +170,7 @@ checking.ChangeTurf(floor_type) checking = locate(tx,ty,cz) for(var/atom/movable/thing in checking.contents) - if(!(thing.flags & ATOM_ABSTRACT)) + if(!(thing.atom_flags & ATOM_ABSTRACT)) qdel(thing) if(checking.type == floor_type) // Don't build over empty space on lower levels. var/obj/machinery/door/airlock/lift/newdoor = new door_type(checking) diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index 4ece5cec674..42ef4597437 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -44,7 +44,7 @@ var/list/gurgled_overlays = list( return TRUE /obj/item/proc/can_gurgle() - if(flags & PHORONGUARD) + if(atom_flags & PHORONGUARD) return FALSE else if(unacidable) return FALSE diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm index 69d44853af1..8e110f8b628 100644 --- a/code/modules/vore/fluffstuff/custom_items.dm +++ b/code/modules/vore/fluffstuff/custom_items.dm @@ -281,7 +281,7 @@ icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "holochain_mob" - flags = NOBLOODY + atom_flags = NOBLOODY slot_flags = SLOT_BELT force = 10 throw_force = 3 diff --git a/code/modules/vore/fluffstuff/guns/gunsword.dm b/code/modules/vore/fluffstuff/guns/gunsword.dm index d53471b6a4d..d2fa5aa3a0c 100644 --- a/code/modules/vore/fluffstuff/guns/gunsword.dm +++ b/code/modules/vore/fluffstuff/guns/gunsword.dm @@ -52,7 +52,7 @@ sharp = 0 edge = 0 armor_penetration = 50 - flags = NOBLOODY + atom_flags = NOBLOODY var/lrange = 2 var/lpower = 2 var/lcolor = "#800080" diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index e180a955b6f..e1bea237d17 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(mapload)