diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 92d3f01982..846599534d 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -22,7 +22,7 @@ #define START_PROCESSING(Processor, Datum) if (!Datum.isprocessing) {Datum.isprocessing = TRUE;Processor.processing += Datum} #define STOP_PROCESSING(Processor, Datum) Datum.isprocessing = FALSE;Processor.processing -= Datum -//SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier) +//SubSystem flags_1 (Please design any new flags_1 so that the default is off, to make adding flags_1 to subsystems easier) //subsystem does not initialize. #define SS_NO_INIT 1 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index da945e52e6..26a1535e33 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -1,6 +1,6 @@ //A set of constants used to determine which type of mute an admin wishes to apply: //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) -//Therefore there needs to be a gap between the flags for the automute flags +//Therefore there needs to be a gap between the flags_1 for the automute flags_1 #define MUTE_IC 1 #define MUTE_OOC 2 #define MUTE_PRAY 4 @@ -39,7 +39,7 @@ #error Remove the flag below , its been long enough #endif //legacy , remove post 512, it was replaced by R_POLL -#define R_REJUVINATE 2 +#define R_REJUVINATE 2 #define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated. @@ -50,7 +50,7 @@ #define ADMIN_SM(user) "(SM)" #define ADMIN_TP(user) "(TP)" #define ADMIN_KICK(user) "(KICK)" -#define ADMIN_CENTCOM_REPLY(user) "(RPLY)" +#define ADMIN_CENTCOM_REPLY(user) "(RPLY)" #define ADMIN_SYNDICATE_REPLY(user) "(RPLY)" #define ADMIN_SC(user) "(SC)" #define ADMIN_SMITE(user) "(SMITE)" diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 2abd148e49..37566258a4 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -86,7 +86,7 @@ . = SLOT_POCKET -//Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses. +//Bit flags_1 for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses. #define HIDEGLOVES 1 #define HIDESUITSTORAGE 2 #define HIDEJUMPSUIT 4 //these first four are only used in exterior suits @@ -134,17 +134,17 @@ #define THERMAL_PROTECTION_HAND_LEFT 0.025 #define THERMAL_PROTECTION_HAND_RIGHT 0.025 -//flags for female outfits: How much the game can safely "take off" the uniform without it looking weird +//flags_1 for female outfits: How much the game can safely "take off" the uniform without it looking weird #define NO_FEMALE_UNIFORM 0 #define FEMALE_UNIFORM_FULL 1 #define FEMALE_UNIFORM_TOP 2 -//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in +//flags_1 for alternate styles: These are hard sprited so don't set this if you didn't put the effort in #define NORMAL_STYLE 0 #define ALT_STYLE 1 #define DIGITIGRADE_STYLE 2 -//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts +//flags_1 for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts #define NO_MUTANTRACE_VARIATION 0 #define MUTANTRACE_VARIATION 1 @@ -152,9 +152,9 @@ #define FULL_DIGITIGRADE 1 #define SQUISHED_DIGITIGRADE 2 -//flags for covering body parts +//flags_1 for covering body parts #define GLASSESCOVERSEYES 1 -#define MASKCOVERSEYES 2 // get rid of some of the other retardation in these flags +#define MASKCOVERSEYES 2 // get rid of some of the other retardation in these flags_1 #define HEADCOVERSEYES 4 // feel free to realloc these numbers for other purposes #define MASKCOVERSMOUTH 8 // on other items, these are just for mask/head #define HEADCOVERSMOUTH 16 diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 196e051b64..bee6508609 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -53,7 +53,7 @@ #define ENGINE_COEFF_MAX 2 #define ENGINE_DEFAULT_MAXSPEED_ENGINES 5 -//Docking error flags +//Docking error flags_1 #define DOCKING_SUCCESS 0 #define DOCKING_COMPLETE 1 #define DOCKING_BLOCKED 2 diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index d756cbaf1b..218afcafb7 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -25,6 +25,6 @@ //for clothing visor toggles, these determine which vars to toggle #define VISOR_FLASHPROTECT 1 #define VISOR_TINT 2 -#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses +#define VISOR_VISIONFLAGS 4 //all following flags_1 only matter for glasses #define VISOR_DARKNESSVIEW 8 #define VISOR_INVISVIEW 16 diff --git a/code/_compile_options.dm b/code/_compile_options.dm index a669f1b4f5..c1f02856a7 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -52,7 +52,7 @@ #define AI_CAMERA_LUMINOSITY 5 #define AI_VOX 1 // Comment out if you don't want VOX to be enabled and have players download the voice sounds. -//Additional code for the above flags. +//Additional code for the above flags_1. #ifdef TESTING #warn compiling in TESTING mode. testing() debug messages will be visible. #endif @@ -69,7 +69,7 @@ #error You need version 511 or higher #endif -//Update this whenever the db schema changes +//Update this whenever the db schema changes //make sure you add an update to the schema_version stable in the db changelog #define DB_MAJOR_VERSION 3 #define DB_MINOR_VERSION 0 diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index f364bac76f..b01927e8f8 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -130,7 +130,7 @@ if (T < shortesttimer) shortesttimer = T L.transform = newtransform - animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = ANIMATION_END_NOW) + animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags_1 = ANIMATION_END_NOW) if (new_parallax_movedir) L.transform = newtransform animate(transform = matrix(), time = T) //queue up another animate so lag doesn't create a shutter @@ -168,7 +168,7 @@ L.transform = newtransform - animate(L, transform = matrix(), time = T, loop = -1, flags = ANIMATION_END_NOW) + animate(L, transform = matrix(), time = T, loop = -1, flags_1 = ANIMATION_END_NOW) /datum/hud/proc/update_parallax() var/client/C = mymob.client diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 161d893b25..bcc5e573a7 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -3,7 +3,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state = "jaws" desc = "The jaws of the law." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 12 throwforce = 0 hitsound = 'sound/weapons/bite.ogg' @@ -16,7 +16,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state = "smalljaws" desc = "The jaws of a small dog." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 6 throwforce = 0 hitsound = 'sound/weapons/bite.ogg' @@ -38,7 +38,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state = "jaws" desc = "The jaws of the law." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 12 throwforce = 0 hitsound = 'sound/weapons/bite.ogg' @@ -50,7 +50,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state = "smalljaws" desc = "The jaws of a small dog." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 5 throwforce = 0 hitsound = 'sound/weapons/bite.ogg' @@ -85,7 +85,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state = "nose" desc = "The BOOP module" - flags = CONDUCT + flags_1 = CONDUCT_1 force = 0 throwforce = 0 attack_verb = list("nuzzled", "nosed", "booped") @@ -177,7 +177,7 @@ /obj/item/weapon/soap/tongue/New() ..() - flags |= NOBLUDGEON //No more attack messages + flags_1 |= NOBLUDGEON_1 //No more attack messages /obj/item/trash/rkibble name = "robo kibble" @@ -344,7 +344,7 @@ /obj/item/device/dogborg/sleeper/New() ..() - flags |= NOBLUDGEON //No more attack messages + flags_1 |= NOBLUDGEON_1 //No more attack messages /obj/item/device/dogborg/sleeper/Exit(atom/movable/O) return 0 @@ -655,7 +655,7 @@ cleaning = 0 update_patient() return - + //sound effects for(var/mob/living/M in contents) if(prob(20)) @@ -663,7 +663,7 @@ playsound(get_turf(hound),"digest_pred",75,0,-6,0,channel=CHANNEL_PRED) M.stop_sound_channel(CHANNEL_PRED) M.playsound_local("digest_prey",60) - + //If the timing is right, and there are items to be touched if(SSmobs.times_fired%6==1 && length(touchable_items)) @@ -744,7 +744,7 @@ /obj/item/weapon/storage/attackby(obj/item/device/dogborg/sleeper/K9, mob/user, proximity) K9.afterattack(src, user ,1) - + /obj/item/device/dogborg/sleeper/K9/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity) hound = loc @@ -775,7 +775,7 @@ playsound(hound, 'sound/effects/bin_close.ogg', 80, 1) // Really don't need ERP sound effects for robots return return - + /obj/item/device/dogborg/sleeper/compactor //Janihound gut. name = "garbage processor" desc = "A mounted garbage compactor unit with fuel processor." @@ -854,7 +854,7 @@ /obj/item/weapon/dogborg/pounce/New() ..() - flags |= NOBLUDGEON + flags_1 |= NOBLUDGEON_1 /mob/living/silicon/robot var/leaping = 0 diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 5ca7b15f72..3625e3e0df 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -53,7 +53,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/restart_clear = 0 var/static/restart_timeout = 0 var/static/restart_count = 0 - + //current tick limit, assigned before running a subsystem. //used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits var/static/current_ticklimit = TICK_LIMIT_RUNNING @@ -131,7 +131,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new FireHim = TRUE if(3) msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined." - BadBoy.flags |= SS_NO_FIRE + BadBoy.flags_1 |= SS_NO_FIRE if(msg) to_chat(GLOB.admins, "[msg]") log_world(msg) @@ -167,7 +167,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new // Initialize subsystems. current_ticklimit = config.tick_limit_mc_init for (var/datum/controller/subsystem/SS in subsystems) - if (SS.flags & SS_NO_INIT) + if (SS.flags_1 & SS_NO_INIT) continue SS.Initialize(REALTIMEOFDAY) CHECK_TICK @@ -232,13 +232,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/timer = world.time for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing - if (SS.flags & SS_NO_FIRE) + if (SS.flags_1 & SS_NO_FIRE) continue SS.queued_time = 0 SS.queue_next = null SS.queue_prev = null SS.state = SS_IDLE - if (SS.flags & SS_TICKER) + if (SS.flags_1 & SS_TICKER) tickersubsystems += SS timer += world.tick_lag * rand(1, 5) SS.next_fire = timer @@ -371,7 +371,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new continue if (SS.next_fire > world.time) continue - SS_flags = SS.flags + SS_flags = SS.flags_1 if (SS_flags & SS_NO_FIRE) subsystemstocheck -= SS continue @@ -408,7 +408,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if (ran && world.tick_usage > TICK_LIMIT_RUNNING) break - queue_node_flags = queue_node.flags + queue_node_flags = queue_node.flags_1 queue_node_priority = queue_node.queued_priority //super special case, subsystems where we can't make them pause mid way through diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index eee6945c41..0c1f8411fc 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -6,7 +6,7 @@ var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. var/priority = 50 //When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep - var/flags = 0 //see MC.dm in __DEFINES Most flags must be set on world start to take full effect. (You can also restart the mc to force them to process again) + var/flags_1 = 0 //see MC.dm in __DEFINES Most flags_1 must be set on world start to take full effect. (You can also restart the mc to force them to process again) //set to 0 to prevent fire() calls, mostly for admin use or subsystems that may be resumed later // use the SS_NO_FIRE flag instead for systems that never fire to keep it from even being added to the list @@ -61,13 +61,13 @@ //fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds. //Sleeping in here prevents future fires until returned. /datum/controller/subsystem/proc/fire(resumed = 0) - flags |= SS_NO_FIRE + flags_1 |= SS_NO_FIRE throw EXCEPTION("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.") /datum/controller/subsystem/Destroy() dequeue() can_fire = 0 - flags |= SS_NO_FIRE + flags_1 |= SS_NO_FIRE Master.subsystems -= src @@ -76,14 +76,14 @@ // (this lets us sort our run order correctly without having to re-sort the entire already sorted list) /datum/controller/subsystem/proc/enqueue() var/SS_priority = priority - var/SS_flags = flags + var/SS_flags = flags_1 var/datum/controller/subsystem/queue_node var/queue_node_priority var/queue_node_flags for (queue_node = Master.queue_head; queue_node; queue_node = queue_node.queue_next) queue_node_priority = queue_node.queued_priority - queue_node_flags = queue_node.flags + queue_node_flags = queue_node.flags_1 if (queue_node_flags & SS_TICKER) if (!(SS_flags & SS_TICKER)) @@ -170,7 +170,7 @@ - if(can_fire && !(SS_NO_FIRE in flags)) + if(can_fire && !(SS_NO_FIRE in flags_1)) msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]" else msg = "OFFLINE\t[msg]" diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm index a83afb3923..e1528f458d 100644 --- a/code/controllers/subsystem/acid.dm +++ b/code/controllers/subsystem/acid.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(acid) name = "Acid" priority = 40 - flags = SS_NO_INIT|SS_BACKGROUND + flags_1 = SS_NO_INIT|SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun = list() diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index a9a177597a..48a8d74616 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(air) init_order = INIT_ORDER_AIR priority = 20 wait = 5 - flags = SS_BACKGROUND + flags_1 = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/cost_turfs = 0 diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index fd27c9424f..d4a2407309 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(assets) name = "Assets" init_order = INIT_ORDER_ASSETS - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/list/cache = list() var/list/preload = list() diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index e819060afb..b7ac19ad1f 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(atoms) name = "Atoms" init_order = INIT_ORDER_ATOMS - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/initialized = INITIALIZATION_INSSATOMS var/old_initialized @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(atoms) initialized = INITIALIZATION_INNEW_MAPLOAD LAZYINITLIST(late_loaders) - + var/count var/list/mapload_arg = list(TRUE) if(atoms) @@ -60,10 +60,10 @@ SUBSYSTEM_DEF(atoms) A.LateInitialize() testing("Late initialized [late_loaders.len] atoms") late_loaders.Cut() - + if(atoms) . = created_atoms + atoms - created_atoms = null + created_atoms = null /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments) var/the_type = A.type @@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atoms) if(start_tick != world.time) BadInitializeCalls[the_type] |= BAD_INIT_SLEPT - + var/qdeleted = FALSE if(result != INITIALIZE_HINT_NORMAL) @@ -92,12 +92,12 @@ SUBSYSTEM_DEF(atoms) qdeleted = TRUE else BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT - + if(!A) //possible harddel qdeleted = TRUE else if(!A.initialized) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT - + return qdeleted || QDELING(A) /datum/controller/subsystem/atoms/proc/map_loader_begin() diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 32086f52ed..386345a728 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(augury) name = "Augury" - flags = SS_NO_INIT + flags_1 = SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/watchers = list() diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 3344afcaaa..613b091708 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(blackbox) name = "Blackbox" wait = 6000 - flags = SS_NO_TICK_CHECK | SS_NO_INIT + flags_1 = SS_NO_TICK_CHECK | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME init_order = INIT_ORDER_BLACKBOX @@ -250,7 +250,7 @@ SUBSYSTEM_DEF(blackbox) return 0 return value -/datum/feedback_variable/proc/get_variable() +/datum/feedback_variable/proc/get_variable() return variable /datum/feedback_variable/proc/set_details(text) @@ -260,11 +260,11 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable/proc/add_details(text) if (istext(text)) if (!details) - details = "\"[text]\"" + details = "\"[text]\"" else - details += " | \"[text]\"" + details += " | \"[text]\"" -/datum/feedback_variable/proc/get_details() +/datum/feedback_variable/proc/get_details() return details /datum/feedback_variable/proc/get_parsed() diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 1380d119e2..930902e1e6 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(communications) name = "Communications" - flags = SS_NO_INIT | SS_NO_FIRE + flags_1 = SS_NO_INIT | SS_NO_FIRE var/silicon_message_cooldown var/nonsilicon_message_cooldown diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 864274b8fb..35f3d39cd4 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(dbcore) name = "Database" - flags = SS_NO_INIT|SS_NO_FIRE + flags_1 = SS_NO_INIT|SS_NO_FIRE init_order = INIT_ORDER_DBCORE var/const/FAILED_DB_CONNECTION_CUTOFF = 5 @@ -251,7 +251,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table var/table var/position //1-based index into item data var/sql_type - var/flags + var/flags_1 var/length var/max_length //types @@ -275,7 +275,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table table = table_handler position = position_handler sql_type = type_handler - flags = flag_handler + flags_1 = flag_handler length = length_handler max_length = max_length_handler diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm index c75063c256..75ff3af534 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(disease) name = "Disease" - flags = SS_NO_FIRE | SS_NO_INIT + flags_1 = SS_NO_FIRE | SS_NO_INIT var/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing. var/list/diseases diff --git a/code/controllers/subsystem/explosion.dm b/code/controllers/subsystem/explosion.dm index fe6657644f..fcacba2519 100644 --- a/code/controllers/subsystem/explosion.dm +++ b/code/controllers/subsystem/explosion.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(explosion) priority = 99 wait = 1 - flags = SS_TICKER|SS_NO_INIT + flags_1 = SS_TICKER|SS_NO_INIT var/list/explosions @@ -49,12 +49,12 @@ SUBSYSTEM_DEF(explosion) flame_cap = SSexplosion.flame_cap dyn_ex_scale = SSexplosion.dyn_ex_scale -/datum/controller/subsystem/explosion/fire() +/datum/controller/subsystem/explosion/fire() var/list/cached_explosions = explosions var/num_explosions = cached_explosions.len if(!num_explosions) return - + //figure exactly how many tick splits are required var/num_splits if(rebuild_tick_split_count) @@ -216,7 +216,7 @@ SUBSYSTEM_DEF(explosion) started_at = REALTIMEOFDAY tick_started = world.time - + gathered_turfs = list() calculated_turfs = list() unsafe_turfs = list() @@ -332,13 +332,13 @@ SUBSYSTEM_DEF(explosion) for(var/obj/structure/blob/B in T) current_exp_block += B.explosion_block - + L[T] = current_exp_block if(MC_TICK_CHECK) E.gathered_turfs.Cut(1, cut_to) return FALSE - + E.gathered_turfs.Cut() return done_gathering_turfs @@ -358,7 +358,7 @@ SUBSYSTEM_DEF(explosion) var/throw_range_max = E.extent var/turf/epi = E.epicenter - + var/x0 = epi.x var/y0 = epi.y @@ -407,7 +407,7 @@ SUBSYSTEM_DEF(explosion) var/throw_range = rand(throw_dist, throw_range_max) var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range) I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Resets when it finishes throwing, regardless of hitting anything) - I.throw_at(throw_at, throw_range, 4) + I.throw_at(throw_at, throw_range, 4) if(MC_TICK_CHECK) var/circumference = (PI * (init_dist + 4) * 2) //+4 to radius to prevent shit gaps @@ -432,7 +432,7 @@ SUBSYSTEM_DEF(explosion) E.finished_at = REALTIMEOFDAY E.tick_finished = world.time - + return TRUE /client/proc/check_bomb_impacts() diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fire_burning.dm index 73358000f1..2caa2fd89c 100644 --- a/code/controllers/subsystem/fire_burning.dm +++ b/code/controllers/subsystem/fire_burning.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(fire_burning) name = "Fire Burning" priority = 40 - flags = SS_NO_INIT|SS_BACKGROUND + flags_1 = SS_NO_INIT|SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun = list() diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index ebc1ad9474..b2e71c77b6 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(garbage) name = "Garbage" priority = 15 wait = 5 - flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT + flags_1 = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object @@ -67,9 +67,9 @@ SUBSYSTEM_DEF(garbage) HandleToBeQueued() if(state == SS_RUNNING) HandleQueue() - + if (state == SS_PAUSED) //make us wait again before the next run. - state = SS_RUNNING + state = SS_RUNNING //If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond. //Don't attempt to optimize, not worth the effort. @@ -114,7 +114,7 @@ SUBSYSTEM_DEF(garbage) var/type = A.type testing("GC: -- \ref[A] | [type] was unable to be GC'd and was deleted --") didntgc["[type]"]++ - + HardDelete(A) ++delslasttick @@ -149,12 +149,12 @@ SUBSYSTEM_DEF(garbage) var/time = world.timeofday var/tick = world.tick_usage var/ticktime = world.time - + var/type = A.type var/refID = "\ref[A]" - + del(A) - + tick = (world.tick_usage-tick+((world.time-ticktime)/world.tick_lag*100)) if (tick > highest_del_tickusage) highest_del_tickusage = tick @@ -167,7 +167,7 @@ SUBSYSTEM_DEF(garbage) log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete)") message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete).") postpone(time/5) - + /datum/controller/subsystem/garbage/proc/HardQueue(datum/A) if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) tobequeued += A diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 84df089973..11657c76dc 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(icon_smooth) init_order = INIT_ORDER_ICON_SMOOTHING wait = 1 priority = 35 - flags = SS_TICKER + flags_1 = SS_TICKER var/list/smooth_queue = list() diff --git a/code/controllers/subsystem/inbounds.dm b/code/controllers/subsystem/inbounds.dm index 16e0f53028..ab736ac2d1 100644 --- a/code/controllers/subsystem/inbounds.dm +++ b/code/controllers/subsystem/inbounds.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(inbounds) name = "Inbounds" priority = 40 - flags = SS_NO_INIT + flags_1 = SS_NO_INIT runlevels = RUNLEVEL_GAME var/list/processing = list() diff --git a/code/controllers/subsystem/ipintel.dm b/code/controllers/subsystem/ipintel.dm index fca394924d..afde42c7d8 100644 --- a/code/controllers/subsystem/ipintel.dm +++ b/code/controllers/subsystem/ipintel.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(ipintel) name = "XKeyScore" init_order = INIT_ORDER_XKEYSCORE - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/enabled = 0 //disable at round start to avoid checking reconnects var/throttle = 0 var/errors = 0 diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index f28373ef22..5f50b3dfcf 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(job) name = "Jobs" init_order = INIT_ORDER_JOBS - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/list/occupations = list() //List of all jobs var/list/name_occupations = list() //Dict of all jobs, keys are titles diff --git a/code/controllers/subsystem/language.dm b/code/controllers/subsystem/language.dm index e80a7096d8..6d87b0ad9e 100644 --- a/code/controllers/subsystem/language.dm +++ b/code/controllers/subsystem/language.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(language) name = "Language" init_order = INIT_ORDER_LANGUAGE - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE /datum/controller/subsystem/language/Initialize(timeofday) for(var/L in subtypesof(/datum/language)) diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index bcb94c835b..3de7b92cad 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(lighting) name = "Lighting" wait = 2 init_order = INIT_ORDER_LIGHTING - flags = SS_TICKER + flags_1 = SS_TICKER var/initialized = FALSE @@ -24,7 +24,7 @@ SUBSYSTEM_DEF(lighting) create_all_lighting_objects() initialized = TRUE - + fire(FALSE, TRUE) ..() diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index eab61d4ef9..d6c6e8662d 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(machines) name = "Machines" init_order = INIT_ORDER_MACHINES - flags = SS_KEEP_TIMING + flags_1 = SS_KEEP_TIMING var/list/processing = list() var/list/currentrun = list() var/list/powernets = list() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 2c36e10d31..df13c57078 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(mapping) name = "Mapping" init_order = INIT_ORDER_MAPPING - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/list/nuke_tiles = list() var/list/nuke_threats = list() @@ -84,7 +84,7 @@ SUBSYSTEM_DEF(mapping) C.update_icon() /datum/controller/subsystem/mapping/Recover() - flags |= SS_NO_INIT + flags_1 |= SS_NO_INIT map_templates = SSmapping.map_templates ruins_templates = SSmapping.ruins_templates space_ruins_templates = SSmapping.space_ruins_templates diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 10c6f8e5c4..ef15d49ad7 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(minimap) name = "Minimap" init_order = INIT_ORDER_MINIMAP - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/const/MINIMAP_SIZE = 2048 var/const/TILE_SIZE = 8 diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index cbe9d5c245..8999f420b5 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(mobs) name = "Mobs" priority = 100 - flags = SS_KEEP_TIMING|SS_NO_INIT + flags_1 = SS_KEEP_TIMING|SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun = list() diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index e88da7d900..4491cb14ce 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(npcpool) name = "NPC Pool" - flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND + flags_1 = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND priority = 20 runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME @@ -134,12 +134,12 @@ SUBSYSTEM_DEF(npcpool) if(facCount == 1 && helpProb) helpProb = 100 - + if(prob(helpProb) && candidate.takeDelegate(check,FALSE)) --canBeUsed.len candidate.eye_color = "yellow" candidate.update_icons() - + if(!currentrun.len || MC_TICK_CHECK) //don't change SS state if it isn't necessary return diff --git a/code/controllers/subsystem/orbit.dm b/code/controllers/subsystem/orbit.dm index 6184bb005b..421a312e4f 100644 --- a/code/controllers/subsystem/orbit.dm +++ b/code/controllers/subsystem/orbit.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(orbit) name = "Orbits" priority = 35 wait = 2 - flags = SS_NO_INIT|SS_TICKER + flags_1 = SS_NO_INIT|SS_TICKER var/list/currentrun = list() var/list/processing = list() diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 2a1a04e21d..acdd2ff6ac 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(pai) name = "pAI" - flags = SS_NO_INIT|SS_NO_FIRE + flags_1 = SS_NO_INIT|SS_NO_FIRE var/list/candidates = list() var/ghost_spam = FALSE diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index 39d07ee676..678b96adaf 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(parallax) name = "Parallax" wait = 2 - flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT + flags_1 = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT priority = 65 runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/list/currentrun diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index a0dc7c526d..9261596798 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(persistence) name = "Persistence" init_order = INIT_ORDER_PERSISTENCE - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/savefile/secret_satchels var/list/satchel_blacklist = list() //this is a typecache var/list/new_secret_satchels = list() //these are objects diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm index a6b444c4e7..01576084bc 100644 --- a/code/controllers/subsystem/ping.dm +++ b/code/controllers/subsystem/ping.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(ping) name = "Ping" wait = 6 - flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY + flags_1 = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY priority = 10 var/list/currentrun diff --git a/code/controllers/subsystem/processing/fields.dm b/code/controllers/subsystem/processing/fields.dm index 6a878fa142..eb839619ad 100644 --- a/code/controllers/subsystem/processing/fields.dm +++ b/code/controllers/subsystem/processing/fields.dm @@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(fields) name = "Fields" wait = 2 priority = 40 - flags = SS_KEEP_TIMING | SS_NO_INIT + flags_1 = SS_KEEP_TIMING | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/processing/flightpacks.dm b/code/controllers/subsystem/processing/flightpacks.dm index 1d85811878..253ee294a9 100644 --- a/code/controllers/subsystem/processing/flightpacks.dm +++ b/code/controllers/subsystem/processing/flightpacks.dm @@ -3,7 +3,7 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks) priority = 30 wait = 2 stat_tag = "FM" - flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING + flags_1 = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL diff --git a/code/controllers/subsystem/processing/obj.dm b/code/controllers/subsystem/processing/obj.dm index 29fe277232..3f602dc32c 100644 --- a/code/controllers/subsystem/processing/obj.dm +++ b/code/controllers/subsystem/processing/obj.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(obj) name = "Objects" priority = 40 - flags = SS_NO_INIT + flags_1 = SS_NO_INIT var/list/processing = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm index fba4ebcaf0..ad84295b52 100644 --- a/code/controllers/subsystem/processing/overlays.dm +++ b/code/controllers/subsystem/processing/overlays.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(overlays) name = "Overlay" - flags = SS_TICKER + flags_1 = SS_TICKER wait = 1 priority = 500 init_order = INIT_ORDER_OVERLAY diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 0586975866..4c77cfb2e0 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(processing) name = "Processing" priority = 25 - flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT + flags_1 = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT wait = 10 var/stat_tag = "P" //Used for logging diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index de605cb554..57b34dae33 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(radio) name = "Radio" - flags = SS_NO_FIRE|SS_NO_INIT + flags_1 = SS_NO_FIRE|SS_NO_INIT var/list/datum/radio_frequency/frequencies = list() diff --git a/code/controllers/subsystem/religion.dm b/code/controllers/subsystem/religion.dm index bba7dd082e..477f7411f2 100644 --- a/code/controllers/subsystem/religion.dm +++ b/code/controllers/subsystem/religion.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(religion) name = "Religion" - flags = SS_NO_FIRE|SS_NO_INIT + flags_1 = SS_NO_FIRE|SS_NO_INIT var/religion var/deity diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 855c00b728..b1a115954a 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(server_maint) name = "Server Tasks" wait = 6 - flags = SS_POST_FIRE_TIMING + flags_1 = SS_POST_FIRE_TIMING priority = 10 init_order = INIT_ORDER_SERVER_MAINT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index ea91e8a688..412af41381 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(shuttle) name = "Shuttle" wait = 10 init_order = INIT_ORDER_SHUTTLE - flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK + flags_1 = SS_KEEP_TIMING|SS_NO_TICK_CHECK runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME var/list/mobile = list() diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index 8fe7cbe048..1944c3f279 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(spacedrift) name = "Space Drift" priority = 30 wait = 5 - flags = SS_NO_INIT|SS_KEEP_TIMING + flags_1 = SS_NO_INIT|SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun = list() diff --git a/code/controllers/subsystem/squeak.dm b/code/controllers/subsystem/squeak.dm index d94efd0a4a..f9a291129a 100644 --- a/code/controllers/subsystem/squeak.dm +++ b/code/controllers/subsystem/squeak.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(squeak) name = "Squeak" init_order = INIT_ORDER_SQUEAK - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/list/exposed_wires = list() diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm index 371cf22b3b..4136f731df 100644 --- a/code/controllers/subsystem/stickyban.dm +++ b/code/controllers/subsystem/stickyban.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(stickyban) name = "Sticky Ban" init_order = INIT_ORDER_STICKY_BAN - flags = SS_NO_FIRE + flags_1 = SS_NO_FIRE var/list/cache = list() @@ -27,6 +27,6 @@ SUBSYSTEM_DEF(stickyban) ban["existing_user_matches_this_round"] = list() ban["admin_matches_this_round"] = list() cache[ckey] = ban - + for (var/bannedckey in cache) world.SetConfig("ban", bannedckey, list2stickyban(cache[bannedckey])) diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 7a3528cc3d..ba71d86e1a 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(sun) name = "Sun" wait = 600 - flags = SS_NO_TICK_CHECK|SS_NO_INIT + flags_1 = SS_NO_TICK_CHECK|SS_NO_INIT var/angle var/dx var/dy diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 52fd286eed..11dbb6d081 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(tgui) name = "tgui" wait = 9 - flags = SS_NO_INIT + flags_1 = SS_NO_INIT priority = 110 runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index f245b0766c..f1d4b88f77 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(throwing) name = "Throwing" priority = 25 wait = 1 - flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER + flags_1 = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d196c9cb10..e9a356ef86 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(ticker) init_order = INIT_ORDER_TICKER priority = 200 - flags = SS_KEEP_TIMING + flags_1 = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* ! diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index cb190206b7..0e5a473611 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(time_track) name = "Time Tracking" wait = 600 - flags = SS_NO_INIT|SS_NO_TICK_CHECK + flags_1 = SS_NO_INIT|SS_NO_TICK_CHECK runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/time_dilation_current = 0 diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index daf0eb324d..8a0dfe1f0d 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(timer) wait = 1 //SS_TICKER subsystem, so wait is in ticks init_order = INIT_ORDER_TIMER - flags = SS_TICKER|SS_NO_INIT + flags_1 = SS_TICKER|SS_NO_INIT var/list/datum/timedevent/processing = list() var/list/hashes = list() @@ -50,9 +50,9 @@ SUBSYSTEM_DEF(timer) var/datum/timedevent/bucket_head = bucket_list[i] if (!bucket_head) continue - + log_world("Active timers at index [i]:") - + var/datum/timedevent/bucket_node = bucket_head var/anti_loop_check = 1000 do @@ -215,7 +215,7 @@ SUBSYSTEM_DEF(timer) var/datum/callback/callBack var/timeToRun var/hash - var/list/flags + var/list/flags_1 var/spent = FALSE //set to true right before running. var/name //for easy debugging. //cicular doublely linked list @@ -224,16 +224,16 @@ SUBSYSTEM_DEF(timer) var/static/nextid = 1 -/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash) +/datum/timedevent/New(datum/callback/callBack, timeToRun, flags_1, hash) id = TIMER_ID_NULL src.callBack = callBack src.timeToRun = timeToRun - src.flags = flags + src.flags_1 = flags_1 src.hash = hash - - if (flags & TIMER_UNIQUE) + + if (flags_1 & TIMER_UNIQUE) SStimer.hashes[hash] = src - if (flags & TIMER_STOPPABLE) + if (flags_1 & TIMER_STOPPABLE) do if (nextid >= TIMER_ID_MAX) nextid = 1 @@ -241,12 +241,12 @@ SUBSYSTEM_DEF(timer) while(SStimer.timer_id_dict["timerid" + num2text(id, 8)]) SStimer.timer_id_dict["timerid" + num2text(id, 8)] = src - name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])" + name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags_1, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])" if (callBack.object != GLOBAL_PROC) LAZYADD(callBack.object.active_timers, src) - if (flags & TIMER_CLIENT_TIME) + if (flags_1 & TIMER_CLIENT_TIME) //sorted insert var/list/ctts = SStimer.clienttime_timers var/cttl = length(ctts) @@ -291,7 +291,7 @@ SUBSYSTEM_DEF(timer) /datum/timedevent/Destroy() ..() - if (flags & TIMER_UNIQUE) + if (flags_1 & TIMER_UNIQUE) SStimer.hashes -= hash @@ -301,10 +301,10 @@ SUBSYSTEM_DEF(timer) callBack = null - if (flags & TIMER_STOPPABLE) + if (flags_1 & TIMER_STOPPABLE) SStimer.timer_id_dict -= "timerid" + num2text(id, 8) - if (flags & TIMER_CLIENT_TIME) + if (flags_1 & TIMER_CLIENT_TIME) SStimer.clienttime_timers -= src return QDEL_HINT_IWILLGC @@ -346,7 +346,7 @@ SUBSYSTEM_DEF(timer) else . = "[callBack.object.type]" -/proc/addtimer(datum/callback/callback, wait, flags) +/proc/addtimer(datum/callback/callback, wait, flags_1) if (!callback) return @@ -354,12 +354,12 @@ SUBSYSTEM_DEF(timer) var/hash - if (flags & TIMER_UNIQUE) + if (flags_1 & TIMER_UNIQUE) var/list/hashlist - if(flags & TIMER_NO_HASH_WAIT) - hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME) + if(flags_1 & TIMER_NO_HASH_WAIT) + hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags_1 & TIMER_CLIENT_TIME) else - hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME) + hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags_1 & TIMER_CLIENT_TIME) hashlist += callback.arguments hash = hashlist.Join("|||||||") @@ -370,20 +370,20 @@ SUBSYSTEM_DEF(timer) SStimer.hashes -= hash else - if (flags & TIMER_OVERRIDE) + if (flags_1 & TIMER_OVERRIDE) qdel(hash_timer) else - if (hash_timer.flags & TIMER_STOPPABLE) + if (hash_timer.flags_1 & TIMER_STOPPABLE) . = hash_timer.id return var/timeToRun = world.time + wait - if (flags & TIMER_CLIENT_TIME) + if (flags_1 & TIMER_CLIENT_TIME) timeToRun = REALTIMEOFDAY + wait - var/datum/timedevent/timer = new(callback, timeToRun, flags, hash) - return timer.id + var/datum/timedevent/timer = new(callback, timeToRun, flags_1, hash) + return timer.id /proc/deltimer(id) if (!id) diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index a0bcb5feec..11511608cd 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(title) name = "Title Screen" - flags = SS_NO_FIRE|SS_NO_INIT + flags_1 = SS_NO_FIRE|SS_NO_INIT var/file_path var/icon/icon @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(title) break file_path = "config/title_screens/images/[pick(title_screens)]" - + icon = new(fcopy_rsc(file_path)) if(splash_turf) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 0dbc7c5d3a..7126d93a47 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(vote) name = "Vote" wait = 10 - flags = SS_KEEP_TIMING|SS_NO_INIT + flags_1 = SS_KEEP_TIMING|SS_NO_INIT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 88102e260c..eb49568810 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -1,7 +1,7 @@ //Used for all kinds of weather, ex. lavaland ash storms. SUBSYSTEM_DEF(weather) name = "Weather" - flags = SS_BACKGROUND + flags_1 = SS_BACKGROUND wait = 10 runlevels = RUNLEVEL_GAME var/list/processing = list() diff --git a/code/datums/riding.dm b/code/datums/riding.dm index 7c1b276822..e202fda1b8 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -419,7 +419,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | DROPDEL | NOBLUDGEON + flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/mob/living/carbon/rider var/mob/living/ridden diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm index 98186a5cdf..31a98f572f 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm @@ -102,7 +102,7 @@ /obj/effect/clockwork/sigil/submission/sigil_effects(mob/living/L) L.visible_message("[src] begins to glow a piercing magenta!", "You feel something start to invade your mind...") var/oldcolor = color - animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW) + animate(src, color = "#AF0AAF", time = convert_time, flags_1 = ANIMATION_END_NOW) var/obj/effect/temp_visual/ratvar/sigil/glow if(glow_type) glow = new glow_type(get_turf(src)) @@ -114,7 +114,7 @@ if(get_turf(L) != get_turf(src)) if(glow) qdel(glow) - animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) + animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20) visible_message("[src] slowly stops glowing!") return @@ -136,7 +136,7 @@ to_chat(M, "[message] you!") else to_chat(M, "[message] [L.real_name]!") - animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) + animate(src, color = oldcolor, time = 20, flags_1 = ANIMATION_END_NOW) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20) visible_message("[src] slowly stops glowing!") @@ -314,7 +314,7 @@ if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active) return visible_message("[src] begins to glow bright blue!") - animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay. + animate(src, alpha = 255, time = 10, flags_1 = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay. sleep(10) //as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src)) @@ -380,4 +380,4 @@ animation_number = initial(animation_number) sigil_active = FALSE visible_message("[src] slowly stops glowing!") - animate(src, alpha = initial(alpha), time = 10, flags = ANIMATION_END_NOW) + animate(src, alpha = initial(alpha), time = 10, flags_1 = ANIMATION_END_NOW) diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 0770c62bec..057d424838 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -98,12 +98,12 @@ if(severity == 1 && uses) uses = 0 visible_message("[src] is disrupted!") - animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) + animate(src, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW) deltimer(timerid) timerid = QDEL_IN(src, 10) linked_gateway.uses = 0 linked_gateway.visible_message("[linked_gateway] is disrupted!") - animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) + animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW) deltimer(linked_gateway.timerid) linked_gateway.timerid = QDEL_IN(linked_gateway, 10) return TRUE @@ -136,13 +136,13 @@ uses = max(0, uses - 1) linked_gateway.uses = max(0, linked_gateway.uses - 1) if(!uses) - animate(src, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW) - animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW) + animate(src, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW) + animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW) density = FALSE linked_gateway.density = FALSE else - animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) - animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) + animate(src, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW) + animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW) addtimer(CALLBACK(src, .proc/check_uses), 10) return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm index 56f55a8f80..e103bc2de4 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm @@ -365,7 +365,7 @@ return if(health == maxHealth) return FALSE - else if(!(flags & GODMODE)) + else if(!(flags_1 & GODMODE)) user.visible_message("[user]'s [proselytizer.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \ "You start repairin[src == user ? "g yourself" : "g [src]"]...") proselytizer.repairing = src diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index c5b94d983f..f63713aa5f 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -343,7 +343,7 @@ desc = "Shackles that bind the wrists with sinister magic." trashtype = /obj/item/weapon/restraints/handcuffs/energy/used origin_tech = "materials=2;magnets=5" - flags = DROPDEL + flags_1 = DROPDEL_1 /obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user) user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 790319e362..1aee6ee7d3 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -19,7 +19,7 @@ var/probability = 0 var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm var/explosion_in_progress = 0 //sit back and relax - var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such + var/round_ends_with_antag_death = 0 //flags_1 the "one verse the station" antags as such var/list/datum/mind/modePlayer = new var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist @@ -83,7 +83,7 @@ if(SSdbcore.Connect()) var/sql - if(SSticker.mode) + if(SSticker.mode) sql += "game_mode = '[SSticker.mode]'" if(GLOB.revdata.originmastercommit) if(sql) @@ -111,7 +111,7 @@ var/list/living_crew = list() for(var/mob/Player in GLOB.mob_list) - if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client) + if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client) living_crew += Player if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew") @@ -120,7 +120,7 @@ var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len) var/list/datum/game_mode/usable_modes = list() for(var/datum/game_mode/G in runnable_modes) - if(G.reroll_friendly && living_crew >= G.required_players) + if(G.reroll_friendly && living_crew >= G.required_players) usable_modes += G else qdel(G) @@ -208,7 +208,7 @@ return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark. for(var/mob/Player in GLOB.living_mob_list) - if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client) + if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client) if(Player.mind.special_role) //Someone's still antaging! living_antag_player = Player return 0 @@ -369,7 +369,7 @@ if(candidates.len < recommended_enemies) for(var/mob/dead/new_player/player in players) if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one + if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans drafted += player.mind diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 26a0c28f4f..579080894c 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -499,7 +499,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/weapon/restraints/handcuffs/energy/used desc = "energy discharge" - flags = DROPDEL + flags_1 = DROPDEL_1 /obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) user.visible_message("[user]'s [src] break in a discharge of energy!", \ diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index c92fdddf26..74b4dc7ce1 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -23,7 +23,7 @@ var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H if(V) console.AddVest(V) - V.flags |= NODROP + V.flags_1 |= NODROP_1 var/obj/item/weapon/storage/backpack/B = locate() in H if(B) diff --git a/code/game/gamemodes/miniantags/hades/hades_chapel.dm b/code/game/gamemodes/miniantags/hades/hades_chapel.dm index 6b1f781fe0..cfed1e76be 100644 --- a/code/game/gamemodes/miniantags/hades/hades_chapel.dm +++ b/code/game/gamemodes/miniantags/hades/hades_chapel.dm @@ -16,7 +16,7 @@ /obj/structure/chair/hades/New() ..() - flags |= NODECONSTRUCT + flags_1 |= NODECONSTRUCT_1 for(var/obj/structure/kitchenspike/KS in range(12)) watchedSpikes += KS diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index f9d530feac..9d398fea53 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -35,8 +35,8 @@ Class Variables: Next uid value in sequence stat (bitflag) - Machine status bit flags. - Possible bit flags: + Machine status bit flags_1. + Possible bit flags_1: BROKEN:1 -- Machine is broken NOPOWER:2 -- No power is being supplied to machine. POWEROFF:4 -- tbd @@ -307,7 +307,7 @@ Class Procs: gl_uid++ /obj/machinery/proc/default_pry_open(obj/item/weapon/crowbar/C) - . = !(state_open || panel_open || is_operational() || (flags & NODECONSTRUCT)) && istype(C) + . = !(state_open || panel_open || is_operational() || (flags_1 & NODECONSTRUCT_1)) && istype(C) if(.) playsound(loc, C.usesound, 50, 1) visible_message("[usr] pries open \the [src].", "You pry open \the [src].") @@ -315,13 +315,13 @@ Class Procs: return 1 /obj/machinery/proc/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 0) - . = istype(C) && (panel_open || ignore_panel) && !(flags & NODECONSTRUCT) + . = istype(C) && (panel_open || ignore_panel) && !(flags_1 & NODECONSTRUCT_1) if(.) playsound(loc, C.usesound, 50, 1) deconstruct(TRUE) /obj/machinery/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) on_deconstruction() if(component_parts && component_parts.len) spawn_frame(disassembled) @@ -340,7 +340,7 @@ Class Procs: M.icon_state = "box_1" /obj/machinery/obj_break(damage_flag) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) stat |= BROKEN /obj/machinery/contents_explosion(severity, target) @@ -354,7 +354,7 @@ Class Procs: updateUsrDialog() /obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/weapon/screwdriver/S) - if(istype(S) && !(flags & NODECONSTRUCT)) + if(istype(S) && !(flags_1 & NODECONSTRUCT_1)) playsound(loc, S.usesound, 50, 1) if(!panel_open) panel_open = TRUE @@ -382,7 +382,7 @@ Class Procs: return SUCCESSFUL_UNFASTEN /obj/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) //try to unwrench an object in a WONDERFUL DYNAMIC WAY - if(istype(W) && !(flags & NODECONSTRUCT)) + if(istype(W) && !(flags_1 & NODECONSTRUCT_1)) var/can_be_unfasten = can_be_unfasten_wrench(user) if(!can_be_unfasten || can_be_unfasten == FAILED_UNFASTEN) return can_be_unfasten @@ -409,7 +409,7 @@ Class Procs: /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) if(!istype(W)) return - if((flags & NODECONSTRUCT) && !W.works_from_distance) + if((flags_1 & NODECONSTRUCT_1) && !W.works_from_distance) return var/shouldplaysound = 0 if(component_parts) diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 85c02f6d37..2fe7d7b384 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -66,7 +66,7 @@ return /obj/machinery/computer/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags&NODECONSTRUCT)) + if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, I.usesound, 50, 1) to_chat(user, " You start to disconnect the monitor...") if(do_after(user, 20*I.toolspeed, target = src)) @@ -85,7 +85,7 @@ playsound(src.loc, 'sound/items/welder.ogg', 100, 1) /obj/machinery/computer/obj_break(damage_flag) - if(circuit && !(flags & NODECONSTRUCT)) //no circuit, no breaking + if(circuit && !(flags_1 & NODECONSTRUCT_1)) //no circuit, no breaking if(!(stat & BROKEN)) playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1) stat |= BROKEN @@ -103,7 +103,7 @@ /obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user) on_deconstruction() - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(circuit) //no circuit, no computer frame var/obj/structure/frame/computer/A = new /obj/structure/frame/computer(src.loc) A.circuit = circuit diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index a53b270130..94b538a741 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -136,7 +136,7 @@ /obj/structure/frame/computer/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(state == 4) new /obj/item/weapon/shard(loc) new /obj/item/weapon/shard(loc) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index fa1f08aed3..e1c477f82e 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -3,30 +3,30 @@ desc = "It opens and closes." icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door1" - anchored = TRUE + anchored = TRUE opacity = 1 - density = TRUE + density = TRUE layer = OPEN_DOOR_LAYER power_channel = ENVIRON max_integrity = 350 armor = list(melee = 30, bullet = 30, laser = 20, energy = 20, bomb = 10, bio = 100, rad = 100, fire = 80, acid = 70) CanAtmosPass = ATMOS_PASS_DENSITY - flags_1 = PREVENT_CLICK_UNDER_1 + flags_1 = PREVENT_CLICK_UNDER_1 var/secondsElectrified = 0 var/shockedby = list() - var/visible = TRUE - var/operating = FALSE - var/glass = FALSE - var/welded = FALSE + var/visible = TRUE + var/operating = FALSE + var/glass = FALSE + var/welded = FALSE var/normalspeed = 1 - var/heat_proof = FALSE // For rglass-windowed airlocks and firedoors - var/emergency = FALSE // Emergency access override - var/sub_door = FALSE // true if it's meant to go under another door. + var/heat_proof = FALSE // For rglass-windowed airlocks and firedoors + var/emergency = FALSE // Emergency access override + var/sub_door = FALSE // true if it's meant to go under another door. var/closingLayer = CLOSED_DOOR_LAYER - var/autoclose = FALSE //does it automatically close after some time - var/safe = TRUE //whether the door detects things and mobs in its way and reopen or crushes them. - var/locked = FALSE //whether the door is bolted or not. + var/autoclose = FALSE //does it automatically close after some time + var/safe = TRUE //whether the door detects things and mobs in its way and reopen or crushes them. + var/locked = FALSE //whether the door is bolted or not. var/assemblytype //the type of door frame to drop during deconstruction var/auto_close //TO BE REMOVED, no longer used, it's just preventing a runtime with a map var edit. var/datum/effect_system/spark_spread/spark_system @@ -50,7 +50,7 @@ explosion_block = EXPLOSION_BLOCK_PROC /obj/machinery/door/Destroy() - density = FALSE + density = FALSE air_update_turf(1) update_freelook_sight() GLOB.airlocks -= src @@ -62,7 +62,7 @@ //process() //return -/obj/machinery/door/CollidedWith(atom/movable/AM) +/obj/machinery/door/CollidedWith(atom/movable/AM) if(operating || emagged) return if(ismob(AM)) @@ -98,7 +98,7 @@ ..() move_update_air(T) -/obj/machinery/door/CanPass(atom/movable/mover, turf/target) +/obj/machinery/door/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return !opacity return !density @@ -163,7 +163,7 @@ else if(istype(I, /obj/item/weapon/weldingtool)) try_to_weld(I, user) return 1 - else if(!(I.flags & NOBLUDGEON) && user.a_intent != INTENT_HARM) + else if(!(I.flags_1 & NOBLUDGEON_1) && user.a_intent != INTENT_HARM) try_to_activate_door(user) return 1 return ..() @@ -192,7 +192,7 @@ playsound(src.loc, 'sound/items/welder.ogg', 100, 1) /obj/machinery/door/emp_act(severity) - if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) + if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) INVOKE_ASYNC(src, .proc/open) if(prob(40/severity)) if(secondsElectrified == 0) @@ -232,16 +232,16 @@ return 1 if(operating) return - operating = TRUE + operating = TRUE do_animate("opening") set_opacity(0) sleep(5) - density = FALSE + density = FALSE sleep(5) layer = OPEN_DOOR_LAYER update_icon() set_opacity(0) - operating = FALSE + operating = FALSE air_update_turf(1) update_freelook_sight() if(autoclose) @@ -260,17 +260,17 @@ if(autoclose) addtimer(CALLBACK(src, .proc/autoclose), 60) return - operating = TRUE + operating = TRUE do_animate("closing") layer = closingLayer sleep(5) - density = TRUE + density = TRUE sleep(5) update_icon() if(visible && !glass) set_opacity(1) - operating = FALSE + operating = FALSE air_update_turf(1) update_freelook_sight() if(safe) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b1bb5cdf10..d13685ccf1 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -11,7 +11,7 @@ integrity_failure = 0 armor = list(melee = 20, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 70, acid = 100) visible = FALSE - flags = ON_BORDER + flags_1 = ON_BORDER_1 opacity = 0 CanAtmosPass = ATMOS_PASS_PROC var/obj/item/weapon/electronics/airlock/electronics = null @@ -221,7 +221,7 @@ return add_fingerprint(user) - if(!(flags&NODECONSTRUCT)) + if(!(flags_1&NODECONSTRUCT_1)) if(istype(I, /obj/item/weapon/screwdriver)) if(density || operating) to_chat(user, "You need to open the door to access the maintenance panel!") diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 0acdc5353c..363e4de80c 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -239,12 +239,12 @@ alarm() /obj/machinery/firealarm/obj_break(damage_flag) - if(!(stat & BROKEN) && !(flags & NODECONSTRUCT) && buildstage != 0) //can't break the electronics if there isn't any inside. + if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside. stat |= BROKEN update_icon() /obj/machinery/firealarm/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 1) if(!(stat & BROKEN)) var/obj/item/I = new /obj/item/weapon/electronics/firealarm(loc) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index ec0c6eb4d7..692c7dcb26 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/machines/limbgrower.dmi' icon_state = "limbgrower_idleoff" density = TRUE - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 9883236d64..d1a7bbd87a 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -758,14 +758,14 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 2) new /obj/item/weapon/shard(loc) new /obj/item/weapon/shard(loc) qdel(src) /obj/machinery/newscaster/obj_break() - if(!(stat & BROKEN) && !(flags & NODECONSTRUCT)) + if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) stat |= BROKEN playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1) update_icon() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 07251f6cf0..e3d0128006 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -6,9 +6,9 @@ icon = 'icons/obj/recycling.dmi' icon_state = "grinder-o0" layer = ABOVE_ALL_MOB_LAYER // Overhead - anchored = TRUE - density = TRUE - circuit = /obj/item/weapon/circuitboard/machine/recycler + anchored = TRUE + density = TRUE + circuit = /obj/item/weapon/circuitboard/machine/recycler var/safety_mode = FALSE // Temporarily stops machine if it detects a mob var/icon_name = "grinder-o" var/blood = 0 @@ -19,10 +19,10 @@ var/eat_victim_items = TRUE var/item_recycle_sound = 'sound/items/welder.ogg' -/obj/machinery/recycler/Initialize() +/obj/machinery/recycler/Initialize() materials = new /datum/material_container(src, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM)) update_icon() - return ..() + return ..() /obj/machinery/recycler/RefreshParts() var/amt_made = 0 @@ -64,14 +64,14 @@ return ..() /obj/machinery/recycler/emag_act(mob/user) - if(emagged) - return - emagged = TRUE - if(safety_mode) - safety_mode = FALSE - update_icon() - playsound(src, "sparks", 75, 1, -1) - to_chat(user, "You use the cryptographic sequencer on the [src].") + if(emagged) + return + emagged = TRUE + if(safety_mode) + safety_mode = FALSE + update_icon() + playsound(src, "sparks", 75, 1, -1) + to_chat(user, "You use the cryptographic sequencer on the [src].") /obj/machinery/recycler/update_icon() ..() @@ -80,7 +80,7 @@ is_powered = FALSE icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end -/obj/machinery/recycler/CollidedWith(atom/movable/AM) +/obj/machinery/recycler/CollidedWith(atom/movable/AM) if(stat & (BROKEN|NOPOWER)) return @@ -187,10 +187,10 @@ name = "dangerous old crusher" emagged = TRUE crush_damage = 120 - flags = NODECONSTRUCT + flags_1 = NODECONSTRUCT_1 -/obj/item/weapon/paper/guides/recycler +/obj/item/weapon/paper/guides/recycler name = "paper - 'garbage duty instructions'" info = "

