CatStation/Resources/Prototypes
Arthur 0052df0cf5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Maps/infiltrator.yml
2022-07-15 15:39:41 +03:00
..
Access Fix some eshuttle stuff (#9171) 2022-06-26 17:11:54 +10:00
Actions Add egg laying + chicken/duck improvements (#9518) 2022-07-09 02:48:16 -07:00
AlertLevels Change yellow alert elight color to goldenrod (#9577) 2022-07-09 05:23:14 -07:00
Alerts Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
Atmospherics Miasma update (#8943) 2022-06-18 22:51:55 -07:00
Body Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:39:41 +03:00
Chemistry Rat King Tweaks (#8940) 2022-06-18 16:21:07 -07:00
Corvax/Entities/Clothing Move custom sprites to separate folder 2022-05-28 17:15:17 +03:00
Damage Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
Datasets Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-24 04:58:34 +03:00
Decals Cleans up warning line decals (#8731) 2022-07-11 23:03:35 -07:00
Device Surveillance cameras (#8246) 2022-05-31 18:44:57 +10:00
Diseases Add AMIV disease stages (#9637) 2022-07-15 02:06:54 +10:00
Entities Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:39:41 +03:00
EntityLists/Tools
GameRules Nerf disease outbreak (#9640) 2022-07-14 19:41:59 -07:00
HairStyles
Hydroponics Save seed data in components and remove the seed-database (#7499) 2022-04-16 15:32:35 +10:00
InventoryTemplates Obfuscates pocket slots from the Strip Menu (#8948) 2022-06-20 10:57:32 +10:00
LootTables Remove some tasers (#9727) 2022-07-14 23:44:44 +10:00
MachineLinking Fix dual port vents 2: Electric Boogaloo (#8396) 2022-06-06 01:38:20 -07:00
Magic EI NATH (#9060) 2022-06-23 22:19:32 +10:00
Maps Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-08 20:58:22 +03:00
NPCs
Objectives Steal condition tells you where to steal it from (#9605) 2022-07-14 20:09:11 -07:00
Palettes
Parallaxes Slows down parallax significantly. (#8691) 2022-06-11 15:59:31 -05:00
Polymorphs Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
Reagents Kvass (#9082) 2022-07-11 23:11:12 -07:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:39:41 +03:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-08 20:58:22 +03:00
Shaders [2 lines] fix blinding (#9690) 2022-07-14 06:58:24 -05:00
SoundCollections Feet update (#9344) 2022-07-02 04:54:39 -05:00
Stacks fixes aloe cream splitting (#8949) 2022-06-19 04:13:11 -07:00
Tiles Some footstep tweaks (#9355) 2022-07-02 14:48:38 -05:00
Voice Speech Noises 2: Quality of Life, New Sounds (#8044) 2022-05-09 14:55:23 +10:00
Wires Surveillance cameras (#8246) 2022-05-31 18:44:57 +10:00
accents.yml Add egg laying + chicken/duck improvements (#9518) 2022-07-09 02:48:16 -07:00
ai_factions.yml
bar_signs.yml More localize (#7869) 2022-05-03 18:32:06 +10:00
explosion.yml C1984 (C4 nerf) (#7612) 2022-04-23 17:22:14 -07: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 Add cargo shuttle (#8686) 2022-06-23 14:36:47 +10:00
species.yml Dwarves are no longer selectable. (#8596) 2022-06-03 00:31:35 -07:00
status_effects.yml Drunk Shader (#8910) 2022-06-23 14:33:25 +10:00
tags.yml Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -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