Morb0 e3f6082c58 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json # Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png # Tools/actions_changelogs_since_last_run.py		2023-12-21 03:03:30 +03:00
..
corvax	just directly call ln in publish workflow	2023-10-03 14:40:27 +03:00
markings	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
ss14_ru	Terms support for locale scripts (#1146)	2023-06-18 19:54:34 +03:00
actions_changelog_rss.py	Fixes for the RSS changelog script. (#20468)	2023-09-24 17:14:15 +02:00
actions_changelogs_since_last_run.py	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
contribs_shared.ps1	Adds yet another dweeb to the name replacements (#10562)	2022-08-13 21:32:42 +02:00
dump_commits_since.ps1	Makes dump_commits_since.ps1 work on PowerShell 5.1 (#7680)	2022-04-21 09:39:02 +02:00
dump_contributors_since.ps1	Unify ignore/replacement lists for the two contrib ps1 scripts.	2022-05-16 22:27:29 +02:00
dump_github_contributors.ps1	Unify ignore/replacement lists for the two contrib ps1 scripts.	2022-05-16 22:27:29 +02:00
dump_patrons.ps1	Update patrons and credits (#13554)	2023-01-17 13:42:03 -08:00
dump_user_data.py	GDPR stuff update (#18300)	2023-07-26 20:05:51 +02:00
erase_user_data.py	GDPR stuff update (#18300)	2023-07-26 20:05:51 +02:00
gen_build_info.py	Revert "Disable manifest download for public build"	2023-10-07 14:14:23 +03:00
generate_hashes.ps1	Good job me.	2020-02-07 20:47:23 +01:00
iconsmooth.py	Add shuttle walls to icon smoothing (#10573)	2022-08-13 22:00:40 -07:00
iconsmooth_inv.py	Iconsmoothing: Subtile metrics (🦆 Edition) (#8307)	2022-06-05 16:35:04 +10:00
iconsmooth_lib.py	Add shuttle walls to icon smoothing (#10573)	2022-08-13 22:00:40 -07:00
make_roompack.py	Add make roompack script (#18370)	2023-08-10 19:23:56 -04:00
mapping-merge-driver.sh	Mapping merge driver: continued (#2803)	2021-02-06 23:56:40 +01:00
package_client_build.py	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
package_server_build.py	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
patrons_pr.ps1	Tiny PR script I need	2021-11-24 08:37:18 +01:00
singulo.m	Makes the singularity engine actually work stably. (#4068)	2021-05-28 11:44:13 +02:00
singulo_emitter.m	Makes the singularity engine actually work stably. (#4068)	2021-05-28 11:44:13 +02:00
update_changelog.py	Check if url exists in changelog and adjust Discord message for it (#22718)	2023-12-18 21:22:23 -08:00