Merge remote-tracking branch 'skrat/master' into upstream-christmas

# Conflicts:
#	README.md
#	code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
#	code/game/machinery/bank_machine.dm
#	code/modules/unit_tests/station_trait_tests.dm
#	html/changelogs/archive/2023-12.yml
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/contractor/code/datums/midround/event.dm
#	modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgui/packages/tgui/interfaces/Fabrication/SearchBar.tsx
#	tgui/packages/tgui/interfaces/Spellbook.tsx
This commit is contained in:
nevimer
2023-12-24 23:15:34 -05:00
1251 changed files with 10250 additions and 7347 deletions
@@ -108,7 +108,6 @@
/datum/asset/spritesheet/antagonists
name = "antagonists"
early = TRUE
cross_round_cachable = TRUE
/// Mapping of spritesheet keys -> icons
var/list/antag_icons = list()
@@ -119,7 +118,6 @@
ROLE_GLITCH = /datum/antagonist/bitrunning_glitch,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_LONE_OPERATIVE = /datum/antagonist/nukeop/lone,
ROLE_DRIFTING_CONTRACTOR = /datum/antagonist/contractor, //SKYRAT EDIT
ROLE_SENTIENCE = /datum/antagonist/sentient_creature,
)
@@ -53,6 +53,8 @@
var/list/jobs = list()
for (var/datum/job/job as anything in SSjob.joinable_occupations)
if (job.job_flags & JOB_LATEJOIN_ONLY)
continue
var/datum/job_department/department_type = job.department_for_prefs || job.departments_list?[1]
if (isnull(department_type))
stack_trace("[job] does not have a department set, yet is a joinable occupation!")
@@ -122,6 +124,8 @@
var/list/job_required_experience = list()
for (var/datum/job/job as anything in SSjob.all_occupations)
if (job.job_flags & JOB_LATEJOIN_ONLY)
continue
var/required_playtime_remaining = job.required_playtime_remaining(user.client)
if (required_playtime_remaining)
job_required_experience[job.title] = list(
@@ -9,7 +9,6 @@
/datum/asset/spritesheet/species
name = "species"
early = TRUE
cross_round_cachable = TRUE
/datum/asset/spritesheet/species/create_spritesheets()
var/list/to_insert = list()