CatStation/Resources/Prototypes
Morb0 a4dbefd3f1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Procedural/salvage_rewards.yml
2023-07-01 01:51:55 +03:00
..
Accents More Pirate Accenting (#17564) 2023-06-27 20:40:47 -04:00
Access Paramedic role, redone (#15439) 2023-05-01 17:13:56 +10:00
Actions Remove diseases (#15684) 2023-05-07 17:50:37 +10:00
AlertLevels
Alerts [Revert] Reverts Ninja (#15516) 2023-04-19 01:43:09 -06:00
Atmospherics
Body Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
Chemistry Chem guidebook (#17123) 2023-06-04 15:45:02 -05:00
Corvax Add syndicate crate sprites (#1179) 2023-06-29 03:31:50 +03:00
Damage buff grilles (#17663) 2023-06-27 11:19:09 +10:00
Datasets Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-06-19 21:06:28 +03:00
Decals
Device Device Linking and better linking ui (#13645) 2023-05-07 16:07:24 +10:00
DeviceLinking logic gate momentary pulse, switch status port (#17198) 2023-06-12 15:43:59 -07:00
Entities Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
EntityLists/Tools
Flavors Add the White Gilgamesh (#16378) 2023-06-12 03:09:41 +10:00
GameRules Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-06-19 21:06:28 +03:00
GC Dynamic space world generation and debris. (#15120) 2023-05-16 06:36:45 -05:00
Guidebook Cargo Bounties (#17344) 2023-06-22 21:49:33 +10:00
Hydroponics Update seeds.yml (#17174) 2023-06-06 21:48:08 -06:00
InventoryTemplates Hamster resprite by RamZ and hamster can wear some clothing, monkey eva resprite. (#17439) 2023-06-29 18:36:19 -04:00
LootTables [replacement] Drozd (#16071) 2023-05-03 21:35:32 -06:00
MachineLinking logic gate momentary pulse, switch status port (#17198) 2023-06-12 15:43:59 -07:00
MachineParts Simplifying Machine Upgrading (#15802) 2023-04-29 13:23:49 +10:00
Magic remove netsync false from sprite component in prototypes (#17207) 2023-06-10 21:51:26 +10:00
Maps Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
NPCs Fix cleanbots (#16922) 2023-05-29 16:53:28 +10:00
Objectives Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-04-23 16:02:09 +03:00
Palettes Makes unpowered flashlights emmagables. (#16143) 2023-05-07 16:08:03 +10:00
Parallaxes
Polymorphs magic bread wand (#17044) 2023-06-03 12:08:52 -07:00
Procedural Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
Reagents Construction Price Adjustments (#17549) 2023-06-30 15:32:03 -04:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
Research Add solar tracker electronics to the circuit printer (#17637) 2023-06-26 13:04:06 +10:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
Shaders Blindness refactor (#15705) 2023-04-29 15:32:14 +10:00
SoundCollections Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-06-19 21:06:28 +03:00
Species Fix arachnid last name species prototype (#1081) 2023-05-20 22:06:28 +03:00
Stacks Make item size scale with stack size (#17623) 2023-06-25 10:44:37 -05:00
StatusIcon Status Icons (#17529) 2023-06-27 20:31:53 -04:00
Store
Tiles Pulling fasto (#17696) 2023-06-28 14:03:16 -06:00
Traits [Add] Adds pirate accent trait (#17258) 2023-06-14 20:17:39 -06:00
Voice Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-01 01:51:55 +03:00
Wires give shuttle airlocks a wire layout (#17318) 2023-06-15 13:37:58 +10:00
World Dynamic space world generation and debris. (#15120) 2023-05-16 06:36:45 -05:00
XenoArch Imagine if artifacts fucking killed you (#17746) 2023-06-30 15:25:33 -04:00
ai_factions.yml Factions for animals (#16013) 2023-05-03 22:47:17 +10: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 Power Sink Upgraded (#15683) 2023-05-17 23:55:42 +10:00
fonts.yml
game_presets.yml re-enable zombies (#16901) 2023-05-28 14:06:15 -06:00
holidays.yml Add Towel Day (#16364) 2023-05-12 13:39:18 -07:00
hud.yml
lobbyscreens.yml
name_identifier_groups.yml
ore.yml funny rock... (#17644) 2023-06-25 12:12:47 -06:00
radio_channels.yml Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-05-25 00:18:11 +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 'wizards/master' into upstream-sync 2023-05-31 03:26:01 +03:00
status_effects.yml Ratvarian Language and CogChamp (#15639) 2023-04-29 18:34:19 +10:00
tags.yml Added sink (#14348) 2023-06-30 18:10:47 -04:00
themes.yml
tool_qualities.yml H.O.N.K. mech (#14670) 2023-05-05 23:21:13 +10:00
typing_indicator.yml Copy-paste moth3 state 2023-04-15 19:19:17 +03:00
weather.yml