diff --git a/Dockerfile b/Dockerfile index d96da08a3c4f..545e375ce861 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tgstation/byond:513.1533 as base +FROM tgstation/byond:514.1554 as base FROM base as build_base diff --git a/byond-extools.dll b/byond-extools.dll index 7cb5e0ce0648..609fe11dee60 100644 Binary files a/byond-extools.dll and b/byond-extools.dll differ diff --git a/byond-extools.pdb b/byond-extools.pdb index 78d7cd76d975..b0fcbe24d5a7 100644 Binary files a/byond-extools.pdb and b/byond-extools.pdb differ diff --git a/code/__DEFINES/_tick.dm b/code/__DEFINES/_tick.dm index fc6147c43041..abafc4465c38 100644 --- a/code/__DEFINES/_tick.dm +++ b/code/__DEFINES/_tick.dm @@ -1,7 +1,7 @@ /// Percentage of tick to leave for master controller to run #define MAPTICK_MC_MIN_RESERVE 70 -/// internal_tick_usage is updated every tick by extools -#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((GLOB.internal_tick_usage / world.tick_lag) * 100) + +#define MAPTICK_LAST_INTERNAL_TICK_USAGE (world.map_cpu) /// Tick limit while running normally #define TICK_BYOND_RESERVE 2 #define TICK_LIMIT_RUNNING (max(100 - TICK_BYOND_RESERVE - MAPTICK_LAST_INTERNAL_TICK_USAGE, MAPTICK_MC_MIN_RESERVE)) diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index e4306bc50f80..9afeda469b1b 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -534,11 +534,6 @@ used_key_list[input_key] = 1 return input_key -#if DM_VERSION > 513 -#error Remie said that lummox was adding a way to get a lists -#error contents via list.values, if that is true remove this -#error otherwise, update the version and bug lummox -#endif //Flattens a keyed list into a list of it's contents /proc/flatten_list(list/key_list) if(!islist(key_list)) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 17128daaf502..084e44d24646 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -32,11 +32,11 @@ #endif //Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 513 +#define MIN_COMPILER_VERSION 514 #if DM_VERSION < MIN_COMPILER_VERSION //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 513 or higher +#error You need version 514 or higher #endif //Additional code for the above flags. @@ -67,13 +67,13 @@ #endif //If you update these values, update the message in the #error -#define MAX_BYOND_MAJOR 513 -#define MAX_BYOND_MINOR 1538 +#define MAX_BYOND_MAJOR 514 +#define MAX_BYOND_MINOR 1554 ///Uncomment to bypass the max version check. Note: This will likely break the game, only use if you know what you're doing //#define IGNORE_MAX_BYOND_VERSION #if ((DM_VERSION > MAX_BYOND_MAJOR) || (DM_BUILD > MAX_BYOND_MINOR)) && !defined(IGNORE_MAX_BYOND_VERSION) -#error Your version of BYOND is too new to compile this project. Download version 513.1538 at www.byond.com/download/build/513/513.1538_byond.exe +#error Your version of BYOND is too new to compile this project. Download version 514.1554 at www.byond.com/download/build/514/514.1554_byond.exe #endif #ifdef TRAVISBUILDING diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index b46cdd298170..7931d91acb50 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -18,5 +18,3 @@ GLOBAL_LIST_EMPTY(powernets) GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details - -GLOBAL_VAR_INIT(internal_tick_usage, 0.2 * world.tick_lag) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index be223f0b9d2d..91afe641e07c 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -21,7 +21,7 @@ var/datum/species/species = H.dna.species if(initial(species.liked_food) & MEAT) species.liked_food |= MEAT - if(!initial(species.disliked_food) & MEAT) + if(!(initial(species.disliked_food) & MEAT)) species.disliked_food &= ~MEAT /datum/quirk/pineapple_liker diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 34f0c8535552..2cdf48f8c5ea 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -104,7 +104,6 @@ var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock - var/mask_file = 'icons/obj/doors/airlocks/mask_32x32.dmi' // because filters aren't allowed to have icon_states :( var/doorOpen = 'sound/machines/airlock.ogg' var/doorClose = 'sound/machines/airlockclose.ogg' var/doorDeni = 'sound/machines/deniedbeep.ogg' // i'm thinkin' Deni's @@ -112,6 +111,9 @@ var/boltDown = 'sound/machines/boltsdown.ogg' var/noPower = 'sound/machines/doorclick.ogg' + /* Note mask_file needed some change due to the change from 513 to 514(the behavior of alpha filters seems to have changed) thats the reason why the mask + dmi file for normal airlocks is not 32x32 but 64x64 and for the large airlocks instead of 64x32 its now 96x64 due to the fix to this problem*/ + var/mask_file = 'icons/obj/doors/airlocks/mask_32x32_airlocks.dmi' // because filters aren't allowed to have icon_states :( var/mask_x = 0 var/mask_y = 0 var/anim_parts = "left=-14,0;right=13,0" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index bee2725816c1..0e8db90345d5 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -679,7 +679,7 @@ name = "large glass airlock" icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' - mask_file = 'icons/obj/doors/airlocks/mask_64x32.dmi' + mask_file = 'icons/obj/doors/airlocks/mask_64x32_airlocks.dmi' mask_x = 16 // byond is consistent and sane anim_parts = "left=-21,0;right=21,0;top=0,29" opacity = 0 diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 06835f46505c..646608cfc755 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -243,7 +243,7 @@ return ..() /obj/item/stack/medical/mesh/attack_hand(mob/user) - if(!is_open & user.get_inactive_held_item() == src) + if(!is_open && user.get_inactive_held_item() == src) to_chat(user, "You need to open [src] first.") return return ..() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 22724baa884b..9383c0cffa7b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -157,7 +157,7 @@ /obj/structure/table/proc/tablepush(mob/living/user, mob/living/pushed_mob) var/added_passtable = FALSE - if(!pushed_mob.pass_flags & PASSTABLE) + if(!(pushed_mob.pass_flags & PASSTABLE)) added_passtable = TRUE pushed_mob.pass_flags |= PASSTABLE SEND_SIGNAL(user, COMSIG_MOB_TABLING) diff --git a/code/game/world.dm b/code/game/world.dm index 2e367f2da11b..03411cd105e4 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -2,11 +2,6 @@ GLOBAL_VAR(restart_counter) -/world/proc/enable_debugger() - var/dll = (fexists(EXTOOLS) && EXTOOLS) - if (dll) - call(dll, "debug_initialize")() - /** * World creation * @@ -24,8 +19,6 @@ GLOBAL_VAR(restart_counter) * */ /world/New() - enable_debugger() //This does nothing if you aren't trying to debug - //Early profile for auto-profiler - will be stopped on profiler init if necessary. #if DM_VERSION >= 513 && DM_BUILD >= 1506 world.Profile(PROFILE_START) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index eb16bcc5dac0..ce546c9daab3 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -451,7 +451,7 @@ chosen_candidate.client.prefs.copy_to(ERTOperative) ERTOperative.key = chosen_candidate.key - if(ertemplate.enforce_human || !ERTOperative.dna.species.changesource_flags & ERT_SPAWN) // Don't want any exploding plasmemes + if(ertemplate.enforce_human || !(ERTOperative.dna.species.changesource_flags & ERT_SPAWN)) // Don't want any exploding plasmemes ERTOperative.set_species(/datum/species/human) //Give antag datum diff --git a/code/modules/research/nanites/nanite_programs.dm b/code/modules/research/nanites/nanite_programs.dm index d4835128c688..00bc514d76b8 100644 --- a/code/modules/research/nanites/nanite_programs.dm +++ b/code/modules/research/nanites/nanite_programs.dm @@ -195,14 +195,14 @@ software_error() /datum/nanite_program/proc/on_shock(shock_damage) - if(!program_flags & NANITE_SHOCK_IMMUNE) + if(!(program_flags & NANITE_SHOCK_IMMUNE)) if(prob(10)) software_error() else if(prob(33)) qdel(src) /datum/nanite_program/proc/on_minor_shock() - if(!program_flags & NANITE_SHOCK_IMMUNE) + if(!(program_flags & NANITE_SHOCK_IMMUNE)) if(prob(10)) software_error() diff --git a/dependencies.sh b/dependencies.sh index 6dddd8008cfe..7779bbf399b3 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -5,8 +5,8 @@ # byond version # Extracted from the Dockerfile. Change by editing Dockerfile's FROM command. -export BYOND_MAJOR=513 -export BYOND_MINOR=1533 +export BYOND_MAJOR=514 +export BYOND_MINOR=1554 #rust_g git tag export RUST_G_VERSION=0.4.5 @@ -19,4 +19,4 @@ export NODE_VERSION_PRECISE=12.20.0 export PHP_VERSION=7.2 # SpacemanDMM git tag -export SPACEMAN_DMM_VERSION=suite-1.6 +export SPACEMAN_DMM_VERSION=suite-1.7 diff --git a/icons/obj/doors/airlocks/mask_32x32.dmi b/icons/obj/doors/airlocks/mask_32x32.dmi deleted file mode 100644 index 97e265e0c8b1..000000000000 Binary files a/icons/obj/doors/airlocks/mask_32x32.dmi and /dev/null differ diff --git a/icons/obj/doors/airlocks/mask_32x32_airlocks.dmi b/icons/obj/doors/airlocks/mask_32x32_airlocks.dmi new file mode 100644 index 000000000000..5f74f6d8ccb6 Binary files /dev/null and b/icons/obj/doors/airlocks/mask_32x32_airlocks.dmi differ diff --git a/icons/obj/doors/airlocks/mask_64x32.dmi b/icons/obj/doors/airlocks/mask_64x32.dmi deleted file mode 100644 index 3e238aee4659..000000000000 Binary files a/icons/obj/doors/airlocks/mask_64x32.dmi and /dev/null differ diff --git a/icons/obj/doors/airlocks/mask_64x32_airlocks.dmi b/icons/obj/doors/airlocks/mask_64x32_airlocks.dmi new file mode 100644 index 000000000000..e9e9b6c7614b Binary files /dev/null and b/icons/obj/doors/airlocks/mask_64x32_airlocks.dmi differ diff --git a/libbyond-extools.so b/libbyond-extools.so index 36e9553372c8..a1f77476b160 100755 Binary files a/libbyond-extools.so and b/libbyond-extools.so differ diff --git a/yogstation/code/modules/scripting/Interpreter/Interpreter.dm b/yogstation/code/modules/scripting/Interpreter/Interpreter.dm index c4208ba2c148..59565469f222 100644 --- a/yogstation/code/modules/scripting/Interpreter/Interpreter.dm +++ b/yogstation/code/modules/scripting/Interpreter/Interpreter.dm @@ -153,20 +153,20 @@ else if(istype(S, /node/statement/IfStatement)) . = RunIf(S, scope) else if(istype(S, /node/statement/ReturnStatement)) - if(!scope.allowed_status & RETURNING) + if(!(scope.allowed_status & RETURNING)) RaiseError(new/runtimeError/UnexpectedReturn(), scope, S) continue scope.status |= RETURNING . = (scope.return_val=Eval(S:value, scope)) break else if(istype(S, /node/statement/BreakStatement)) - if(!scope.allowed_status & BREAKING) + if(!(scope.allowed_status & BREAKING)) //RaiseError(new/runtimeError/UnexpectedReturn()) continue scope.status |= BREAKING break else if(istype(S, /node/statement/ContinueStatement)) - if(!scope.allowed_status & CONTINUING) + if(!(scope.allowed_status & CONTINUING)) //RaiseError(new/runtimeError/UnexpectedReturn()) continue scope.status |= CONTINUING