New Assignment

You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.

There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" -#undef SAFETY_COOLDOWN +#undef SAFETY_COOLDOWN diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 31ba629438..02f5b2e15a 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -112,7 +112,7 @@ var/nextsmash = 0 var/smashcooldown = 3 //deciseconds - var/occupant_sight_flags = 0 //sight flags to give to the occupant (e.g. mech mining scanner gives meson-like vision) + var/occupant_sight_flags = 0 //sight flags_1 to give to the occupant (e.g. mech mining scanner gives meson-like vision) hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 80b291e571..09c1716ad0 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -130,7 +130,7 @@ new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0) var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc) - chainsaw.flags |= NODROP + chainsaw.flags_1 |= NODROP_1 victim.drop_all_held_items() victim.put_in_hands(chainsaw) chainsaw.attack_self(victim) diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index b1068b0038..237fdbc0ea 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -86,8 +86,8 @@ transform = matrix()*2 var/matrix/M = transform M.Turn(90) - animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) - animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL) + animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL) + animate(src, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL) /obj/effect/temp_visual/ratvar/ocular_warden name = "warden's gaze" diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index a649763435..125904604f 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -65,8 +65,8 @@ var/matrix/M = transform M.Turn(turnedness) transform = M - animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) - animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL) + animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL) + animate(src, transform = oldtransform, time = duration, flags_1 = ANIMATION_PARALLEL) /obj/effect/temp_visual/cult/rune_spawn/rune1 icon_state = "rune1words" diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index b0049fc3fd..8b2d95f373 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -377,7 +377,7 @@ M = size_matrix*0.1 else M = size_matrix*2 - animate(src, alpha = 20, transform = M, time = duration, flags = ANIMATION_PARALLEL) + animate(src, alpha = 20, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL) /obj/effect/temp_visual/bleed/explode icon_state = "bleed10" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 87d1d161c5..44526b72bc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -35,10 +35,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) pressure_resistance = 4 var/obj/item/master = null - var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm - var/cold_protection = 0 //flags which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm - var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags - var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags + var/heat_protection = 0 //flags_1 which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags_1. See setup.dm + var/cold_protection = 0 //flags_1 which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags_1. See setup.dm + var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags_1 + var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags_1 var/list/actions //list of /datum/action's that this item has. var/list/actions_types //list of paths of action datums to give to the item on New(). @@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/item_color = null //this needs deprecating, soonish - var/body_parts_covered = 0 //see setup.dm for appropriate bit flags + var/body_parts_covered = 0 //see setup.dm for appropriate bit flags_1 //var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) var/permeability_coefficient = 1 // for chemicals/diseases @@ -86,7 +86,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER //The coefficient of multiplication for the damage removing this without surgery causes (this*w_class) var/embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME //A time in ticks, multiplied by the w_class. - var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES + var/flags_cover = 0 //for flags_1 such as GLASSESCOVERSEYES var/heat = 0 var/sharpness = IS_BLUNT var/toolspeed = 1 @@ -127,7 +127,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) force_string_override = TRUE /obj/item/Destroy() - flags &= ~DROPDEL //prevent reqdels + flags_1 &= ~DROPDEL_1 //prevent reqdels if(ismob(loc)) var/mob/m = loc m.temporarilyRemoveItemFromInventory(src, TRUE) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index fb5fb06d82..6298b8ce03 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -27,12 +27,12 @@ var/obj/item/radio/integrated/radio = null - var/access = 0 //Bit flags for cartridge access + var/access = 0 //Bit flags_1 for cartridge access // var/access_flora = 0 var/remote_door_id = "" - var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT + var/bot_access_flags = 0 //Bit flags_1. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT var/spam_enabled = 0 //Enables "Send to All" Option var/obj/item/device/pda/host_pda = null diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 8d6c74a83c..960d861e26 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -151,7 +151,7 @@ /obj/item/borg/charger name = "power connector" icon_state = "charger_draw" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 var/mode = "draw" var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port)) var/static/list/charge_items = typecacheof(list(/obj/item/weapon/stock_parts/cell, /obj/item/weapon/gun/energy)) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 06c289846e..c162875abd 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -9,7 +9,7 @@ desc = "Wrap packages with this festive paper to make gifts." icon = 'icons/obj/items.dmi' icon_state = "wrap_paper" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 amount = 25 max_amount = 25 resistance_flags = FLAMMABLE @@ -30,7 +30,7 @@ desc = "You can use this to wrap items in." icon = 'icons/obj/items.dmi' icon_state = "deliveryPaper" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 amount = 25 max_amount = 25 resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5053188d66..4736e401aa 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -244,8 +244,8 @@ // Copied from /obj/item/weapon/melee/transforming/energy/sword/attackby /obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user, params) if(istype(W, /obj/item/toy/sword)) - if((W.flags & NODROP) || (flags & NODROP)) - to_chat(user, "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!") + if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1)) + to_chat(user, "\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!") return else to_chat(user, "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 66e3e0317f..0d5f542b74 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -14,7 +14,7 @@ AI MODULES lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' desc = "An AI Module for programming laws to an AI." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 5 w_class = WEIGHT_CLASS_SMALL throwforce = 0 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b40316ff78..72e17872c8 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -12,7 +12,7 @@ obj/item/weapon/construction opacity = 0 density = FALSE anchored = FALSE - flags = CONDUCT | NOBLUDGEON + flags_1 = CONDUCT_1 | NOBLUDGEON_1 force = 0 throwforce = 10 throw_speed = 3 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 75141bddd5..9cd697edb2 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(RPD_recipes, list( desc = "A device used to rapidly pipe things." icon = 'icons/obj/tools.dmi' icon_state = "rpd" - flags = CONDUCT + flags_1 = CONDUCT_1 force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 6bae1adcd9..6f5088f326 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -13,7 +13,7 @@ RSF opacity = 0 density = FALSE anchored = FALSE - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) var/matter = 0 var/mode = 1 diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index a635bcdefb..844c59075b 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -10,7 +10,7 @@ materials = list(MAT_METAL=50, MAT_GLASS=50) origin_tech = "engineering=2" - flags = CONDUCT | NOBLUDGEON + flags_1 = CONDUCT_1 | NOBLUDGEON_1 slot_flags = SLOT_BELT var/obj/item/device/toner/ink = null diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index e4a69dfab7..19c55e23ac 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -56,7 +56,7 @@ lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' origin_tech = "magnets=2;syndicate=2" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 var/prox_check = TRUE //If the emag requires you to be in range /obj/item/weapon/card/emag/bluespace diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 2d99238eb8..e7681b52c3 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -46,7 +46,7 @@ icon_state = "chronogun" item_state = "chronogun" w_class = WEIGHT_CLASS_NORMAL - flags = NODROP | DROPDEL + flags_1 = NODROP_1 | DROPDEL_1 ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam) can_charge = 0 fire_delay = 50 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f920dc10f9..97f17c19d1 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -102,7 +102,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cigoff" throw_speed = 0.5 item_state = "cigoff" - container_type = INJECTABLE + container_type = INJECTABLE_1 w_class = WEIGHT_CLASS_TINY body_parts_covered = null var/lit = FALSE @@ -470,7 +470,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "zippo" item_state = "zippo" w_class = WEIGHT_CLASS_TINY - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT var/lit = 0 var/fancy = TRUE @@ -649,7 +649,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[param_color]_vape" /obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/reagent_containers) && (O.container_type & OPENCONTAINER)) + if(istype(O, /obj/item/weapon/reagent_containers) && (O.container_type & OPENCONTAINER_1)) if(reagents.total_volume < chem_volume) if(O.reagents.total_volume > 0) O.reagents.trans_to(src,25) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 567ac3672a..35e3e09cda 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -16,7 +16,7 @@ icon = 'icons/obj/items.dmi' icon_state = "soap" w_class = WEIGHT_CLASS_TINY - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 throwforce = 0 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index a7051ed109..35875837bf 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -107,7 +107,7 @@ desc = "The latest and greatest power razor born from the science of shaving." icon = 'icons/obj/items.dmi' icon_state = "razor" - flags = CONDUCT + flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index da8d4fe97e..87572b0832 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -5,7 +5,7 @@ icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' - flags = CONDUCT + flags_1 = CONDUCT_1 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 @@ -30,7 +30,7 @@ icon_state = "miniFE0" item_state = "miniFE" hitsound = null //it is much lighter, after all. - flags = null //doesn't CONDUCT + flags_1 = null //doesn't CONDUCT_1 throwforce = 2 w_class = WEIGHT_CLASS_SMALL force = 3 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 1829538a01..0320fe39af 100755 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -6,7 +6,7 @@ item_state = "flamethrower_0" lefthand_file = 'icons/mob/inhands/weapons/flamethrower_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/flamethrower_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 force = 3 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index de1c3a6cbd..8313732d20 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -11,7 +11,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' throw_speed = 3 throw_range = 7 - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT active = 0 det_time = 50 diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 08118f6447..74de39a6d9 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -9,7 +9,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' throw_speed = 3 throw_range = 7 - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT resistance_flags = FLAMMABLE max_integrity = 40 diff --git a/code/game/objects/items/weapons/grenades/plastic.dm b/code/game/objects/items/weapons/grenades/plastic.dm index 26161fbda8..654914b8bf 100644 --- a/code/game/objects/items/weapons/grenades/plastic.dm +++ b/code/game/objects/items/weapons/grenades/plastic.dm @@ -3,7 +3,7 @@ desc = "Used to put holes in specific areas without too much extra hole." icon_state = "plastic-explosive0" item_state = "plastic-explosive" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 flags_2 = NO_EMP_WIRES_2 det_time = 10 display_timer = 0 @@ -161,7 +161,7 @@ item_state = "plasticx" lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi' - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 w_class = WEIGHT_CLASS_SMALL origin_tech = "syndicate=1" var/timer = 10 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 40fa7d2520..2f0d105eac 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -9,9 +9,9 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "handcuff" - lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' - flags = CONDUCT + lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL @@ -90,8 +90,8 @@ desc = "Looks like some cables tied together. Could be used to tie something up." icon_state = "cuff_red" item_state = "coil_red" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' materials = list(MAT_METAL=150, MAT_GLASS=75) origin_tech = "engineering=2" breakouttime = 300 //Deciseconds = 30s @@ -145,7 +145,7 @@ /obj/item/weapon/restraints/handcuffs/cable/white icon_state = "cuff_white" - item_state = "coil_white" + item_state = "coil_white" /obj/item/weapon/restraints/handcuffs/alien icon_state = "handcuffAlien" @@ -210,8 +210,8 @@ name = "zipties" desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use." icon_state = "cuff_white" - lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' materials = list() breakouttime = 450 //Deciseconds = 45s trashtype = /obj/item/weapon/restraints/handcuffs/cable/zipties/used @@ -219,7 +219,7 @@ /obj/item/weapon/restraints/handcuffs/cable/zipties/used desc = "A pair of broken zipties." icon_state = "cuff_white_used" - item_state = "cuff_white" + item_state = "cuff_white" /obj/item/weapon/restraints/handcuffs/cable/zipties/used/attack() return @@ -233,9 +233,9 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "handcuff" - lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' - flags = CONDUCT + lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' + flags_1 = CONDUCT_1 throwforce = 0 w_class = WEIGHT_CLASS_NORMAL origin_tech = "engineering=3;combat=3" @@ -304,7 +304,7 @@ armed = 1 icon_state = "e_snare" trap_damage = 0 - flags = DROPDEL + flags_1 = DROPDEL_1 /obj/item/weapon/restraints/legcuffs/beartrap/energy/New() ..() diff --git a/code/game/objects/items/weapons/his_grace.dm b/code/game/objects/items/weapons/his_grace.dm index 5b57fab800..43f6a1cdf3 100644 --- a/code/game/objects/items/weapons/his_grace.dm +++ b/code/game/objects/items/weapons/his_grace.dm @@ -85,7 +85,7 @@ do_attack_animation(master, null, src) master.emote("scream") master.remove_status_effect(STATUS_EFFECT_HISGRACE) - flags &= ~NODROP + flags_1 &= ~NODROP_1 master.Knockdown(60) master.adjustBruteLoss(master.maxHealth) playsound(master, 'sound/effects/splat.ogg', 100, 0) @@ -169,20 +169,20 @@ update_stats() /obj/item/weapon/his_grace/proc/update_stats() - flags &= ~NODROP + flags_1 &= ~NODROP_1 var/mob/living/master = get_atom_on_turf(src, /mob/living) switch(bloodthirst) if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) if(HIS_GRACE_CONSUME_OWNER > prev_bloodthirst) master.visible_message("[src] enters a frenzy!") if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER) - flags |= NODROP + flags_1 |= NODROP_1 if(HIS_GRACE_STARVING > prev_bloodthirst) master.visible_message("[src] is starving!", "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\ [force_bonus < 15 ? " And still, His power grows.":""]") force_bonus = max(force_bonus, 15) if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING) - flags |= NODROP + flags_1 |= NODROP_1 if(HIS_GRACE_FAMISHED > prev_bloodthirst) master.visible_message("[src] is very hungry!", "Spines sink into your hand. [src] must feed immediately.\ [force_bonus < 10 ? " His power grows.":""]") diff --git a/code/game/objects/items/weapons/holosign_creator.dm b/code/game/objects/items/weapons/holosign_creator.dm index 23b65e01bf..22f93003ab 100644 --- a/code/game/objects/items/weapons/holosign_creator.dm +++ b/code/game/objects/items/weapons/holosign_creator.dm @@ -12,7 +12,7 @@ throw_speed = 3 throw_range = 7 origin_tech = "magnets=1;programming=3" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 var/list/signs = list() var/max_signs = 10 var/creation_time = 0 //time to create a holosign in deciseconds. diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 6ef928a9db..e43ee91cc4 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -53,7 +53,7 @@ item_state = "disintegrate" name = "god hand" desc = "This hand of yours glows with an awesome power!" - flags = ABSTRACT | NODROP | DROPDEL + flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1 w_class = WEIGHT_CLASS_HUGE hitsound = 'sound/weapons/sear.ogg' damtype = BURN @@ -275,7 +275,7 @@ lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' w_class = WEIGHT_CLASS_HUGE - flags = NODROP | ABSTRACT + flags_1 = NODROP_1 | ABSTRACT_1 sharpness = IS_SHARP attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' @@ -322,7 +322,7 @@ item_state = "arm_blade" lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' - flags = ABSTRACT | NODROP + flags_1 = ABSTRACT_1 | NODROP_1 w_class = WEIGHT_CLASS_HUGE sharpness = IS_SHARP diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index e91211f1b2..bec58ebc6e 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -9,7 +9,7 @@ item_color = "b" var/allow_multiple = FALSE var/uses = -1 - flags = DROPDEL + flags_1 = DROPDEL_1 /obj/item/weapon/implant/proc/trigger(emote, mob/living/carbon/source) diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index d259e7b26e..4fc78d180e 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -3,7 +3,7 @@ desc = "Injects things." icon_state = "reagents" origin_tech = "materials=3;biotech=4" - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 /obj/item/weapon/implant/chem/get_data() var/dat = {"Implant Specifications:
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index a125aaf89c..0529e729a1 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -24,7 +24,7 @@ throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=80) - flags = CONDUCT + flags_1 = CONDUCT_1 attack_verb = list("attacked", "stabbed", "poked") hitsound = 'sound/weapons/bladeslice.ogg' armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) @@ -56,7 +56,7 @@ name = "kitchen knife" icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 10 w_class = WEIGHT_CLASS_SMALL throwforce = 10 @@ -95,7 +95,7 @@ name = "butcher's cleaver" icon_state = "butch" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown by-products." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 15 throwforce = 10 materials = list(MAT_METAL=18000) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 8bca4d02a1..900156aabe 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -72,7 +72,7 @@ throw_range = 5 w_class = WEIGHT_CLASS_NORMAL w_class_on = WEIGHT_CLASS_HUGE - flags = CONDUCT + flags_1 = CONDUCT_1 armour_penetration = 100 origin_tech = "combat=4;magnets=3" attack_verb_off = list("attacked", "chopped", "cleaved", "torn", "cut") diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 5d32856bc9..bcdddd4ef3 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -16,7 +16,7 @@ item_state = "chain" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 10 throwforce = 7 @@ -51,7 +51,7 @@ item_state = "sabre" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 unique_rename = 1 force = 15 throwforce = 10 diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 6753b177df..c4d52c9bd0 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -3,7 +3,7 @@ name = "data cable" icon = 'icons/obj/power.dmi' icon_state = "wire1" - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 var/obj/machinery/machine /obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M, mob/living/user) diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 77d7784852..4282bf1698 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -5,7 +5,7 @@ item_state = "powerfist" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 attack_verb = list("whacked", "fisted", "power-punched") force = 20 throwforce = 10 diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index a229b82660..d292b7d783 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -4,7 +4,7 @@ icon_state = "mjollnir0" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BACK force = 5 force_unwielded = 5 @@ -75,7 +75,7 @@ icon_state = "mjollnir0" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BACK force = 5 force_unwielded = 5 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 5c245bf4c0..113d8fd1cd 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -307,7 +307,7 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_BULKY - flags = CONDUCT + flags_1 = CONDUCT_1 materials = list(MAT_METAL=3000) preposition = "on" diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index d7ec67c78a..c3632e2ddb 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -2,9 +2,9 @@ name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" - lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' - flags = CONDUCT + lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' + flags_1 = CONDUCT_1 force = 8 hitsound = "swing_hit" throw_speed = 2 @@ -34,7 +34,7 @@ name = "briefcase" desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps." icon_state = "briefcase" - flags = CONDUCT + flags_1 = CONDUCT_1 force = 10 hitsound = "swing_hit" throw_speed = 2 diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 226cea104f..47037dfdbb 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -261,7 +261,7 @@ //This proc return 1 if the item can be picked up and 0 if it can't. //Set the stop_messages to stop it from printing messages /obj/item/weapon/storage/proc/can_be_inserted(obj/item/W, stop_messages = 0, mob/user) - if(!istype(W) || (W.flags & ABSTRACT)) + if(!istype(W) || (W.flags_1 & ABSTRACT_1)) return //Not an item if(loc == W) @@ -302,7 +302,7 @@ to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size!") return 0 //To prevent the stacking of same sized storage items. - if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. + if(W.flags_1 & NODROP_1) //SHOULD be handled in unEquip, but better safe than sorry. to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]!") return 0 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 8fa9a0bf00..7f8a8006c7 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -3,9 +3,9 @@ desc = "Danger. Very robust." icon_state = "red" item_state = "toolbox_red" - lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' - flags = CONDUCT + lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' + flags_1 = CONDUCT_1 force = 12 throwforce = 12 throw_speed = 2 diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 971afd3aad..ba9e28ca16 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -79,7 +79,7 @@ name = "plasma tank" desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." icon_state = "plasma" - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = null //they have no straps! force = 8 @@ -158,7 +158,7 @@ name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL force = 4 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 7a42cdc5f1..fbf2cfad50 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/tank.dmi' lefthand_file = 'icons/mob/inhands/equipment/tanks_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tanks_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BACK hitsound = 'sound/weapons/smash.ogg' pressure_resistance = ONE_ATMOSPHERE * 5 @@ -37,7 +37,7 @@ return if(H.wear_mask.mask_adjusted) H.wear_mask.adjustmask(H) - if(!(H.wear_mask.flags & MASKINTERNALS)) + if(!(H.wear_mask.flags_1 & MASKINTERNALS_1)) to_chat(H, "[H.wear_mask] can't use [src]!") return diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 64fa2ee68e..12b2df1b42 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -109,8 +109,8 @@ amount_per_transfer_from_this = 50 possible_transfer_amounts = list(25,50,100) volume = 500 - flags = NODROP | NOBLUDGEON - container_type = OPENCONTAINER + flags_1 = NODROP_1 | NOBLUDGEON_1 + container_type = OPENCONTAINER_1 slot_flags = 0 var/obj/item/weapon/watertank/tank @@ -221,7 +221,7 @@ precision = 1 cooling_power = 5 w_class = WEIGHT_CLASS_HUGE - flags = NODROP //Necessary to ensure that the nozzle and tank never separate + flags_1 = NODROP_1 //Necessary to ensure that the nozzle and tank never separate var/obj/item/weapon/watertank/tank var/nozzle_mode = 0 var/metal_synthesis_cooldown = 0 @@ -348,7 +348,7 @@ var/usage_ratio = 5 //5 unit added per 1 removed var/injection_amount = 1 amount_per_transfer_from_this = 5 - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 spillable = 0 possible_transfer_amounts = list(5,10,15) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index a53e16233f..11ab9744b6 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -20,11 +20,11 @@ var/frequency = 1451 var/broadcasting = null var/listening = 1 - flags = CONDUCT + flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_SMALL item_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=400) @@ -134,8 +134,8 @@ Frequency: icon = 'icons/obj/device.dmi' icon_state = "hand_tele" item_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -203,9 +203,9 @@ Frequency: return try_move_adjacent(created[1]) active_portal_pairs[created[1]] = created[2] - var/obj/effect/portal/c1 = created[1] - var/obj/effect/portal/c2 = created[2] - investigate_log("was used by [key_name(user)] at [COORD(user)] to create a portal pair with destinations [COORD(c1)] and [COORD(c2)].", INVESTIGATE_PORTAL) + var/obj/effect/portal/c1 = created[1] + var/obj/effect/portal/c2 = created[2] + investigate_log("was used by [key_name(user)] at [COORD(user)] to create a portal pair with destinations [COORD(c1)] and [COORD(c2)].", INVESTIGATE_PORTAL) add_fingerprint(user) /obj/item/weapon/hand_tele/proc/on_portal_destroy(obj/effect/portal/P) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 1121100d8c..f86ba0fea9 100755 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -21,7 +21,7 @@ icon_state = "wrench" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 5 throwforce = 7 @@ -135,7 +135,7 @@ item_state = "screwdriver" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 5 w_class = WEIGHT_CLASS_TINY @@ -272,7 +272,7 @@ icon_state = null lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 6 throw_speed = 3 @@ -369,7 +369,7 @@ item_state = "welder" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 3 throwforce = 5 @@ -707,7 +707,7 @@ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' usesound = 'sound/items/crowbar.ogg' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT force = 5 throwforce = 7 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 5cdf679cbe..4c7abb5e48 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -117,7 +117,7 @@ name = "offhand" icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | NODROP + flags_1 = ABSTRACT_1 | NODROP_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /obj/item/weapon/twohanded/offhand/unwield() @@ -485,7 +485,7 @@ icon_state = "chainsaw_off" lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 force = 13 var/force_on = 21 w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index bcb1969382..8031b3f745 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -7,7 +7,7 @@ item_state = "restock_unit" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - flags = CONDUCT + flags_1 = CONDUCT_1 force = 7 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 53bfe5d64c..14af3ea94c 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -1,5 +1,5 @@ /obj/item/weapon - var/trigger_guard = TRIGGER_GUARD_NONE + var/trigger_guard = TRIGGER_GUARD_NONE /obj/item/weapon/banhammer desc = "A banhammer" @@ -30,8 +30,8 @@ desc = "This thing is so unspeakably shitty you are having a hard time even holding it." icon_state = "sord" item_state = "sord" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' slot_flags = SLOT_BELT force = 2 throwforce = 1 @@ -49,10 +49,10 @@ desc = "What are you standing around staring at this for? Get to killing!" icon_state = "claymore" item_state = "claymore" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' hitsound = 'sound/weapons/bladeslice.ogg' - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT | SLOT_BACK force = 40 throwforce = 10 @@ -70,7 +70,7 @@ /obj/item/weapon/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." - flags = CONDUCT | NODROP | DROPDEL + flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1 slot_flags = null block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY luminosity = 3 @@ -78,8 +78,8 @@ var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE var/obj/item/weapon/disk/nuclear/nuke_disk //OUR STORED NUKE DISK -/obj/item/weapon/claymore/highlander/Initialize() - . = ..() +/obj/item/weapon/claymore/highlander/Initialize() + . = ..() START_PROCESSING(SSobj, src) /obj/item/weapon/claymore/highlander/Destroy() @@ -195,9 +195,9 @@ desc = "Woefully underpowered in D20" icon_state = "katana" item_state = "katana" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - flags = CONDUCT + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + flags_1 = CONDUCT_1 slot_flags = SLOT_BELT | SLOT_BACK force = 40 throwforce = 10 @@ -222,7 +222,7 @@ desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" item_state = "rods" - flags = CONDUCT + flags_1 = CONDUCT_1 force = 9 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL @@ -240,7 +240,7 @@ user.put_in_hands(S) to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") - else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP)) + else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1)) var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod remove_item_from_storage(user) @@ -260,8 +260,8 @@ desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" icon_state = "throwingstar" item_state = "eshield0" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' force = 2 throwforce = 20 //This is never used on mobs since this has a 100% embed chance. throw_speed = 4 @@ -277,10 +277,10 @@ /obj/item/weapon/switchblade name = "switchblade" icon_state = "switchblade" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' desc = "A sharp, concealable, spring-loaded knife." - flags = CONDUCT + flags_1 = CONDUCT_1 force = 3 w_class = WEIGHT_CLASS_SMALL throwforce = 5 @@ -343,8 +343,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "cane" item_state = "stick" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 5 throwforce = 5 w_class = WEIGHT_CLASS_SMALL @@ -356,8 +356,8 @@ desc = "Apparently a staff used by the wizard." icon = 'icons/obj/wizard.dmi' icon_state = "staff" - lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' force = 3 throwforce = 5 throw_speed = 2 @@ -380,8 +380,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "stick" item_state = "stick" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 3 throwforce = 5 throw_speed = 2 @@ -404,9 +404,9 @@ desc = "A chainsaw that has replaced your arm." icon_state = "chainsaw_on" item_state = "mounted_chainsaw" - lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' - flags = NODROP | ABSTRACT | DROPDEL + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 w_class = WEIGHT_CLASS_HUGE force = 21 throwforce = 0 @@ -481,8 +481,8 @@ icon = 'icons/obj/items.dmi' icon_state = "baseball_bat" item_state = "baseball_bat" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 10 throwforce = 12 attack_verb = list("beat", "smacked") @@ -516,7 +516,7 @@ if(homerun_ready) user.visible_message("It's a home run!") target.throw_at(throw_target, rand(8,10), 14, user) - target.ex_act(EXPLODE_HEAVY) + target.ex_act(EXPLODE_HEAVY) playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) homerun_ready = 0 return @@ -541,13 +541,13 @@ return 1 /obj/item/weapon/melee/flyswatter - name = "flyswatter" + name = "flyswatter" desc = "Useful for killing insects of all sizes." icon = 'icons/obj/weapons.dmi' icon_state = "flyswatter" item_state = "flyswatter" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' force = 1 throwforce = 1 attack_verb = list("swatted", "smacked") @@ -556,8 +556,8 @@ //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. var/list/strong_against -/obj/item/weapon/melee/flyswatter/Initialize() - . = ..() +/obj/item/weapon/melee/flyswatter/Initialize() + . = ..() strong_against = typecacheof(list( /mob/living/simple_animal/hostile/poison/bees/, /mob/living/simple_animal/butterfly, @@ -583,10 +583,10 @@ icon_state = "madeyoulook" force = 0 throwforce = 0 - flags = DROPDEL | ABSTRACT + flags_1 = DROPDEL_1 | ABSTRACT_1 attack_verb = list("bopped") - -/obj/item/weapon/proc/can_trigger_gun(mob/living/user) - if(!user.can_use_guns(src)) - return FALSE + +/obj/item/weapon/proc/can_trigger_gun(mob/living/user) + if(!user.can_use_guns(src)) + return FALSE return TRUE \ No newline at end of file diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 93d541d9cf..0f078f8452 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -31,7 +31,7 @@ return attack_hand(user) /obj/structure/bed/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT)) + if(istype(W, /obj/item/weapon/wrench) && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, W.usesound, 50, 1) deconstruct(TRUE) else diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index ecb0909bfa..26982382dc 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -41,7 +41,7 @@ qdel(src) /obj/structure/chair/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT)) + if(istype(W, /obj/item/weapon/wrench) && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, W.usesound, 50, 1) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit)) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index d90619c9e8..dc9fadcfa6 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -3,7 +3,7 @@ desc = "It's a basic storage unit." icon = 'icons/obj/closet.dmi' icon_state = "generic" - density = TRUE + density = TRUE var/icon_door = null var/icon_door_override = FALSE //override to have open overlay use icon different to its base's var/secure = FALSE //secure locker or not, also used if overriding a non-secure locker with a secure door overlay to add fancy lights @@ -38,7 +38,7 @@ /obj/structure/closet/Initialize(mapload) if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents addtimer(CALLBACK(src, .proc/take_contents), 0) - . = ..() + . = ..() update_icon() PopulateContents() @@ -81,8 +81,8 @@ else if(secure && !opened) to_chat(user, "Alt-click to [locked ? "unlock" : "lock"].") -/obj/structure/closet/CanPass(atom/movable/mover, turf/target) - if(wall_mounted) +/obj/structure/closet/CanPass(atom/movable/mover, turf/target) + if(wall_mounted) return 1 return !density @@ -130,7 +130,7 @@ playsound(loc, open_sound, 15, 1, -3) opened = 1 if(!dense_when_open) - density = FALSE + density = FALSE climb_time *= 0.5 //it's faster to climb onto an open thing dump_contents() update_icon() @@ -164,7 +164,7 @@ return if(!allow_dense && AM.density) return - if(AM.anchored || AM.has_buckled_mobs() || (AM.flags_1 & NODROP_1)) + if(AM.anchored || AM.has_buckled_mobs() || (AM.flags_1 & NODROP_1)) return else return @@ -182,7 +182,7 @@ playsound(loc, close_sound, 15, 1, -3) climb_time = initial(climb_time) opened = 0 - density = TRUE + density = TRUE update_icon() return 1 @@ -193,12 +193,12 @@ return open(user) /obj/structure/closet/deconstruct(disassembled = TRUE) - if(ispath(material_drop) && material_drop_amount && !(flags & NODECONSTRUCT)) + if(ispath(material_drop) && material_drop_amount && !(flags_1 & NODECONSTRUCT_1)) new material_drop(loc, material_drop_amount) qdel(src) /obj/structure/closet/obj_break(damage_flag) - if(!broken && !(flags & NODECONSTRUCT)) + if(!broken && !(flags_1 & NODECONSTRUCT_1)) bust_open() /obj/structure/closet/attackby(obj/item/weapon/W, mob/user, params) @@ -251,7 +251,7 @@ user.visible_message("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \ "You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \ "You hear a ratchet.") - else if(user.a_intent != INTENT_HARM && !(W.flags_1 & NOBLUDGEON_1)) + else if(user.a_intent != INTENT_HARM && !(W.flags_1 & NOBLUDGEON_1)) if(W.GetID() || !toggle(user)) togglelock(user) return 1 @@ -381,8 +381,8 @@ to_chat(user, "You fail to break out of [src]!") /obj/structure/closet/proc/bust_open() - welded = FALSE //applies to all lockers - locked = FALSE //applies to critter crates and secure lockers only + welded = FALSE //applies to all lockers + locked = FALSE //applies to critter crates and secure lockers only broken = 1 //applies to secure lockers only open() @@ -415,9 +415,9 @@ user.visible_message("Sparks fly from [src]!", "You scramble [src]'s lock, breaking it open!", "You hear a faint electrical spark.") - playsound(src, "sparks", 50, 1) + playsound(src, "sparks", 50, 1) broken = 1 - locked = FALSE + locked = FALSE update_icon() /obj/structure/closet/get_remote_view_fullscreens(mob/user) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 494b35953d..12f4196486 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "glassbox0" desc = "A display case for prized possessions." - density = TRUE - anchored = TRUE + density = TRUE + anchored = TRUE resistance_flags = ACID_PROOF armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 100) max_integrity = 200 @@ -50,7 +50,7 @@ playsound(src.loc, 'sound/items/welder.ogg', 100, 1) /obj/structure/displaycase/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) dump() if(!disassembled) new /obj/item/weapon/shard( src.loc ) @@ -58,8 +58,8 @@ qdel(src) /obj/structure/displaycase/obj_break(damage_flag) - if(!broken && !(flags & NODECONSTRUCT)) - density = FALSE + if(!broken && !(flags_1 & NODECONSTRUCT_1)) + density = FALSE broken = 1 new /obj/item/weapon/shard( src.loc ) playsound(src, "shatter", 70, 1) @@ -132,7 +132,7 @@ else to_chat(user, "[src] is already in good condition!") return - else if(!alert && istype(W, /obj/item/weapon/crowbar) && openable) //Only applies to the lab cage and player made display cases + else if(!alert && istype(W, /obj/item/weapon/crowbar) && openable) //Only applies to the lab cage and player made display cases if(broken) if(showpiece) to_chat(user, "Remove the displayed object first.") @@ -189,8 +189,8 @@ /obj/structure/displaycase_chassis - anchored = TRUE - density = FALSE + anchored = TRUE + density = FALSE name = "display case chassis" desc = "wooden base of display case" icon = 'icons/obj/stationobjs.dmi' @@ -239,13 +239,13 @@ /obj/structure/displaycase/captain alert = 1 start_showpiece_type = /obj/item/weapon/gun/energy/laser/captain - req_access = list(ACCESS_CENT_SPECOPS) + req_access = list(ACCESS_CENT_SPECOPS) /obj/structure/displaycase/labcage name = "lab cage" desc = "A glass lab container for storing interesting creatures." start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr - req_access = list(ACCESS_RD) + req_access = list(ACCESS_RD) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index a21be47d3f..4685d702b8 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -91,7 +91,7 @@ new /obj/item/weapon/shard(loc) /obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(fireaxe && loc) fireaxe.forceMove(loc) fireaxe = null diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index d141f71b7a..aa0bfe8b4c 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -14,7 +14,7 @@ var/log_amount = 10 /obj/structure/flora/tree/attackby(obj/item/weapon/W, mob/user, params) - if(!cut && log_amount && (!(NODECONSTRUCT in flags))) + if(!cut && log_amount && (!(NODECONSTRUCT_1 in flags_1))) if(W.sharpness && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, 0, 0) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 2ca456e060..9a0309ee22 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -5,7 +5,7 @@ icon_state = "cart" anchored = FALSE density = TRUE - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite var/obj/item/weapon/storage/bag/trash/mybag = null diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index cd3813a7d4..f52966951a 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -14,7 +14,7 @@ /turf/closed/wall, /obj/structure/falsewall) smooth = SMOOTH_MORE - // flags = CONDUCT_1 + // flags_1 = CONDUCT_1 /obj/structure/lattice/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 7448aa128f..76b3a4059e 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -85,7 +85,7 @@ calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams) /obj/machinery/manned_turret/proc/direction_track(mob/user, atom/targeted) - if(user.incapacitated()) + if(user.incapacitated()) return setDir(get_dir(src,targeted)) user.setDir(dir) @@ -125,7 +125,7 @@ /obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user) target = targeted_atom - if(target == user || user.incapacitated() || target == get_turf(src)) + if(target == user || user.incapacitated() || target == get_turf(src)) return if(world.time < cooldown) if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing @@ -143,8 +143,8 @@ addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire) /obj/machinery/manned_turret/proc/fire_helper(mob/user) - if(user.incapacitated()) - return + if(user.incapacitated()) + return update_positioning() //REFRESH MOUSE TRACKING!! var/turf/targets_from = get_turf(src) if(QDELETED(target)) @@ -179,7 +179,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL + flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1 resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF var/obj/machinery/manned_turret/turret diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index d2ea22006e..83fd315059 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -4,8 +4,8 @@ desc = "Mirror mirror on the wall, who's the most robust of them all?" icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" - density = FALSE - anchored = TRUE + density = FALSE + anchored = TRUE max_integrity = 200 integrity_failure = 100 @@ -47,14 +47,14 @@ ..() /obj/structure/mirror/obj_break(damage_flag) - if(!broken && !(flags & NODECONSTRUCT)) + if(!broken && !(flags_1 & NODECONSTRUCT_1)) icon_state = "mirror_broke" playsound(src, "shatter", 70, 1) desc = "Oh no, seven years of bad luck!" broken = 1 /obj/structure/mirror/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(!disassembled) new /obj/item/weapon/shard( src.loc ) qdel(src) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 8b3671dc23..002222e5f9 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -17,15 +17,15 @@ desc = "A square piece of metal standing on four metal legs. It can not move." icon = 'icons/obj/smooth_structures/table.dmi' icon_state = "table" - density = TRUE - anchored = TRUE + density = TRUE + anchored = TRUE layer = TABLE_LAYER climbable = TRUE pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.") var/frame = /obj/structure/table_frame var/framestack = /obj/item/stack/rods var/buildstack = /obj/item/stack/sheet/metal - var/busy = FALSE + var/busy = FALSE var/buildstackamount = 1 var/framestackamount = 2 var/deconstruction_ready = 1 @@ -69,7 +69,7 @@ else ..() -/obj/structure/table/CanPass(atom/movable/mover, turf/target) +/obj/structure/table/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 if(mover.throwing) @@ -94,7 +94,7 @@ /obj/structure/table/attackby(obj/item/I, mob/user, params) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(istype(I, /obj/item/weapon/screwdriver) && deconstruction_ready) to_chat(user, "You start disassembling [src]...") playsound(src.loc, I.usesound, 50, 1) @@ -123,7 +123,7 @@ return // If the tray IS empty, continue on (tray will be placed on the table like other items) - if(user.a_intent != INTENT_HARM && !(I.flags_1 & ABSTRACT_1)) + if(user.a_intent != INTENT_HARM && !(I.flags_1 & ABSTRACT_1)) if(user.drop_item()) I.Move(loc) var/list/click_params = params2list(params) @@ -139,7 +139,7 @@ /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(flags_1 & NODECONSTRUCT_1)) var/turf/T = get_turf(src) new buildstack(T, buildstackamount) if(!wrench_disassembly) @@ -176,7 +176,7 @@ /obj/structure/table/glass/Crossed(atom/movable/AM) . = ..() - if(flags_1 & NODECONSTRUCT_1) + if(flags_1 & NODECONSTRUCT_1) return if(!isliving(AM)) return @@ -209,7 +209,7 @@ qdel(src) /obj/structure/table/glass/deconstruct(disassembled = TRUE, wrench_disassembly = 0) - if(!(flags_1 & NODECONSTRUCT_1)) + if(!(flags_1 & NODECONSTRUCT_1)) if(disassembled) ..() return @@ -266,7 +266,7 @@ frame = /obj/structure/table_frame framestack = /obj/item/stack/rods buildstack = /obj/item/stack/tile/carpet - canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black) + canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black) /obj/structure/table/wood/fancy/New() icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor @@ -367,7 +367,7 @@ /obj/structure/table/optable/New() ..() - for(var/dir in GLOB.cardinals) + for(var/dir in GLOB.cardinals) computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) if(computer) computer.table = src @@ -400,12 +400,12 @@ desc = "Different from the Middle Ages version." icon = 'icons/obj/objects.dmi' icon_state = "rack" - density = TRUE - anchored = TRUE + density = TRUE + anchored = TRUE pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density. max_integrity = 20 -/obj/structure/rack/CanPass(atom/movable/mover, turf/target) +/obj/structure/rack/CanPass(atom/movable/mover, turf/target) if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!| return 1 if(istype(mover) && mover.checkpass(PASSTABLE)) @@ -429,7 +429,7 @@ /obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params) - if (istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT)) + if (istype(W, /obj/item/weapon/wrench) && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, W.usesound, 50, 1) deconstruct(TRUE) return @@ -466,8 +466,8 @@ */ /obj/structure/rack/deconstruct(disassembled = TRUE) - if(!(flags&NODECONSTRUCT)) - density = FALSE + if(!(flags_1&NODECONSTRUCT_1)) + density = FALSE var/obj/item/weapon/rack_parts/newparts = new(loc) transfer_fingerprints_to(newparts) qdel(src) @@ -482,7 +482,7 @@ desc = "Parts of a rack." icon = 'icons/obj/items.dmi' icon_state = "rack_parts" - flags = CONDUCT + flags_1 = CONDUCT_1 materials = list(MAT_METAL=2000) var/building = FALSE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e0f98e03d1..5d71929c75 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -462,7 +462,7 @@ if(istype(O, /obj/item/weapon/reagent_containers)) var/obj/item/weapon/reagent_containers/RG = O - if(RG.container_type & OPENCONTAINER) + if(RG.container_type & OPENCONTAINER_1) if(!RG.reagents.holder_full()) RG.reagents.add_reagent("[dispensedreagent]", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) to_chat(user, "You fill [RG] from [src].") diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1adff28d6c..10e5ec46a8 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -188,7 +188,7 @@ to_chat(user, "[src] is already in good condition!") return - if(!(flags&NODECONSTRUCT)) + if(!(flags_1&NODECONSTRUCT_1)) if(istype(I, /obj/item/weapon/screwdriver)) playsound(src, I.usesound, 75, 1) if(reinf) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 9ea3834074..6dd187b527 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -66,7 +66,7 @@ icon_state = "grass" floor_tile = /obj/item/stack/tile/grass broken_states = list("sand") - flags = NONE + flags_1 = NONE var/ore_type = /obj/item/weapon/ore/glass var/turfverb = "uproot" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 99167b247a..fb210176a1 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -163,7 +163,7 @@ ..() if(explosion_level && AM.ex_check(explosion_id)) AM.ex_act(explosion_level) - + // If an opaque movable atom moves around we need to potentially update visibility. if (AM.opacity) has_opaque_atom = TRUE // Make sure to do this before reconsider_lights(), incase we're on instant updates. Guaranteed to be on in this case. @@ -342,7 +342,7 @@ M.take_damage(damage*2, BRUTE, "melee", 1) /turf/proc/Bless() - flags |= NOJAUNT + flags_1 |= NOJAUNT_1 /turf/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) if(src_object.contents.len) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 828fbb2e91..3f5aba0970 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -147,15 +147,15 @@ GLOBAL_PROTECT(admin_ranks) load_admin_ranks() return - var/datum/DBQuery/query_load_admin_ranks = SSdbcore.NewQuery("SELECT rank, flags FROM [format_table_name("admin_ranks")]") + var/datum/DBQuery/query_load_admin_ranks = SSdbcore.NewQuery("SELECT rank, flags_1 FROM [format_table_name("admin_ranks")]") if(!query_load_admin_ranks.Execute()) return while(query_load_admin_ranks.NextRow()) var/rank_name = ckeyEx(query_load_admin_ranks.item[1]) - var/flags = query_load_admin_ranks.item[2] - if(istext(flags)) - flags = text2num(flags) - var/datum/admin_rank/R = new(rank_name, flags) + var/flags_1 = query_load_admin_ranks.item[2] + if(istext(flags_1)) + flags_1 = text2num(flags_1) + var/datum/admin_rank/R = new(rank_name, flags_1) if(!R) continue GLOB.admin_ranks += R diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b99f9228b9..5507d856f6 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) return list( /client/proc/invisimin, /*allows our mob to go invisible/visible*/ // /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage - /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ + /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags_1*/ /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 836f8f81bc..bdd799badf 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -31,11 +31,11 @@ GLOBAL_PROTECT(admin_datums) GLOB.admin_datums[ckey] = src /datum/admins/proc/associate(client/C) - if(IsAdminAdvancedProcCall()) - var/msg = " has tried to elevate permissions!" - message_admins("[key_name_admin(usr)][msg]") - log_admin_private("[key_name(usr)][msg]") - return + if(IsAdminAdvancedProcCall()) + var/msg = " has tried to elevate permissions!" + message_admins("[key_name_admin(usr)][msg]") + log_admin_private("[key_name(usr)][msg]") + return if(istype(C)) owner = C owner.holder = src @@ -66,7 +66,7 @@ GLOBAL_PROTECT(admin_datums) return FALSE //nice try trialmin /* -checks if usr is an admin with at least ONE of the flags in rights_required. (Note, they don't need all the flags) +checks if usr is an admin with at least ONE of the flags_1 in rights_required. (Note, they don't need all the flags_1) if rights_required == 0, then it simply checks if they are an admin. if it doesn't return 1 and show_msg=1 it will prints a message explaining why the check has failed generally it would be used like so: @@ -84,7 +84,7 @@ you will have to do something like if(client.rights & R_ADMIN) yourself. return 1 else if(show_msg) - to_chat(usr, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") + to_chat(usr, "Error: You do not have sufficient rights to do that. You require one of the following flags_1:[rights2text(rights_required," ")].") return 0 //probably a bit iffy - will hopefully figure out a better solution diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index 0857f28d11..50f81e01c3 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -77,7 +77,7 @@ if (!SSipintel.enabled) return - var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags=f") + var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags_1=f") if (http) var/status = text2num(http["STATUS"]) diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index aa685f79f7..aafe3b393e 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -86,7 +86,7 @@ admin_id = text2num(query_get_admin.item[1]) if(new_admin) - var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin")]` (`id`, `ckey`, `rank`, `level`, `flags`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, 0)") + var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin")]` (`id`, `ckey`, `rank`, `level`, `flags_1`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, 0)") if(!query_add_admin.warn_execute()) return var/datum/DBQuery/query_add_admin_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');") @@ -119,7 +119,7 @@ if(!adm_ckey || !istext(adm_ckey) || !isnum(new_permission)) return - var/datum/DBQuery/query_get_perms = SSdbcore.NewQuery("SELECT id, flags FROM [format_table_name("admin")] WHERE ckey = '[adm_ckey]'") + var/datum/DBQuery/query_get_perms = SSdbcore.NewQuery("SELECT id, flags_1 FROM [format_table_name("admin")] WHERE ckey = '[adm_ckey]'") if(!query_get_perms.warn_execute()) return @@ -130,7 +130,7 @@ if(!admin_id) return - var/datum/DBQuery/query_change_perms = SSdbcore.NewQuery("UPDATE `[format_table_name("admin")]` SET flags = [new_permission] WHERE id = [admin_id]") + var/datum/DBQuery/query_change_perms = SSdbcore.NewQuery("UPDATE `[format_table_name("admin")]` SET flags_1 = [new_permission] WHERE id = [admin_id]") if(!query_change_perms.warn_execute()) return var/datum/DBQuery/query_change_perms_log = SSdbcore.NewQuery("INSERT INTO `[format_table_name("admin_log")]` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edit permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index 286e3a890f..c2a6ab7cd5 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -3,8 +3,8 @@ /proc/_abs(A) return abs(A) -/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null) - animate(A, set_vars, time, loop, easing, flags) +/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags_1 = null) + animate(A, set_vars, time, loop, easing, flags_1) Borked. If anyone wants to fix this be my guest.*/ /proc/_acrccos(A) @@ -112,8 +112,8 @@ /proc/_range(Dist, Center = usr) return range(Dist, Center) -/proc/_regex(pattern, flags) - return regex(pattern, flags) +/proc/_regex(pattern, flags_1) + return regex(pattern, flags_1) /proc/_REGEX_QUOTE(text) return REGEX_QUOTE(text) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 6cd8efdd1d..0cc2c61528 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 throw_range = 4 - flags = CONDUCT + flags_1 = CONDUCT_1 var/status = FALSE //0 - not readied //1 - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 4371bd5986..47d0fd70f5 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -734,7 +734,7 @@ update_icon() /obj/machinery/airalarm/deconstruct(disassembled = TRUE) - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 2) var/obj/item/I = new /obj/item/weapon/electronics/airalarm(loc) if(!disassembled) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 113d029c0b..7786aa70d1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -257,7 +257,7 @@ return 1 -//There is no easy way for an object to be notified of changes to atmos can pass flags +//There is no easy way for an object to be notified of changes to atmos can pass flags_1 // So we check every machinery process (2 seconds) /obj/machinery/atmospherics/components/unary/vent_scrubber/process() if (widenet) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 8bcbc3a892..4770d8ef7b 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -35,7 +35,6 @@ /obj/item/weapon/twohanded/ctf/Initialize() . = ..() - SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND) if(!reset) reset = new reset_path(get_turf(src)) @@ -474,14 +473,14 @@ W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) - // The shielded hardsuit is already NODROP + // The shielded hardsuit is already NODROP_1 no_drops += H.get_item_by_slot(slot_gloves) no_drops += H.get_item_by_slot(slot_shoes) no_drops += H.get_item_by_slot(slot_w_uniform) no_drops += H.get_item_by_slot(slot_ears) for(var/i in no_drops) var/obj/item/I = i - I.flags |= NODROP + I.flags_1 |= NODROP_1 /datum/outfit/ctf/instagib r_hand = /obj/item/weapon/gun/energy/laser/instakill @@ -533,6 +532,7 @@ var/team = WHITE_TEAM time_between_triggers = 1 anchored = TRUE + flags_2 = SLOWS_WHILE_IN_HAND_2 alpha = 255 /obj/structure/trap/examine(mob/user) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index ec4eab308c..344ed80d44 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -170,30 +170,30 @@ var/obj/item/I = target var/mob/living/M = owner - var/flags = I.slot_flags - if(flags & SLOT_OCLOTHING) + var/flags_1 = I.slot_flags + if(flags_1 & SLOT_OCLOTHING) M.update_inv_wear_suit() - if(flags & SLOT_ICLOTHING) + if(flags_1 & SLOT_ICLOTHING) M.update_inv_w_uniform() - if(flags & SLOT_GLOVES) + if(flags_1 & SLOT_GLOVES) M.update_inv_gloves() - if(flags & SLOT_EYES) + if(flags_1 & SLOT_EYES) M.update_inv_glasses() - if(flags & SLOT_EARS) + if(flags_1 & SLOT_EARS) M.update_inv_ears() - if(flags & SLOT_MASK) + if(flags_1 & SLOT_MASK) M.update_inv_wear_mask() - if(flags & SLOT_HEAD) + if(flags_1 & SLOT_HEAD) M.update_inv_head() - if(flags & SLOT_FEET) + if(flags_1 & SLOT_FEET) M.update_inv_shoes() - if(flags & SLOT_ID) + if(flags_1 & SLOT_ID) M.update_inv_wear_id() - if(flags & SLOT_BELT) + if(flags_1 & SLOT_BELT) M.update_inv_belt() - if(flags & SLOT_BACK) + if(flags_1 & SLOT_BACK) M.update_inv_back() - if(flags & SLOT_NECK) + if(flags_1 & SLOT_NECK) M.update_inv_neck() /obj/item/clothing/under/chameleon @@ -384,7 +384,7 @@ item_color = "black" desc = "A pair of black shoes." permeability_coefficient = 0.05 - flags = NOSLIP + flags_1 = NOSLIP_1 origin_tech = "syndicate=2" resistance_flags = 0 pockets = /obj/item/weapon/storage/internal/pocket/shoes diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d949eff44c..7ef2cbbde3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -7,7 +7,7 @@ var/flash_protect = 0 //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets - var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down + var/visor_flags = 0 //flags_1 that are added/removed when an item is adjusted up/down var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv var/visor_flags_cover = 0 //same as above, but for flags_cover //what to toggle when toggled with weldingvisortoggle() @@ -494,7 +494,7 @@ BLIND // can't see anything w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = STOPSPRESSUREDMAGE | THICKMATERIAL + flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals) slowdown = 1 @@ -783,7 +783,7 @@ BLIND // can't see anything A.UpdateButtonIcon() return TRUE -/obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags +/obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags_1 up = !up flags_1 ^= visor_flags flags_inv ^= visor_flags_inv diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 6b4376ab99..fd2b4f1dc8 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -331,7 +331,7 @@ vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS darkness_view = 8 scan_reagents = 1 - flags = NODROP + flags_1 = NODROP_1 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE /obj/item/clothing/glasses/godeye/attackby(obj/item/weapon/W as obj, mob/user as mob, params) diff --git a/code/modules/clothing/head/vg_hats.dm b/code/modules/clothing/head/vg_hats.dm index 42f98e3090..a1cdbe6a30 100644 --- a/code/modules/clothing/head/vg_hats.dm +++ b/code/modules/clothing/head/vg_hats.dm @@ -10,7 +10,7 @@ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT heat_protection = HEAD max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT - flags = STOPSPRESSUREDMAGE + flags_1 = STOPSPRESSUREDMAGE_1 strip_delay = 80 dog_fashion = null diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7681b7ba38..7e4059ff63 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -348,7 +348,7 @@ w_class = WEIGHT_CLASS_BULKY body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals/emergency_oxygen) - flags = THICKMATERIAL + flags_1 = THICKMATERIAL_1 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 9cd93f900f..12787ac034 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -18,7 +18,7 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = THICKMATERIAL + flags_1 = THICKMATERIAL_1 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 1 allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/pen, /obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 4efce060b9..b638e7e153 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -21,7 +21,7 @@ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/extinguisher, /obj/item/weapon/crowbar) slowdown = 1 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags = STOPSPRESSUREDMAGE | THICKMATERIAL + flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1 heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS @@ -124,7 +124,7 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 - flags = THICKMATERIAL + flags_1 = THICKMATERIAL_1 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/device/geiger_counter) slowdown = 1.5 diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index d3c6b40251..cccf84ed67 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -96,7 +96,7 @@ else if(istype(I, /obj/item/weapon/reagent_containers)) var/obj/item/weapon/reagent_containers/RC = I - if(RC.container_type & OPENCONTAINER) + if(RC.container_type & OPENCONTAINER_1) for(var/datum/reagent/A in RC.reagents.reagent_list) .[A.type] += A.volume .[I.type] += 1 diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm index c1efef1ed4..edb1a6ce6b 100644 --- a/code/modules/fields/turf_objects.dm +++ b/code/modules/fields/turf_objects.dm @@ -6,7 +6,7 @@ icon_state = null alpha = 0 invisibility = INVISIBILITY_ABSTRACT - flags = ABSTRACT|ON_BORDER + flags_1 = ABSTRACT_1|ON_BORDER_1 mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/datum/proximity_monitor/advanced/parent = null diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 14ed6280c4..75d72c325c 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -362,7 +362,7 @@ /obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack_self(mob/user) if(!is_open_container()) to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 playsound(src, "can_open", 50, 1) spillable = TRUE return diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 2a7ce2e8ec..f71a133ed3 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -4,7 +4,7 @@ /obj/item/weapon/reagent_containers/food possible_transfer_amounts = list() volume = 50 //Sets the default container amount for all food items. - container_type = INJECTABLE + container_type = INJECTABLE_1 resistance_flags = FLAMMABLE var/foodtype = NONE var/last_check_time diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index e2f38141f3..3d3ed34dc9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -15,7 +15,7 @@ insert ascii eagle on american flag background here anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 5 - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 var/obj/item/frying = null //What's being fried RIGHT NOW? var/cook_time = 0 var/static/list/deepfry_blacklisted_items = typecacheof(list( diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index c657787f9d..e1fd0da9e6 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -15,7 +15,7 @@ var/portion = 10 var/selected_drink var/list/stored_food = list() - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 var/obj/item/weapon/reagent_containers/mixer /obj/machinery/food_cart/Initialize() diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index d4fa73c74a..791ad26516 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -14,7 +14,7 @@ anchored = FALSE use_power = NO_POWER_USE layer = BELOW_OBJ_LAYER - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 max_integrity = 300 var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA diff --git a/code/modules/holodeck/computer_funcs.dm b/code/modules/holodeck/computer_funcs.dm index cb378f0952..65741eafea 100644 --- a/code/modules/holodeck/computer_funcs.dm +++ b/code/modules/holodeck/computer_funcs.dm @@ -57,7 +57,7 @@ last_change = world.time active = (A != offline_program) - use_power = active ? ACTIVE_POWER_USE : IDLE_POWER_USE + use_power = active ? ACTIVE_POWER_USE : IDLE_POWER_USE for(var/obj/effect/holodeck_effect/HE in effects) HE.deactivate(src) @@ -71,9 +71,9 @@ // this is an exercise left to others I'm afraid. -Sayu spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged) for(var/obj/machinery/M in spawned) - M.flags |= NODECONSTRUCT + M.flags_1 |= NODECONSTRUCT_1 for(var/obj/structure/S in spawned) - S.flags |= NODECONSTRUCT + S.flags_1 |= NODECONSTRUCT_1 effects = list() spawn(30) @@ -86,9 +86,9 @@ spawned += x // holocarp are not forever added += x for(var/obj/machinery/M in added) - M.flags |= NODECONSTRUCT + M.flags_1 |= NODECONSTRUCT_1 for(var/obj/structure/S in added) - S.flags |= NODECONSTRUCT + S.flags_1 |= NODECONSTRUCT_1 /obj/machinery/computer/holodeck/proc/derez(var/obj/obj, var/silent = 1, var/forced = 0) // Emagging a machine creates an anomaly in the derez systems. @@ -108,4 +108,4 @@ if(!silent) visible_message("The [obj.name] fades away!") - qdel(obj) + qdel(obj) diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm index 35fc6e0aa7..53b26d7f28 100644 --- a/code/modules/language/codespeak.dm +++ b/code/modules/language/codespeak.dm @@ -3,7 +3,7 @@ desc = "Syndicate operatives can use a series of codewords to convey complex information, while sounding like random concepts and drinks to anyone listening in." key = "t" default_priority = 0 - flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD + flags_1 = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD icon_state = "codespeak" /datum/language/codespeak/scramble(input) diff --git a/code/modules/language/common.dm b/code/modules/language/common.dm index c00ab328ec..162fbf9226 100644 --- a/code/modules/language/common.dm +++ b/code/modules/language/common.dm @@ -5,7 +5,7 @@ speech_verb = "says" whisper_verb = "whispers" key = "0" - flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD + flags_1 = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD default_priority = 100 icon_state = "galcom" diff --git a/code/modules/language/draconic.dm b/code/modules/language/draconic.dm index aaa998c2c0..a85c1c9747 100644 --- a/code/modules/language/draconic.dm +++ b/code/modules/language/draconic.dm @@ -5,7 +5,7 @@ ask_verb = "hisses" exclaim_verb = "roars" key = "o" - flags = TONGUELESS_SPEECH + flags_1 = TONGUELESS_SPEECH space_chance = 40 syllables = list( "za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz", diff --git a/code/modules/language/drone.dm b/code/modules/language/drone.dm index 390e0027cf..32659e263b 100644 --- a/code/modules/language/drone.dm +++ b/code/modules/language/drone.dm @@ -1,12 +1,12 @@ /datum/language/drone name = "Drone" - desc = "A heavily encoded damage control coordination stream, with special flags for hats." + desc = "A heavily encoded damage control coordination stream, with special flags_1 for hats." speech_verb = "chitters" ask_verb = "chitters inquisitively" exclaim_verb = "chitters loudly" spans = list(SPAN_ROBOT) key = "d" - flags = NO_STUTTER + flags_1 = NO_STUTTER syllables = list(".", "|") // ...|..||.||||.|.||.|.|.|||.||| space_chance = 0 diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm index 8b51429bd3..67881f7510 100644 --- a/code/modules/language/language.dm +++ b/code/modules/language/language.dm @@ -11,10 +11,10 @@ var/ask_verb = "asks" // Used when sentence ends in a ? var/exclaim_verb = "exclaims" // Used when sentence ends in a ! var/whisper_verb = "whispers" // Optional. When not specified speech_verb + quietly/softly is used instead. - var/list/signlang_verb = list("signs", "gestures") // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags + var/list/signlang_verb = list("signs", "gestures") // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags_1 var/key // Character used to speak in language // If key is null, then the language isn't real or learnable. - var/flags // Various language flags. + var/flags_1 // Various language flags_1. var/list/syllables // Used when scrambling text for a non-speaker. var/sentence_chance = 5 // Likelihood of making a new sentence after each syllable. var/space_chance = 55 // Likelihood of getting a space in the random scramble string @@ -28,9 +28,9 @@ /datum/language/proc/display_icon(atom/movable/hearer) var/understands = hearer.has_language(src.type) - if(flags & LANGUAGE_HIDE_ICON_IF_UNDERSTOOD && understands) + if(flags_1 & LANGUAGE_HIDE_ICON_IF_UNDERSTOOD && understands) return FALSE - if(flags & LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD && !understands) + if(flags_1 & LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD && !understands) return FALSE return TRUE diff --git a/code/modules/language/machine.dm b/code/modules/language/machine.dm index 4d88bcb416..e5775040a2 100644 --- a/code/modules/language/machine.dm +++ b/code/modules/language/machine.dm @@ -6,7 +6,7 @@ exclaim_verb = "whistles loudly" spans = list(SPAN_ROBOT) key = "6" - flags = NO_STUTTER + flags_1 = NO_STUTTER syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz") space_chance = 10 default_priority = 90 diff --git a/code/modules/language/swarmer.dm b/code/modules/language/swarmer.dm index e3b7826706..ea58775a08 100644 --- a/code/modules/language/swarmer.dm +++ b/code/modules/language/swarmer.dm @@ -6,7 +6,7 @@ exclaim_verb = "tones loudly" spans = list(SPAN_ROBOT) key = "s" - flags = NO_STUTTER + flags_1 = NO_STUTTER space_chance = 100 sentence_chance = 0 default_priority = 60 diff --git a/code/modules/mapping/dmm_suite.dm b/code/modules/mapping/dmm_suite.dm index c4ceec33ee..d272a10673 100644 --- a/code/modules/mapping/dmm_suite.dm +++ b/code/modules/mapping/dmm_suite.dm @@ -27,7 +27,7 @@ dmm_suite{ write_map(), which accepts three arguments: - A turf representing one corner of a three dimensional grid (Required). - Another turf representing the other corner of the same grid (Required). - - Any, or a combination, of several bit flags (Optional, see documentation). + - Any, or a combination, of several bit flags_1 (Optional, see documentation). The order in which the turfs are supplied does not matter, the /dmm_writer will determine the grid containing both, in much the same way as DM's block() function. diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index f56a955900..4e6bde732f 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -73,7 +73,7 @@ plane = FULLSCREEN_PLANE layer = FLASH_LAYER icon = 'icons/effects/ore_visuals.dmi' - appearance_flags = 0 //to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are + appearance_flags = 0 //to avoid having TILE_BOUND in the flags_1, so that the 480x480 icon states let you see it no matter where you are duration = 35 pixel_x = -224 pixel_y = -224 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 06a688a0b2..3fe4284101 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -62,7 +62,7 @@ /obj/item/weapon/pickaxe/drill/cyborg name = "cyborg mining drill" desc = "An integrated electric mining drill." - flags = NODROP + flags_1 = NODROP_1 /obj/item/weapon/pickaxe/drill/diamonddrill name = "diamond-tipped mining drill" @@ -72,7 +72,7 @@ desc = "Yours is the drill that will pierce the heavens!" /obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version! - name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics. + name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics. icon_state = "diamonddrill" digspeed = 7 diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 981b97940c..cee0adaeb6 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -167,7 +167,7 @@ pixel_y = -32 /obj/item/device/gps/computer/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT)) + if(istype(W, /obj/item/weapon/wrench) && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, W.usesound, 50, 1) user.visible_message("[user] disassembles the gps.", \ "You start to disassemble the gps...", "You hear clanking and banging noises.") @@ -198,7 +198,7 @@ light_color = "#DDFFD3" max_n_of_items = 10 pixel_y = -4 - flags = NODECONSTRUCT + flags_1 = NODECONSTRUCT_1 var/empty = FALSE /obj/machinery/smartfridge/survival_pod/Initialize(mapload) @@ -237,13 +237,13 @@ CanAtmosPass = ATMOS_PASS_NO /obj/structure/fans/deconstruct() - if(!(flags & NODECONSTRUCT)) + if(!(flags_1 & NODECONSTRUCT_1)) if(buildstacktype) new buildstacktype(loc,buildstackamount) qdel(src) /obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench) && !(flags&NODECONSTRUCT)) + if(istype(W, /obj/item/weapon/wrench) && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, W.usesound, 50, 1) user.visible_message("[user] disassembles the fan.", \ "You start to disassemble the fan...", "You hear clanking and banging noises.") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index da769c23cb..bc6640286d 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -132,13 +132,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer/narsie_act() var/old_color = color color = "#960000" - animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL) + animate(src, color = old_color, time = 10, flags_1 = ANIMATION_PARALLEL) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10) /mob/dead/observer/ratvar_act() var/old_color = color color = "#FAE48C" - animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL) + animate(src, color = old_color, time = 10, flags_1 = ANIMATION_PARALLEL) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10) /mob/dead/observer/Destroy() diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index ec4ada38aa..89cb7a285d 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -167,7 +167,7 @@ if(iscarbon(src)) var/mob/living/carbon/C = src for(var/obj/item/weapon/bloodcrawl/BC in C) - BC.flags = null + BC.flags_1 = null qdel(BC) qdel(src.holder) src.holder = null diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 56e3f0082a..6f72ec401a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -220,7 +220,7 @@ if(href_list["internal"]) var/slot = text2num(href_list["internal"]) var/obj/item/ITEM = get_item_by_slot(slot) - if(ITEM && istype(ITEM, /obj/item/weapon/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS)) + if(ITEM && istype(ITEM, /obj/item/weapon/tank) && wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \ "[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].") if(do_mob(usr, src, POCKET_STRIP_DELAY)) @@ -228,7 +228,7 @@ internal = null update_internals_hud_icon(0) else if(ITEM && istype(ITEM, /obj/item/weapon/tank)) - if((wear_mask && (wear_mask.flags & MASKINTERNALS)) || getorganslot("breathing_tube")) + if((wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) || getorganslot("breathing_tube")) internal = ITEM update_internals_hud_icon(1) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d62b34f5c2..fd0bd68d65 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -145,42 +145,42 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) dat += "" for(var/i in 1 to held_items.len) var/obj/item/I = get_item_for_held_index(i) - dat += "" + dat += "" dat += "" - dat += "" - dat += "" + dat += "" if(slot_wear_mask in obscured) dat += "" else - dat += "" + dat += "" if(slot_neck in obscured) dat += "" else - dat += "" + dat += "" if(slot_glasses in obscured) dat += "" else - dat += "" + dat += "" if(slot_ears in obscured) dat += "" else - dat += "" + dat += "" dat += "" - dat += "" + dat += "" if(wear_suit) - dat += "" @@ -190,30 +190,30 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) if(slot_shoes in obscured) dat += "" else - dat += "" + dat += "" if(slot_gloves in obscured) dat += "" else - dat += "" + dat += "" if(slot_w_uniform in obscured) dat += "" else - dat += "" + dat += "" if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured)) dat += "" dat += "" dat += "" else - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" if(handcuffed) dat += "" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6f0f3a37b7..1fcf412fc8 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -32,7 +32,7 @@ //citadel code if(stat != DEAD) handle_arousal() - + if(..()) //not dead for(var/datum/mutation/human/HM in dna.mutations) HM.on_life(src) @@ -153,7 +153,7 @@ //END FIRE CODE -//This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list) +//This proc returns a number made up of the flags_1 for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list) /mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = 0 //Handle normal clothing diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index df5a76b552..ef819129dd 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -54,7 +54,7 @@ var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded? var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"] - // species flags. these can be found in flags.dm + // species flags_1. these can be found in flags_1.dm var/list/species_traits = list() var/attack_verb = "punch" // punch-specific attack verb diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 4b8454fcde..cf1042dce3 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -153,7 +153,7 @@ if(!locate(/obj/item/weapon) in held_items) best_force = 0 - if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP))) + if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1))) pickupTarget = null if(!resisting && pickupTarget) @@ -274,7 +274,7 @@ // check if target has a weapon var/obj/item/weapon/W for(var/obj/item/weapon/I in target.held_items) - if(!(I.flags & ABSTRACT)) + if(!(I.flags_1 & ABSTRACT_1)) W = I break diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index ed1f5f08b5..d6ee2ebbfc 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -34,4 +34,4 @@ if(T) . = T.could_speak_in_language(dt) else - . = initial(dt.flags) & TONGUELESS_SPEECH + . = initial(dt.flags_1) & TONGUELESS_SPEECH diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 532d0c6edb..f564f0f823 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -4,9 +4,9 @@ icon_state = "std_module" w_class = WEIGHT_CLASS_GIGANTIC item_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - flags_1 = CONDUCT_1 + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + flags_1 = CONDUCT_1 var/list/basic_modules = list() //a list of paths, converted to a list of instances on New() var/list/emag_modules = list() //ditto @@ -121,8 +121,8 @@ if(I.loc != src) I.forceMove(src) modules += I - I.flags |= NODROP - I.mouse_opacity = MOUSE_OPACITY_OPAQUE + I.flags_1 |= NODROP_1 + I.mouse_opacity = MOUSE_OPACITY_OPAQUE if(nonstandard) added_modules += I if(requires_rebuild) @@ -248,7 +248,7 @@ /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg, /obj/item/weapon/soap/nanotrasen, /obj/item/borg/cyborghug) - emag_modules = list(/obj/item/weapon/melee/transforming/energy/sword/cyborg) + emag_modules = list(/obj/item/weapon/melee/transforming/energy/sword/cyborg) ratvar_modules = list( /obj/item/clockwork/slab/cyborg, /obj/item/clockwork/ratvarian_spear/cyborg, @@ -471,7 +471,7 @@ /obj/item/stack/tile/plasteel/cyborg, /obj/item/weapon/soap/nanotrasen, /obj/item/weapon/storage/bag/trash/cyborg, - /obj/item/weapon/extinguisher/mini, + /obj/item/weapon/extinguisher/mini, /obj/item/weapon/mop/cyborg, /obj/item/device/lightreplacer/cyborg, /obj/item/weapon/holosign_creator, @@ -518,7 +518,7 @@ /obj/item/weapon/reagent_containers/food/condiment/enzyme, /obj/item/weapon/pen, /obj/item/toy/crayon/spraycan/borg, - /obj/item/weapon/extinguisher/mini, + /obj/item/weapon/extinguisher/mini, /obj/item/weapon/hand_labeler/borg, /obj/item/weapon/razor, /obj/item/device/instrument/violin, @@ -594,7 +594,7 @@ name = "Syndicate Assault" basic_modules = list( /obj/item/device/assembly/flash/cyborg, - /obj/item/weapon/melee/transforming/energy/sword/cyborg, + /obj/item/weapon/melee/transforming/energy/sword/cyborg, /obj/item/weapon/gun/energy/printer, /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg, /obj/item/weapon/card/emag, @@ -621,7 +621,7 @@ /obj/item/weapon/hemostat, /obj/item/weapon/cautery, /obj/item/weapon/scalpel, - /obj/item/weapon/melee/transforming/energy/sword/cyborg/saw, + /obj/item/weapon/melee/transforming/energy/sword/cyborg/saw, /obj/item/roller/robo, /obj/item/weapon/card/emag, /obj/item/weapon/crowbar/cyborg, diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm index 169a95f157..288645760b 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm @@ -80,7 +80,7 @@ /obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid name = "fleshy restraints" desc = "Used by mega arachnids to immobilize their prey." - flags = DROPDEL + flags_1 = DROPDEL_1 icon_state = "tentacle_end" icon = 'icons/obj/projectiles.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 6991cb4ad3..8ad8441f2a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -251,9 +251,9 @@ Difficulty: Medium animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT) sleep(5) - animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL) + animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags_1 = ANIMATION_PARALLEL) sleep(4) - animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL) + animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags_1 = ANIMATION_PARALLEL) /obj/item/device/gps/internal/miner icon_state = null diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index fa79630c28..c9f0c7a7cb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -193,7 +193,7 @@ Difficulty: Medium qdel(F) if(stat == DEAD) swooping &= ~SWOOP_DAMAGEABLE - animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately + animate(src, alpha = 255, transform = oldtransform, time = 0, flags_1 = ANIMATION_END_NOW) //reset immediately return animate(src, alpha = 100, transform = matrix()*0.7, time = 7) swooping |= SWOOP_INVULNERABLE diff --git a/code/modules/mob/say_readme.dm b/code/modules/mob/say_readme.dm index 00e0f66246..a4f85c1422 100644 --- a/code/modules/mob/say_readme.dm +++ b/code/modules/mob/say_readme.dm @@ -11,7 +11,7 @@ This rewrite was needed, but is far from perfect. Report any bugs you come acros Radio code, while very much related to saycode, is not something I wanted to touch, so the code related to that may be messy. If you came here to see how to use saycode, all you will ever really need to call is say(message). -To have things react when other things speak around them, add the HEAR_1 flag to their flags variable and +To have things react when other things speak around them, add the HEAR_1 flag to their flags_1 variable and override their Hear() proc. =======================PROCS & VARIABLES======================= @@ -43,7 +43,7 @@ global procs Attaches span classes around input. /atom/movable - flags + flags_1 The HEAR_1 flag determines whether something is a hearer or not. Hear() is only called on procs with this flag. diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index c0f0a05a3e..4ec09ee7c7 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -125,7 +125,7 @@ update_icon() /obj/machinery/modular_computer/attackby(var/obj/item/weapon/W as obj, mob/user) - if(cpu && !(flags & NODECONSTRUCT)) + if(cpu && !(flags_1 & NODECONSTRUCT_1)) return cpu.attackby(W, user) return ..() diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 39f0d7a933..927f3da873 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -5,7 +5,7 @@ throw_speed = 3 var/signed = FALSE var/datum/mind/target - flags = NOBLUDGEON + flags_1 = NOBLUDGEON_1 /obj/item/weapon/paper/contract/proc/update_text() return diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 0f0ccfa4a7..bdb36cdcb1 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -168,7 +168,7 @@ */ /obj/item/weapon/pen/sleepy origin_tech = "engineering=4;syndicate=2" - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 /obj/item/weapon/pen/sleepy/attack(mob/living/M, mob/user) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 092322234a..b81a073596 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -497,7 +497,7 @@ desc = "The perfect showcase for your favorite deathtrap memories." icon = 'icons/obj/decals.dmi' materials = list() - flags = 0 + flags_1 = 0 icon_state = "frame-empty" result_path = /obj/structure/sign/picture_frame var/obj/item/weapon/photo/displayed diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 1e4baee4be..f2b0bc124f 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -445,8 +445,8 @@ name = "turret controls" icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | NODROP - resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON + flags_1 = ABSTRACT_1 | NODROP_1 + resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1 var/delay = 0 /obj/item/weapon/turret_control/afterattack(atom/targeted_atom, mob/user) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f635d8e227..c33a4e85a2 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -524,7 +524,7 @@ R.receive_pulse(power * (1 + power_transmission_bonus)/10 * freon_transmit_modifier) /obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params) - if(!istype(W) || (W.flags & ABSTRACT) || !istype(user)) + if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user)) return if(istype(W, /obj/item/weapon/scalpel/supermatter)) playsound(src, W.usesound, 100, 1) diff --git a/code/modules/procedural_mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm index c4ced7674b..85f937b41b 100644 --- a/code/modules/procedural_mapping/mapGeneratorReadme.dm +++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm @@ -127,7 +127,7 @@ Variable Breakdown (For Mappers): clusterCheckFlags - A Bitfield that controls how the cluster checks work, All based on clusterMin and clusterMax guides allowAtomsOnSpace - A Boolean for if we allow atoms to spawn on space tiles - clusterCheckFlags flags: + clusterCheckFlags flags_1: CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible CLUSTER_CHECK_DIFFERENT_TURFS 2 //Don't let turfs of DIFFERENT types cluster CLUSTER_CHECK_DIFFERENT_ATOMS 4 //Don't let atoms of DIFFERENT types cluster diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm index ac9508138c..8a6d796da3 100644 --- a/code/modules/projectiles/guns/beam_rifle.dm +++ b/code/modules/projectiles/guns/beam_rifle.dm @@ -678,7 +678,7 @@ pixel_x = pixel_x_offset pixel_y = pixel_y_offset else - animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW) + animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags_1 = ANIMATION_END_NOW) old_pixel_x = pixel_x_offset old_pixel_y = pixel_y_offset if(can_hit_target(original, permutated)) @@ -715,7 +715,7 @@ light_range = 2 light_color = "#00ffff" mouse_opacity = MOUSE_OPACITY_TRANSPARENT - flags = ABSTRACT + flags_1 = ABSTRACT_1 appearance_flags = 0 /obj/effect/projectile_beam/proc/scale_to(nx,ny,override=TRUE) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index d53bd0da85..2f40a395ab 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -6,7 +6,7 @@ w_class = WEIGHT_CLASS_BULKY force = 10 modifystate = TRUE - flags = CONDUCT + flags_1 = CONDUCT_1 slot_flags = SLOT_BACK ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) cell_type = "/obj/item/weapon/stock_parts/cell/pulse" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 28d2cd7f45..47f88c4bd1 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -4,7 +4,7 @@ icon_state = "bullet" density = FALSE anchored = TRUE - flags = ABSTRACT + flags_1 = ABSTRACT_1 pass_flags = PASSTABLE mouse_opacity = MOUSE_OPACITY_TRANSPARENT hitsound = 'sound/weapons/pierce.ogg' @@ -261,7 +261,7 @@ pixel_x = pixel_x_offset pixel_y = pixel_y_offset else - animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW) + animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags_1 = ANIMATION_END_NOW) old_pixel_x = pixel_x_offset old_pixel_y = pixel_y_offset if(can_hit_target(original, permutated)) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 54d17497f3..6ef7d778b6 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -11,12 +11,12 @@ var/last_tick = 1 var/addiction_tick = 1 var/list/datum/reagent/addiction_list = new/list() - var/flags + var/flags_1 /datum/reagents/New(maximum=100) maximum_volume = maximum - if(!(flags & REAGENT_NOREACT)) + if(!(flags_1 & REAGENT_NOREACT)) START_PROCESSING(SSobj, src) //I dislike having these here but map-objects are initialised before world/New() is called. >_> @@ -290,7 +290,7 @@ /datum/reagents/process() var/list/cached_reagents = reagent_list - if(flags & REAGENT_NOREACT) + if(flags_1 & REAGENT_NOREACT) STOP_PROCESSING(SSobj, src) return @@ -302,11 +302,11 @@ if(react) // Order is important, process() can remove from processing if // the flag is present - flags &= ~(REAGENT_NOREACT) + flags_1 &= ~(REAGENT_NOREACT) START_PROCESSING(SSobj, src) else STOP_PROCESSING(SSobj, src) - flags |= REAGENT_NOREACT + flags_1 |= REAGENT_NOREACT /datum/reagents/proc/conditional_update_move(atom/A, Running = 0) var/list/cached_reagents = reagent_list @@ -326,7 +326,7 @@ var/list/cached_reagents = reagent_list var/list/cached_reactions = GLOB.chemical_reactions_list var/datum/cached_my_atom = my_atom - if(flags & REAGENT_NOREACT) + if(flags_1 & REAGENT_NOREACT) return //Yup, no reactions here. No siree. var/reaction_occurred = 0 diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 716943e7f4..4811a11785 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -178,7 +178,7 @@ if(default_unfasten_wrench(user, I)) return - if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER)) + if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER_1)) var/obj/item/weapon/reagent_containers/B = I . = 1 //no afterattack if(beaker) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index b43841c43b..83ee0c2d51 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -42,7 +42,7 @@ if(default_deconstruction_crowbar(I)) return - if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER)) + if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER_1)) . = 1 //no afterattack if(beaker) to_chat(user, "A beaker is already loaded into the machine!") diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index c0d5fef9cc..aa99988c7d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -79,7 +79,7 @@ if(default_unfasten_wrench(user, I)) return - if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER)) + if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER_1)) . = 1 // no afterattack if(panel_open) to_chat(user, "You can't use the [src.name] while its panel is opened!") diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 46597fb028..1634f616b0 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -177,7 +177,7 @@ . = TRUE /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER)) + if(istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER_1)) . = TRUE //no afterattack if(stat & (NOPOWER|BROKEN)) return diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 5bf7db5c6d..7f6f5bd436 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -116,7 +116,7 @@ if(default_unfasten_wrench(user, I)) return - if (istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER) ) + if (istype(I, /obj/item/weapon/reagent_containers) && (I.container_type & OPENCONTAINER_1) ) if (!beaker) if(!user.drop_item()) return 1 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 5845e9409e..527bc0a50b 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -6,7 +6,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(1, 2, 3, 4, 5) volume = 5 - container_type = TRANSPARENT + container_type = TRANSPARENT_1 /obj/item/weapon/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity) if(!proximity) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 27b0a75ad5..657efb32c6 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -169,7 +169,7 @@ volume = 100 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) - flags = OPENCONTAINER + flags_1 = OPENCONTAINER_1 /obj/item/weapon/reagent_containers/glass/beaker/noreact name = "cryostasis beaker" @@ -180,7 +180,7 @@ volume = 50 amount_per_transfer_from_this = 10 origin_tech = "materials=2;engineering=3;plasmatech=3" - flags = OPENCONTAINER + flags_1 = OPENCONTAINER_1 /obj/item/weapon/reagent_containers/glass/beaker/noreact/Initialize() . = ..() @@ -196,7 +196,7 @@ volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300) - flags = OPENCONTAINER + flags_1 = OPENCONTAINER_1 origin_tech = "bluespace=5;materials=4;plasmatech=4" /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index faff06d26f..726c6c538e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -3,14 +3,14 @@ desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." icon = 'icons/obj/syringe.dmi' item_state = "hypo" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' icon_state = "hypo" amount_per_transfer_from_this = 5 volume = 30 possible_transfer_amounts = list() resistance_flags = ACID_PROOF - container_type = OPENCONTAINER_1 + container_type = OPENCONTAINER_1 slot_flags = SLOT_BELT var/ignore_flags = 0 var/infinite = FALSE @@ -72,13 +72,13 @@ desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." icon_state = "medipen" item_state = "medipen" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' amount_per_transfer_from_this = 10 volume = 10 ignore_flags = 1 //so you can medipen through hardsuits - container_type = DRAWABLE - flags = null + container_type = DRAWABLE_1 + flags_1 = null list_reagents = list("epinephrine" = 10) /obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M, mob/user) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f11965496d..ed57bb8a75 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -16,7 +16,7 @@ var/busy = FALSE // needed for delayed drawing of blood var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun materials = list(MAT_METAL=10, MAT_GLASS=20) - container_type = TRANSPARENT + container_type = TRANSPARENT_1 /obj/item/weapon/reagent_containers/syringe/Initialize() . = ..() diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index c3e1bd2c98..0cd3010eb6 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). name = "circuit imprinter" desc = "Manufactures circuit boards for the construction of machines." icon_state = "circuit_imprinter" - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 circuit = /obj/item/weapon/circuitboard/machine/circuit_imprinter var/datum/material_container/materials diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 2691286771..bc800abb9a 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -11,7 +11,7 @@ Note: Must be placed west/left of and R&D console to function. name = "protolathe" desc = "Converts raw materials into useful objects." icon_state = "protolathe" - container_type = OPENCONTAINER + container_type = OPENCONTAINER_1 circuit = /obj/item/weapon/circuitboard/machine/protolathe var/datum/material_container/materials diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index f1543d1691..c650837750 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = null - flags = ABSTRACT | NODROP | DROPDEL + flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1 w_class = WEIGHT_CLASS_HUGE force = 0 throwforce = 0 diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 5d85cde569..9280d16b10 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -10,8 +10,8 @@ active_power_usage = 5000 var/efficiency -/obj/machinery/telepad/Initialize() - . = ..() +/obj/machinery/telepad/Initialize() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/telesci_pad(null) B.apply_default_parts(src) @@ -120,7 +120,7 @@ desc = "Use this to send crates and closets to cargo telepads." icon = 'icons/obj/telescience.dmi' icon_state = "rcs" - flags = CONDUCT + flags_1 = CONDUCT_1 force = 10 throwforce = 10 throw_speed = 2 diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index d3c30ac285..addcfc6dec 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -55,8 +55,8 @@ life has not abandoned your broken form. You can only feel a deep and immutable hunger that \ not even death can stop, you will rise again!") var/revive_time = rand(revive_time_min, revive_time_max) - var/flags = TIMER_STOPPABLE - timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags) + var/flags_1 = TIMER_STOPPABLE + timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags_1) /obj/item/organ/zombie_infection/proc/zombify() timer_id = null
[get_held_index_name(i)]:[(I && !(I.flags & ABSTRACT)) ? I : "Empty"]
[get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]
 
