diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 846599534d..92d3f01982 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_1 (Please design any new flags_1 so that the default is off, to make adding flags_1 to subsystems easier) +//SubSystem flags (Please design any new flags so that the default is off, to make adding flags 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 26a1535e33..da945e52e6 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_1 for the automute flags_1 +//Therefore there needs to be a gap between the flags for the automute flags #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/flags.dm b/code/__DEFINES/flags.dm index b464ea130c..2b046c2b49 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -1,5 +1,5 @@ /* - These defines are specific to the atom/flags_1 bitmask + These defines are specific to the atom/flags bitmask */ #define ALL ~0 //For convenience. #define NONE 0 @@ -7,58 +7,58 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)) //FLAGS BITMASK -#define STOPSPRESSUREDMAGE_1 1 //This flag is used on the flags_1 variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere +#define STOPSPRESSUREDMAGE 1 //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere //To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. -#define NODROP_1 2 // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. -#define NOBLUDGEON_1 4 // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby() -#define MASKINTERNALS_1 8 // mask allows internals -#define HEAR_1 16 // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not. -#define CHECK_RICOCHET_1 32 // Projectiels will check ricochet on things impacted that have this. -#define CONDUCT_1 64 // conducts electricity (metal etc.) -#define ABSTRACT_1 128 // for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way -#define NODECONSTRUCT_1 128 // For machines and structures that should not break into parts, eg, holodeck stuff -#define OVERLAY_QUEUED_1 256 // atom queued to SSoverlay -#define ON_BORDER_1 512 // item has priority to check when entering or leaving +#define NODROP 2 // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. +#define NOBLUDGEON 4 // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby() +#define MASKINTERNALS 8 // mask allows internals +#define HEAR 16 // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not. +#define CHECK_RICOCHET 32 // Projectiels will check ricochet on things impacted that have this. +#define CONDUCT 64 // conducts electricity (metal etc.) +#define ABSTRACT 128 // for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way +#define NODECONSTRUCT 128 // For machines and structures that should not break into parts, eg, holodeck stuff +#define OVERLAY_QUEUED 256 //atom queued to SSoverlay +#define ON_BORDER 512 // item has priority to check when entering or leaving -#define NOSLIP_1 1024 //prevents from slipping on wet floors, in space etc -#define CLEAN_ON_MOVE_1 2048 +#define NOSLIP 1024 //prevents from slipping on wet floors, in space etc +#define CLEAN_ON_MOVE 2048 -// BLOCK_GAS_SMOKE_EFFECT_1 only used in masks at the moment. -#define BLOCK_GAS_SMOKE_EFFECT_1 4096 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! -#define THICKMATERIAL_1 8192 //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. -#define DROPDEL_1 16384 // When dropped, it calls qdel on itself -#define PREVENT_CLICK_UNDER_1 32768 //Prevent clicking things below it on the same turf eg. doors/ fulltile windows +// BLOCK_GAS_SMOKE_EFFECT only used in masks at the moment. +#define BLOCK_GAS_SMOKE_EFFECT 4096 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! +#define THICKMATERIAL 8192 //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. +#define DROPDEL 16384 // When dropped, it calls qdel on itself +#define PREVENT_CLICK_UNDER 32768 //Prevent clicking things below it on the same turf eg. doors/ fulltile windows -/* Secondary atom flags, for the flags_2 var, denoted with a _2 */ +/* Secondary atom flags, access using the SECONDARY_FLAG macros */ -#define SLOWS_WHILE_IN_HAND_2 1 -#define NO_EMP_WIRES_2 2 -#define HOLOGRAM_2 4 -#define FROZEN_2 8 -#define STATIONLOVING_2 16 -#define INFORM_ADMINS_ON_RELOCATE_2 32 -#define BANG_PROTECT_2 64 +#define SLOWS_WHILE_IN_HAND "slows_while_in_hand" +#define NO_EMP_WIRES "no_emp_wires" +#define HOLOGRAM "hologram" +#define FROZEN "frozen" +#define STATIONLOVING "stationloving" +#define INFORM_ADMINS_ON_RELOCATE "inform_admins_on_relocate" +#define BANG_PROTECT "bang_protect" // An item worn in the ear slot with HEALS_EARS will heal your ears each // Life() tick, even if normally your ears would be too damaged to heal. -#define HEALS_EARS_2 128 +#define HEALS_EARS "heals_ears" // A mob with OMNITONGUE has no restriction in the ability to speak // languages that they know. So even if they wouldn't normally be able to // through mob or tongue restrictions, this flag allows them to ignore // those restrictions. -#define OMNITONGUE_2 256 +#define OMNITONGUE "omnitongue" // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity -#define TESLA_IGNORE_2 512 +#define TESLA_IGNORE "tesla_ignore" //turf-only flags -#define NOJAUNT_1 1 -#define UNUSED_TRANSIT_TURF_1 2 -#define CAN_BE_DIRTY_1 4 // If a turf can be made dirty at roundstart. This is also used in areas. -#define NO_DEATHRATTLE_1 16 // Do not notify deadchat about any deaths that occur on this turf. -//#define CHECK_RICOCHET_1 32 //Same thing as atom flag. +#define NOJAUNT 1 +#define UNUSED_TRANSIT_TURF 2 +#define CAN_BE_DIRTY 4 //If a turf can be made dirty at roundstart. This is also used in areas. +#define NO_DEATHRATTLE 16 // Do not notify deadchat about any deaths that occur on this turf. +//#define CHECK_RICOCHET 32 //Same thing as atom flag. /* These defines are used specifically with the atom/pass_flags bitmask @@ -90,3 +90,5 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define ACID_PROOF 32 //acid stuck on it doesn't melt it. #define INDESTRUCTIBLE 64 //doesn't take damage #define FREEZE_PROOF 128 //can't be frozen + +// language secondary flags for atoms diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 37566258a4..2abd148e49 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -86,7 +86,7 @@ . = SLOT_POCKET -//Bit flags_1 for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses. +//Bit flags 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_1 for female outfits: How much the game can safely "take off" the uniform without it looking weird +//flags 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_1 for alternate styles: These are hard sprited so don't set this if you didn't put the effort in +//flags 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_1 for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts +//flags 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_1 for covering body parts +//flags for covering body parts #define GLASSESCOVERSEYES 1 -#define MASKCOVERSEYES 2 // get rid of some of the other retardation in these flags_1 +#define MASKCOVERSEYES 2 // get rid of some of the other retardation in these flags #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/reagents.dm b/code/__DEFINES/reagents.dm index 9e17719e76..b43fddadb5 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -2,10 +2,10 @@ #define LIQUID 2 #define GAS 3 -#define INJECTABLE_1 1024 //Makes reagents addable through droppers and syringes -#define DRAWABLE_1 2048 //If a syringe can draw from it -#define OPENCONTAINER_1 4096 //Is an open container for chemistry purposes -#define TRANSPARENT_1 8192 //Used for non-open containers which you still want to be able to see the reagents off. +#define INJECTABLE 1024 //Makes reagents addable through droppers and syringes +#define DRAWABLE 2048 //If a syringe can draw from it +#define OPENCONTAINER 4096 //Is an open container for chemistry purposes +#define TRANSPARENT 8192 //Used for non-open containers which you still want to be able to see the reagents off. #define TOUCH 1 //splashing #define INGEST 2 //ingestion diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index bee6508609..196e051b64 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_1 +//Docking error flags #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 218afcafb7..d756cbaf1b 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_1 only matter for glasses +#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses #define VISOR_DARKNESSVIEW 8 #define VISOR_INVISVIEW 16 diff --git a/code/__HELPERS/flags.dm b/code/__HELPERS/flags.dm new file mode 100644 index 0000000000..5a6c1f3ab4 --- /dev/null +++ b/code/__HELPERS/flags.dm @@ -0,0 +1,4 @@ +#define HAS_SECONDARY_FLAG(atom, sflag) (atom.secondary_flags ? atom.secondary_flags[sflag] : FALSE) +#define SET_SECONDARY_FLAG(atom, sflag) if(!atom.secondary_flags) { atom.secondary_flags = list(); } atom.secondary_flags[sflag] = TRUE; +#define CLEAR_SECONDARY_FLAG(atom, sflag) if(atom.secondary_flags) atom.secondary_flags[sflag] = null +#define TOGGLE_SECONDARY_FLAG(atom, sflag) if(HAS_SECONDARY_FLAG(atom, sflag)) { CLEAR_SECONDARY_FLAG(atom, sflag); } else {SET_SECONDARY_FLAG(atom, sflag) ; } diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index d1d330fb01..9b1507771a 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -164,7 +164,7 @@ . = list() while(processing_list.len) var/atom/A = processing_list[1] - if(A.flags_1 & HEAR_1) + if(A.flags & HEAR) . += A processing_list.Cut(1, 2) processing_list += A.contents diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 9b16644b4c..b245b1f146 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -978,19 +978,19 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) // Used to make the frozen item visuals for Freon. if(resistance_flags & FREEZE_PROOF) return - if(!(flags_2 & FROZEN_2)) + if(!HAS_SECONDARY_FLAG(src, FROZEN)) name = "frozen [name]" add_atom_colour(list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)), TEMPORARY_COLOUR_PRIORITY) alpha -= 25 - flags_2 |= FROZEN_2 + SET_SECONDARY_FLAG(src, FROZEN) //Assumes already frozed /obj/proc/make_unfrozen() - if(flags_2 & FROZEN_2) + if(HAS_SECONDARY_FLAG(src, FROZEN)) name = replacetext(name, "frozen ", "") remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0))) alpha += 25 - flags_2 &= ~FROZEN_2 + CLEAR_SECONDARY_FLAG(src, FROZEN) #undef FROZEN_RED_COLOR #undef FROZEN_GREEN_COLOR diff --git a/code/_compile_options.dm b/code/_compile_options.dm index c1f02856a7..a669f1b4f5 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_1. +//Additional code for the above flags. #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/adjacent.dm b/code/_onclick/adjacent.dm index 765e659c32..eaa6525203 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -85,7 +85,7 @@ /* This checks if you there is uninterrupted airspace between that turf and this one. - This is defined as any dense ON_BORDER_1 object, or any dense object without LETPASSTHROW. + This is defined as any dense ON_BORDER object, or any dense object without LETPASSTHROW. The border_only flag allows you to not objects (for source and destination squares) */ /turf/proc/ClickCross(target_dir, border_only, target_atom = null, atom/movable/mover = null) @@ -95,7 +95,7 @@ if(O == target_atom || (O.pass_flags & LETPASSTHROW)) //check if there's a dense object present on the turf continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above) - if( O.flags_1&ON_BORDER_1) // windows are on border, check them first + if( O.flags&ON_BORDER) // windows are on border, check them first if( O.dir & target_dir || O.dir & (O.dir-1) ) // full tile windows are just diagonals mechanically return 0 //O.dir&(O.dir-1) is false for any cardinal direction, but true for diagonal ones diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 037ae47d98..18671fd9ae 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -144,7 +144,7 @@ else RangedAttack(A,params) -//Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it +//Is the atom obscured by a PREVENT_CLICK_UNDER object above it /atom/proc/IsObscured() if(!isturf(loc)) //This only makes sense for things directly on turfs for now return FALSE @@ -152,13 +152,13 @@ if(!T) return FALSE for(var/atom/movable/AM in T) - if(AM.flags_1 & PREVENT_CLICK_UNDER_1 && AM.density && AM.layer > layer) + if(AM.flags & PREVENT_CLICK_UNDER && AM.density && AM.layer > layer) return TRUE return FALSE /turf/IsObscured() for(var/atom/movable/AM in src) - if(AM.flags_1 & PREVENT_CLICK_UNDER_1 && AM.density) + if(AM.flags & PREVENT_CLICK_UNDER && AM.density) return TRUE return FALSE diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index b01927e8f8..f364bac76f 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_1 = ANIMATION_END_NOW) + animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = 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_1 = ANIMATION_END_NOW) + animate(L, transform = matrix(), time = T, loop = -1, flags = ANIMATION_END_NOW) /datum/hud/proc/update_parallax() var/client/C = mymob.client diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 13717b576f..35d8948c2a 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -258,7 +258,7 @@ var/obj/item/clothing/mask/M = C.wear_mask if(M.mask_adjusted) // if mask on face but pushed down M.adjustmask(C) // adjust it back - if( !(M.flags_1 & MASKINTERNALS_1) ) + if( !(M.flags & MASKINTERNALS) ) to_chat(C, "You are not wearing an internals mask!") return diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index f1ac1af1af..43569dca0c 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -35,7 +35,7 @@ /obj/item/proc/attack(mob/living/M, mob/living/user) - if(flags_1 & NOBLUDGEON_1) + if(flags & NOBLUDGEON) return if(!force) playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) @@ -54,7 +54,7 @@ //the equivalent of the standard version of attack() but for object targets. /obj/item/proc/attack_obj(obj/O, mob/living/user) - if(flags_1 & NOBLUDGEON_1) + if(flags & NOBLUDGEON) return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(O) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index b0ab260d63..89803baef6 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -68,7 +68,7 @@ desc = "Magic" icon = 'icons/obj/magic.dmi'//Needs sprites icon_state = "2" - flags_1 = NOBLUDGEON_1 | ABSTRACT_1 | DROPDEL_1 + flags = NOBLUDGEON | ABSTRACT | DROPDEL //item_state = null w_class = WEIGHT_CLASS_GIGANTIC layer = ABOVE_HUD_LAYER diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index bcc5e573a7..161d893b25 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_1 = CONDUCT_1 + flags = CONDUCT 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_1 = CONDUCT_1 + flags = CONDUCT 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_1 = CONDUCT_1 + flags = CONDUCT 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_1 = CONDUCT_1 + flags = CONDUCT 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_1 = CONDUCT_1 + flags = CONDUCT force = 0 throwforce = 0 attack_verb = list("nuzzled", "nosed", "booped") @@ -177,7 +177,7 @@ /obj/item/weapon/soap/tongue/New() ..() - flags_1 |= NOBLUDGEON_1 //No more attack messages + flags |= NOBLUDGEON //No more attack messages /obj/item/trash/rkibble name = "robo kibble" @@ -344,7 +344,7 @@ /obj/item/device/dogborg/sleeper/New() ..() - flags_1 |= NOBLUDGEON_1 //No more attack messages + flags |= NOBLUDGEON //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_1 |= NOBLUDGEON_1 + flags |= NOBLUDGEON /mob/living/silicon/robot var/leaping = 0 diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 3625e3e0df..5ca7b15f72 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_1 |= SS_NO_FIRE + BadBoy.flags |= 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_1 & SS_NO_INIT) + if (SS.flags & 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_1 & SS_NO_FIRE) + if (SS.flags & SS_NO_FIRE) continue SS.queued_time = 0 SS.queue_next = null SS.queue_prev = null SS.state = SS_IDLE - if (SS.flags_1 & SS_TICKER) + if (SS.flags & 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_1 + SS_flags = SS.flags 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_1 + queue_node_flags = queue_node.flags 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 0c1f8411fc..eee6945c41 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_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) + 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) //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_1 |= SS_NO_FIRE + flags |= 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_1 |= SS_NO_FIRE + flags |= 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_1 + var/SS_flags = flags 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_1 + queue_node_flags = queue_node.flags if (queue_node_flags & SS_TICKER) if (!(SS_flags & SS_TICKER)) @@ -170,7 +170,7 @@ - if(can_fire && !(SS_NO_FIRE in flags_1)) + if(can_fire && !(SS_NO_FIRE in flags)) 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 e1528f458d..a83afb3923 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_1 = SS_NO_INIT|SS_BACKGROUND + flags = 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 48a8d74616..a9a177597a 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_1 = SS_BACKGROUND + flags = 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 d4a2407309..fd27c9424f 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_1 = SS_NO_FIRE + flags = 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 b7ac19ad1f..e819060afb 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_1 = SS_NO_FIRE + flags = 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 386345a728..32086f52ed 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(augury) name = "Augury" - flags_1 = SS_NO_INIT + flags = 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 613b091708..3344afcaaa 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_1 = SS_NO_TICK_CHECK | SS_NO_INIT + flags = 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 930902e1e6..1380d119e2 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(communications) name = "Communications" - flags_1 = SS_NO_INIT | SS_NO_FIRE + flags = 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 35f3d39cd4..864274b8fb 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(dbcore) name = "Database" - flags_1 = SS_NO_INIT|SS_NO_FIRE + flags = 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_1 + var/flags 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_1 = flag_handler + flags = 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 75ff3af534..c75063c256 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(disease) name = "Disease" - flags_1 = SS_NO_FIRE | SS_NO_INIT + flags = 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 fcacba2519..fe6657644f 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_1 = SS_TICKER|SS_NO_INIT + flags = 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 2caa2fd89c..73358000f1 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_1 = SS_NO_INIT|SS_BACKGROUND + flags = 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 b2e71c77b6..ebc1ad9474 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_1 = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT + flags = 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 11657c76dc..84df089973 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_1 = SS_TICKER + flags = SS_TICKER var/list/smooth_queue = list() diff --git a/code/controllers/subsystem/inbounds.dm b/code/controllers/subsystem/inbounds.dm index ab736ac2d1..16e0f53028 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_1 = SS_NO_INIT + flags = 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 afde42c7d8..fca394924d 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_1 = SS_NO_FIRE + flags = 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 5f50b3dfcf..f28373ef22 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_1 = SS_NO_FIRE + flags = 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 6d87b0ad9e..e80a7096d8 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_1 = SS_NO_FIRE + flags = 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 3de7b92cad..bcb94c835b 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_1 = SS_TICKER + flags = 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 d6c6e8662d..eab61d4ef9 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_1 = SS_KEEP_TIMING + flags = 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 df13c57078..2c36e10d31 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_1 = SS_NO_FIRE + flags = 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_1 |= SS_NO_INIT + flags |= 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 ef15d49ad7..10c6f8e5c4 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_1 = SS_NO_FIRE + flags = 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 8999f420b5..cbe9d5c245 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_1 = SS_KEEP_TIMING|SS_NO_INIT + flags = 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 4491cb14ce..e88da7d900 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(npcpool) name = "NPC Pool" - flags_1 = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND + flags = 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 421a312e4f..6184bb005b 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_1 = SS_NO_INIT|SS_TICKER + flags = 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 acdd2ff6ac..2a1a04e21d 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(pai) name = "pAI" - flags_1 = SS_NO_INIT|SS_NO_FIRE + flags = 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 678b96adaf..39d07ee676 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_1 = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT + flags = 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 9261596798..a0dc7c526d 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_1 = SS_NO_FIRE + flags = 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 01576084bc..a6b444c4e7 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_1 = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY + flags = 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 eb839619ad..6a878fa142 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_1 = SS_KEEP_TIMING | SS_NO_INIT + flags = 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 253ee294a9..1d85811878 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_1 = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING + flags = 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 3f602dc32c..29fe277232 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_1 = SS_NO_INIT + flags = 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 ad84295b52..589bf667af 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_1 = SS_TICKER + flags = SS_TICKER wait = 1 priority = 500 init_order = INIT_ORDER_OVERLAY @@ -55,7 +55,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays) overlays = po else overlays.Cut() - flags_1 &= ~OVERLAY_QUEUED_1 + flags &= ~OVERLAY_QUEUED /proc/iconstate2appearance(icon, iconstate) var/static/image/stringbro = new() @@ -102,8 +102,8 @@ PROCESSING_SUBSYSTEM_DEF(overlays) new_overlays[i] = appearance_bro.appearance return new_overlays -#define NOT_QUEUED_ALREADY (!(flags_1 & OVERLAY_QUEUED_1)) -#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.processing += src; +#define NOT_QUEUED_ALREADY (!(flags & OVERLAY_QUEUED)) +#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.processing += src; /atom/proc/cut_overlays(priority = FALSE) var/list/cached_overlays = our_overlays var/list/cached_priority = priority_overlays diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 4c77cfb2e0..0586975866 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_1 = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT + flags = 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 57b34dae33..de605cb554 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(radio) name = "Radio" - flags_1 = SS_NO_FIRE|SS_NO_INIT + flags = 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 477f7411f2..bba7dd082e 100644 --- a/code/controllers/subsystem/religion.dm +++ b/code/controllers/subsystem/religion.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(religion) name = "Religion" - flags_1 = SS_NO_FIRE|SS_NO_INIT + flags = 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 b1a115954a..855c00b728 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_1 = SS_POST_FIRE_TIMING + flags = 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 412af41381..d88d788d37 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_1 = SS_KEEP_TIMING|SS_NO_TICK_CHECK + flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME var/list/mobile = list() @@ -84,7 +84,7 @@ SUBSYSTEM_DEF(shuttle) var/turf/T = i T.ChangeTurf(/turf/open/space) transit_turfs += T - T.flags_1 |= UNUSED_TRANSIT_TURF_1 + T.flags |= UNUSED_TRANSIT_TURF #ifdef HIGHLIGHT_DYNAMIC_TRANSIT /datum/controller/subsystem/shuttle/proc/color_space() @@ -412,13 +412,13 @@ SUBSYSTEM_DEF(shuttle) for(var/i in transit_turfs) CHECK_TICK var/turf/topleft = i - if(!(topleft.flags_1 & UNUSED_TRANSIT_TURF_1)) + if(!(topleft.flags & UNUSED_TRANSIT_TURF)) continue var/turf/bottomright = locate(topleft.x + transit_width, topleft.y + transit_height, topleft.z) if(!bottomright) continue - if(!(bottomright.flags_1 & UNUSED_TRANSIT_TURF_1)) + if(!(bottomright.flags & UNUSED_TRANSIT_TURF)) continue proposed_zone = block(topleft, bottomright) @@ -428,7 +428,7 @@ SUBSYSTEM_DEF(shuttle) var/turf/T = j if(!T) continue base - if(!(T.flags_1 & UNUSED_TRANSIT_TURF_1)) + if(!(T.flags & UNUSED_TRANSIT_TURF)) continue base //to_chat(world, "[COORD(topleft)] and [COORD(bottomright)]") break base @@ -500,7 +500,7 @@ SUBSYSTEM_DEF(shuttle) for(var/i in new_transit_dock.assigned_turfs) var/turf/T = i T.ChangeTurf(transit_path) - T.flags_1 &= ~(UNUSED_TRANSIT_TURF_1) + T.flags &= ~(UNUSED_TRANSIT_TURF) M.assigned_transit = new_transit_dock return TRUE diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index 1944c3f279..8fe7cbe048 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_1 = SS_NO_INIT|SS_KEEP_TIMING + flags = 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 f9a291129a..d94efd0a4a 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_1 = SS_NO_FIRE + flags = SS_NO_FIRE var/list/exposed_wires = list() diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm index 4136f731df..371cf22b3b 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_1 = SS_NO_FIRE + flags = 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 ba71d86e1a..7a3528cc3d 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_1 = SS_NO_TICK_CHECK|SS_NO_INIT + flags = 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 11dbb6d081..52fd286eed 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_1 = SS_NO_INIT + flags = 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 f1d4b88f77..d91d91de72 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_1 = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER + flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun @@ -135,6 +135,6 @@ SUBSYSTEM_DEF(throwing) var/atom/movable/AM = thing if (AM == thrownthing) continue - if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1)) + if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER)) finalize(hit=TRUE, target=AM) return TRUE diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e9a356ef86..d196c9cb10 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_1 = SS_KEEP_TIMING + flags = 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 0e5a473611..cb190206b7 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_1 = SS_NO_INIT|SS_NO_TICK_CHECK + flags = 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 8a0dfe1f0d..daf0eb324d 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_1 = SS_TICKER|SS_NO_INIT + flags = 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_1 + var/list/flags 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_1, hash) +/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash) id = TIMER_ID_NULL src.callBack = callBack src.timeToRun = timeToRun - src.flags_1 = flags_1 + src.flags = flags src.hash = hash - - if (flags_1 & TIMER_UNIQUE) + + if (flags & TIMER_UNIQUE) SStimer.hashes[hash] = src - if (flags_1 & TIMER_STOPPABLE) + if (flags & 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_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(", ") : ""])" + 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(", ") : ""])" if (callBack.object != GLOBAL_PROC) LAZYADD(callBack.object.active_timers, src) - if (flags_1 & TIMER_CLIENT_TIME) + if (flags & 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_1 & TIMER_UNIQUE) + if (flags & TIMER_UNIQUE) SStimer.hashes -= hash @@ -301,10 +301,10 @@ SUBSYSTEM_DEF(timer) callBack = null - if (flags_1 & TIMER_STOPPABLE) + if (flags & TIMER_STOPPABLE) SStimer.timer_id_dict -= "timerid" + num2text(id, 8) - if (flags_1 & TIMER_CLIENT_TIME) + if (flags & 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_1) +/proc/addtimer(datum/callback/callback, wait, flags) if (!callback) return @@ -354,12 +354,12 @@ SUBSYSTEM_DEF(timer) var/hash - if (flags_1 & TIMER_UNIQUE) + if (flags & TIMER_UNIQUE) var/list/hashlist - if(flags_1 & TIMER_NO_HASH_WAIT) - hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags_1 & TIMER_CLIENT_TIME) + if(flags & TIMER_NO_HASH_WAIT) + hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME) else - hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags_1 & TIMER_CLIENT_TIME) + hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME) hashlist += callback.arguments hash = hashlist.Join("|||||||") @@ -370,20 +370,20 @@ SUBSYSTEM_DEF(timer) SStimer.hashes -= hash else - if (flags_1 & TIMER_OVERRIDE) + if (flags & TIMER_OVERRIDE) qdel(hash_timer) else - if (hash_timer.flags_1 & TIMER_STOPPABLE) + if (hash_timer.flags & TIMER_STOPPABLE) . = hash_timer.id return var/timeToRun = world.time + wait - if (flags_1 & TIMER_CLIENT_TIME) + if (flags & TIMER_CLIENT_TIME) timeToRun = REALTIMEOFDAY + wait - var/datum/timedevent/timer = new(callback, timeToRun, flags_1, hash) - return timer.id + var/datum/timedevent/timer = new(callback, timeToRun, flags, hash) + return timer.id /proc/deltimer(id) if (!id) diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 11511608cd..a0bcb5feec 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(title) name = "Title Screen" - flags_1 = SS_NO_FIRE|SS_NO_INIT + flags = 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 7126d93a47..0dbc7c5d3a 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_1 = SS_KEEP_TIMING|SS_NO_INIT + flags = 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 eb49568810..88102e260c 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_1 = SS_BACKGROUND + flags = SS_BACKGROUND wait = 10 runlevels = RUNLEVEL_GAME var/list/processing = list() diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index df7249c9c3..a6eb01f7b6 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -19,7 +19,7 @@ to_chat(affected_mob, "You feel a slight shock course through your body.") if(prob(2)) for(var/obj/M in orange(2,affected_mob)) - if(!M.anchored && (M.flags_1 & CONDUCT_1)) + if(!M.anchored && (M.flags & CONDUCT)) step_towards(M,affected_mob) for(var/mob/living/silicon/S in orange(2,affected_mob)) if(isAI(S)) @@ -32,7 +32,7 @@ to_chat(affected_mob, "You feel like clowning around.") if(prob(4)) for(var/obj/M in orange(4,affected_mob)) - if(!M.anchored && (M.flags_1 & CONDUCT_1)) + if(!M.anchored && (M.flags & CONDUCT)) var/i var/iter = rand(1,2) for(i=0,iYou query upon the nature of miracles.") if(prob(8)) for(var/obj/M in orange(6,affected_mob)) - if(!M.anchored && (M.flags_1 & CONDUCT_1)) + if(!M.anchored && (M.flags & CONDUCT)) var/i var/iter = rand(1,3) for(i=0,i