CatStation/Resources/Prototypes
Morb0 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
..
Accents Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Access Syndie airlocks (#19264) 2023-09-07 19:19:56 -04:00
Actions Remove manual localization from action entity prototypes (#20023) 2023-09-11 22:34:41 +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 Added the ability to eat organs, mmm tastes like people (#20225) 2023-09-17 20:20:11 -04:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Chemistry Moths. (#18593) 2023-08-04 15:21:28 +10:00
Corvax Remove Delta from mappool (#1421) 2023-09-18 00:24:45 +03:00
Damage Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
Datasets remove sus codewords (#20060) 2023-09-12 00:37:43 -05:00
Decals decal settings (#20324) 2023-09-18 17:17:48 -06:00
Device
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-sync2 2023-09-19 11:41:15 +03:00
EntityLists/Tools
Flavors New crops: Berries and Bungo (#19800) 2023-09-18 23:29:27 -04:00
GameRules Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Guidebook Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
Hydroponics New crops: Berries and Bungo (#19800) 2023-09-18 23:29:27 -04:00
InventoryTemplates Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
LootTables
MachineParts
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-sync2 2023-09-19 11:41:15 +03:00
NPCs Medibot fixes (#18744) 2023-08-06 00:38:14 -06:00
Objectives Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Palettes
Parallaxes
Polymorphs Turn dionas into trees if they overdose on robust too hard (#19451) 2023-08-30 22:01:56 -04:00
Procedural Ice & snow tile modernization (#19689) 2023-08-31 15:31:23 -06:00
Reagents New crops: Berries and Bungo (#19800) 2023-09-18 23:29:27 -04:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Research Add HoloBarrier To SecFab (#20128) 2023-09-14 16:34:43 -07:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
Shaders Tweak outline changes (#18599) 2023-08-30 21:23:36 -04:00
SoundCollections Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
Species Enable round start arachnids (#1395) 2023-09-07 16:35:25 +03:00
Stacks Concrete and asphalt tiles (#19642) 2023-08-29 17:50:11 -05:00
StatusEffects Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
StatusIcon Status Icons (#17529) 2023-06-27 20:31:53 -04:00
Store
Tiles Add missing tile migration for glass alt > alt (#19940) 2023-09-09 01:37:12 -06:00
Traits Revert "Disable wheelchair trait (#18896)" (#19062) 2023-08-13 01:30:38 -06:00
Voice Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-05 00:12:02 +03:00
Wires Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
World
XenoArch Mining tweaks (#18686) 2023-08-05 20:23:38 -05:00
ai_factions.yml Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199) 2023-07-25 15:31:35 -06:00
audio.yml
bar_signs.yml
edge_spreaders.yml
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 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) 2023-08-30 18:06:15 -07:00
holidays.yml
hud.yml Fix hud theme selection (#19106) 2023-09-14 22:05:55 -04:00
lobbyscreens.yml
name_identifier_groups.yml Borgs (#18136) 2023-08-12 16:39:58 -05:00
ore.yml Add linter-friendly WeightedRandom prototypes (#18729) 2023-08-06 12:31:25 +10:00
radio_channels.yml Translate Upstream #1322 (#1324) 2023-08-14 00:03:19 +03:00
round_announcements.yml
secret_weights.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-15 00:08:39 +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 Make advanced mop show up on janitor trolley (#20124) 2023-09-17 20:23:35 -04:00
themes.yml
tool_qualities.yml Adds the Improvised Shotgun (#18025) 2023-07-18 15:10:07 -06:00
typing_indicator.yml Add arachnid idle state for typing indicator 2023-09-05 01:23:47 +03:00
weather.yml