Back:[(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" + dat += "
Back:[(back && !(back.flags_1&ABSTRACT_1)) ? back : "Empty"]" if(has_breathable_mask && istype(back, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 
Head:[(head && !(head.flags&ABSTRACT)) ? head : "Empty"]
Head:[(head && !(head.flags_1&ABSTRACT_1)) ? head : "Empty"]
Mask:Obscured
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"]
Mask:[(wear_mask && !(wear_mask.flags_1&ABSTRACT_1)) ? wear_mask : "Empty"]
Neck:Obscured
Neck:[(wear_neck && !(wear_neck.flags&ABSTRACT)) ? wear_neck : "Empty"]
Neck:[(wear_neck && !(wear_neck.flags_1&ABSTRACT_1)) ? wear_neck : "Empty"]
Eyes:Obscured
Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? glasses : "Empty"]
Eyes:[(glasses && !(glasses.flags_1&ABSTRACT_1)) ? glasses : "Empty"]
Ears:Obscured
Ears:[(ears && !(ears.flags&ABSTRACT)) ? ears : "Empty"]
Ears:[(ears && !(ears.flags_1&ABSTRACT_1)) ? ears : "Empty"]
 
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"]
Exosuit:[(wear_suit && !(wear_suit.flags_1&ABSTRACT_1)) ? wear_suit : "Empty"]
 ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Empty"]" + dat += "
 ↳Suit Storage:[(s_store && !(s_store.flags_1&ABSTRACT_1)) ? s_store : "Empty"]" if(has_breathable_mask && istype(s_store, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
Shoes:Obscured
Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? shoes : "Empty"]
Shoes:[(shoes && !(shoes.flags_1&ABSTRACT_1)) ? shoes : "Empty"]
Gloves:Obscured
Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? gloves : "Empty"]
Gloves:[(gloves && !(gloves.flags_1&ABSTRACT_1)) ? gloves : "Empty"]
Uniform:Obscured
Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "Empty"]
Uniform:[(w_uniform && !(w_uniform.flags_1&ABSTRACT_1)) ? w_uniform : "Empty"]
 ↳Pockets:
 ↳ID:
 ↳Belt:
 ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? belt : "Empty"]" + dat += "
 ↳Belt:[(belt && !(belt.flags_1&ABSTRACT_1)) ? belt : "Empty"]" if(has_breathable_mask && istype(belt, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 ↳Pockets:[(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "Left (Empty)"]" - dat += " [(r_store && !(r_store.flags&ABSTRACT)) ? "Right (Full)" : "Right (Empty)"]
 ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "Empty"]
 ↳Pockets:[(l_store && !(l_store.flags_1&ABSTRACT_1)) ? "Left (Full)" : "Left (Empty)"]" + dat += " [(r_store && !(r_store.flags_1&ABSTRACT_1)) ? "Right (Full)" : "Right (Empty)"]
 ↳ID:[(wear_id && !(wear_id.flags_1&ABSTRACT_1)) ? wear_id : "Empty"]
Handcuffed: Remove