Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
Accents	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-02 02:18:19 +03:00
Access	Syndie airlocks (#19264)	2023-09-07 19:19:56 -04:00
Actions	Action container rejig (#20260)	2023-09-23 18:49:39 +10:00
AlertLevels	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
Alerts	Cyborg health alert and damage examining (#20084)	2023-09-14 23:14:47 -04:00
Atmospherics	Update gases.yml (#18838)	2023-08-07 15:29:00 -06:00
Body	organs edible to lizards, and make their food contents uncooked proteins (#20882)	2023-10-10 11:02:46 -07:00
Catalog	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
Chemistry	Moths. (#18593)	2023-08-04 15:21:28 +10:00
Corvax	Update Delta station (#1498)	2023-10-13 03:00:51 +03:00
Damage	Lizard "Rework" (#20328)	2023-10-06 13:19:00 -08:00
Datasets	Minor tips update (#20505)	2023-09-26 09:13:55 -08:00
Decals	decal settings (#20324)	2023-09-18 17:17:48 -06:00
Device	Device Linking and better linking ui (#13645)	2023-05-07 16:07:24 +10:00
DeviceLinking	air alarm signal ports and other stuff (#18642)	2023-08-21 14:18:30 -07:00
Entities	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
EntityLists/Tools
Flavors	rouny meat and steak (#20526)	2023-09-28 00:07:08 -04:00
GameRules	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00
Guidebook	Add guidebook for revolutionaries (#20957)	2023-10-13 09:36:41 -08:00
Hydroponics	Exterminate tab in seeds prototype No C# (#20464)	2023-09-24 05:42:44 -07:00
InventoryTemplates	monkey gas mask! (#20683)	2023-10-05 15:34:37 -06:00
LootTables	[replacement] Drozd (#16071)	2023-05-03 21:35:32 -06:00
MachineParts	SMES and substation require power cells as machine parts (#20344)	2023-10-12 12:06:03 -04:00
Magic	Remove manual localization from action entity prototypes (#20023)	2023-09-11 22:34:41 +10:00
Maps	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00
NPCs	Add mob retaliation (#19901)	2023-10-06 17:56:18 -07:00
Objectives	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-02 02:18:19 +03:00
Palettes	Makes unpowered flashlights emmagables. (#16143)	2023-05-07 16:08:03 +10:00
Parallaxes	Salvage dungeons (#14520)	2023-03-10 16:41:22 +11:00
Polymorphs	Polymorph Artifact Effect (#20660)	2023-10-09 16:49:42 -07:00
Procedural	Expeditions rework (#18960)	2023-09-19 22:52:01 +10:00
Reagents	Increase carbon dioxide poisoning damage (#20939)	2023-10-12 10:35:31 +03:00
Recipes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
Research	add igniter (#20962)	2023-10-14 00:11:50 -07:00
Roles	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
Shaders	Further interaction outline tweaks (tonemap rework) (#19898)	2023-09-27 19:22:32 +10:00
SoundCollections	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
Species	[Resprite] Lizard digitigrade (#1465)	2023-10-04 16:21:55 +03:00
Stacks	Ash Walker`s spear and uniform (#20292)	2023-09-24 15:57:10 -04:00
StatusEffects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
StatusIcon	Revolutionaries (#18477)	2023-10-04 18:47:33 -07:00
Store	Uplink catalog localization (#12931)	2022-12-19 21:52:59 -06:00
Tiles	Add missing tile migration for glass alt > alt (#19940)	2023-09-09 01:37:12 -06:00
Traits	Added lisp as a character trait (#20350)	2023-09-19 21:51:50 -07:00
Voice	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-14 00:39:46 +03:00
Wires	Hardbombs & Defusables (#15380)	2023-09-11 18:42:38 -07:00
World	Dynamic space world generation and debris. (#15120)	2023-05-16 06:36:45 -05:00
XenoArch	Polymorph Artifact Effect (#20660)	2023-10-09 16:49:42 -07:00
ai_factions.yml	Revolutionaries (#18477)	2023-10-04 18:47:33 -07:00
audio.yml	More rules tweaks (#16918)	2023-05-29 15:11:52 +10:00
bar_signs.yml	Added "Spacebucks" barsign (#15660)	2023-04-23 18:13:31 -04:00
edge_spreaders.yml	Remove SpreaderNodeGroup (#20230)	2023-10-01 16:56:41 -04:00
explosion.yml	Hardbombs & Defusables (#15380)	2023-09-11 18:42:38 -07:00
fonts.yml	allow richtext on papers + edit premade documents (#18154)	2023-08-22 21:50:03 +10:00
game_presets.yml	Revolutionaries (#18477)	2023-10-04 18:47:33 -07:00
holidays.yml	Add Towel Day (#16364)	2023-05-12 13:39:18 -07:00
hud.yml	Fix hud theme selection (#19106)	2023-09-14 22:05:55 -04:00
lobbyscreens.yml	SSXIV Title Screen (#12592)	2022-11-14 13:09:38 -06:00
name_identifier_groups.yml	Borgs (#18136)	2023-08-12 16:39:58 -05:00
ore.yml	Rock Anomaly (#20635)	2023-10-05 12:53:53 -07:00
radio_channels.yml	Translate Upstream #1322 (#1324)	2023-08-14 00:03:19 +03:00
round_announcements.yml	Fix some announcements code (#16585)	2023-05-21 20:06:05 +10:00
secret_weights.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00
silicon-laws.yml	Borgs (#18136)	2023-08-12 16:39:58 -05:00
status_effects.yml	stimulants increase stamina (#18754)	2023-08-06 21:06:23 +10:00
tags.yml	add igniter (#20962)	2023-10-14 00:11:50 -07:00
themes.yml	More minor UI refactor stuff (#11287)	2022-09-14 20:42:35 -07:00
threats.yml	Rename ThreatPrototype and mark fields as required (#20611)	2023-09-30 13:01:13 -07:00
tool_qualities.yml	Add rolling pins for flattening dough (#20624)	2023-10-02 11:21:15 -08:00
typing_indicator.yml	Add arachnid idle state for typing indicator	2023-09-05 01:23:47 +03:00
weather.yml	Weather effects (#12528)	2023-01-17 20:26:52 +11:00