CatStation/Resources/Prototypes
Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/update-wiki.yml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/manifest.yml
2023-09-24 12:56:24 +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 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 Refactoring body system to use containers and general body cleanup (#20202) 2023-09-21 17:23:02 +10:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +03:00
Chemistry Moths. (#18593) 2023-08-04 15:21:28 +10:00
Corvax Update Gate station (#1440) 2023-09-22 17:38:28 +03:00
Damage Tweak Moth Values (#20327) 2023-09-19 21:49:35 -07:00
Datasets Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +03: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-09-24 12:56:24 +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-sync 2023-09-24 12:56:24 +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 [replacement] Drozd (#16071) 2023-05-03 21:35:32 -06:00
MachineParts Simplifying Machine Upgrading (#15802) 2023-04-29 13:23:49 +10: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-sync2 2023-09-19 11:41:15 +03:00
NPCs Rat King Milsim + Buffs (#20190) 2023-09-22 15:01:05 -05:00
Objectives Decrease doorjack count for ninja (#1439) 2023-09-22 17:49: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 Turn dionas into trees if they overdose on robust too hard (#19451) 2023-08-30 22:01:56 -04:00
Procedural Expeditions rework (#18960) 2023-09-19 22:52:01 +10:00
Reagents Metabolism fixes (#20402) 2023-09-22 15:01:42 -05:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +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-24 12:56:24 +03:00
StatusIcon Status Icons (#17529) 2023-06-27 20:31:53 -04: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-09-05 00:12:02 +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 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 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 Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10: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 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) 2023-08-30 18:06:15 -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 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 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-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 Bows & arrows (#19771) 2023-09-22 02:45:21 -07: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 Weather effects (#12528) 2023-01-17 20:26:52 +11:00