Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tgstation/byond:513.1533 as base
FROM tgstation/byond:514.1554 as base

FROM base as build_base

Expand Down
Binary file modified byond-extools.dll
Binary file not shown.
Binary file modified byond-extools.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions code/__DEFINES/_tick.dm
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
5 changes: 0 additions & 5 deletions code/__HELPERS/_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
10 changes: 5 additions & 5 deletions code/_compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion code/datums/traits/neutral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@

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
var/boltUp = 'sound/machines/boltsup.ogg'
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"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/airlock_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='warning'>You need to open [src] first.</span>")
return
return ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/one_click_antag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/nanites/nanite_programs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
6 changes: 3 additions & 3 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Binary file removed icons/obj/doors/airlocks/mask_32x32.dmi
Binary file not shown.
Binary file added icons/obj/doors/airlocks/mask_32x32_airlocks.dmi
Binary file not shown.
Binary file removed icons/obj/doors/airlocks/mask_64x32.dmi
Binary file not shown.
Binary file added icons/obj/doors/airlocks/mask_64x32_airlocks.dmi
Binary file not shown.
Binary file modified libbyond-extools.so
Binary file not shown.
6 changes: 3 additions & 3 deletions yogstation/code/modules/scripting/Interpreter/Interpreter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down