CatStation/Resources/Prototypes
Morbo 170ef592b1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2022-08-16 17:30:58 +03:00
..
Access Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Actions Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
AlertLevels Change yellow alert elight color to goldenrod (#9577) 2022-07-09 05:23:14 -07:00
Alerts Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
Atmospherics Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Body Cloning Rework (#8972) 2022-08-03 21:05:17 -07:00
Catalog Merge remote-tracking branch 'upstream/master' into test2 2022-08-16 00:21:46 +03:00
Chemistry Rat King Tweaks (#8940) 2022-06-18 16:21:07 -07:00
Corvax Две новые цели станции (#339) 2022-08-04 23:58:02 +03:00
Damage Zombie Fixes and Tweaks (#9940) 2022-07-26 17:35:34 -07:00
Datasets Merge remote-tracking branch 'upstream/master' into test2 2022-08-16 00:21:46 +03:00
Decals allow decals to be removed from placement menu (#9843) 2022-07-17 21:02:03 -05:00
Device Adds disposal mailing units (again) (#7630) 2022-08-13 22:57:25 -07:00
Diseases Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
Entities Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-08-16 17:30:58 +03:00
EntityLists/Tools
GameRules Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
HairStyles
Hydroponics Eye damage (#10262) 2022-08-13 22:59:14 -07:00
InventoryTemplates Obfuscates pocket slots from the Strip Menu (#8948) 2022-06-20 10:57:32 +10:00
LootTables Mining Fix (#10347) 2022-08-06 13:16:17 +10:00
MachineLinking Cloning Rework (#8972) 2022-08-03 21:05:17 -07:00
Magic EI NATH (#9060) 2022-06-23 22:19:32 +10:00
Maps Merge remote-tracking branch 'upstream/master' into test2 2022-08-16 00:21:46 +03:00
NPCs Port medibot + bot spawners from nyano (#9854) 2022-07-25 10:33:31 -05:00
Objectives Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Palettes Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Parallaxes Parallax fix + menu tweak (#10576) 2022-08-15 14:16:53 +10:00
Polymorphs Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Reagents Eye damage (#10262) 2022-08-13 22:59:14 -07:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-08-16 17:30:58 +03:00
Roles Merge remote-tracking branch 'upstream/master' into test2 2022-08-16 00:21:46 +03:00
Shaders Eye damage (#10262) 2022-08-13 22:59:14 -07:00
SoundCollections Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Stacks Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
Tiles Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
Voice Lizz and slime speech (#10038) 2022-07-26 19:13:12 +10:00
Wires Surveillance cameras (#8246) 2022-05-31 18:44:57 +10:00
accents.yml Revert "Revert "Upstream sync"" 2022-08-15 14:19:44 -07:00
ai_factions.yml
bar_signs.yml More localize (#7869) 2022-05-03 18:32:06 +10:00
explosion.yml Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
game_presets.yml Event refactor (#9589) 2022-07-10 20:48:41 -05:00
holidays.yml More localize (#7869) 2022-05-03 18:32:06 +10:00
hud.yml
lobbyscreens.yml Adds new "Pharmacy" Lobby Art by Solbusaur (#9339) 2022-07-01 19:54:04 -05:00
melee_weapon_animations.yml
name_identifier_groups.yml Adds a number identifier to all mobs except players (#7668) 2022-04-21 15:32:23 -07:00
radio_channels.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:39:41 +03:00
round_announcements.yml Fix roundstart audio 2022-06-07 17:04:55 +10:00
secret_weights.yml Zombie Mode [New Game Mode] (#8501) 2022-07-06 13:42:51 +10:00
shuttles.yml Revert map PRs (#10079) 2022-07-27 22:27:23 +10:00
species.yml Dwarves are no longer selectable. (#8596) 2022-06-03 00:31:35 -07:00
status_effects.yml Eye damage (#10262) 2022-08-13 22:59:14 -07:00
tags.yml Adds some extra toys to the arcade machine (#10637) 2022-08-16 02:57:39 -07:00
tool_qualities.yml Bartending Tweaks (#9307) 2022-07-15 02:01:55 -07:00
typing_indicator.yml Typing indicator (typing chat bubble) (#8215) 2022-05-17 02:55:19 -07:00