CatStation/Resources/Prototypes
Morb0 4516e1ceef Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/Names/skeleton_first.yml
2023-08-22 08:22:56 +03:00
..
Accents [Tweak] Remove some confusing words from archaic. (#18393) 2023-07-28 13:51:52 -06:00
Access Restrict Fire-fighting remote from Chief door (#19000) 2023-08-11 17:18:40 -05:00
Actions Add cooldown to bike horn implant (#19128) 2023-08-14 09:04:41 -07:00
AlertLevels Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-10 07:03:24 +03:00
Alerts Borgs (#18136) 2023-08-12 16:39:58 -05:00
Atmospherics Update gases.yml (#18838) 2023-08-07 15:29:00 -06:00
Body Corrects aghost's hand placement (#19403) 2023-08-21 21:35:30 +03:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-22 08:22:56 +03:00
Chemistry Moths. (#18593) 2023-08-04 15:21:28 +10:00
Corvax Fix maps (#1349) 2023-08-21 10:51:01 +03:00
Damage Arachnid rework (#18631) 2023-08-13 01:38:05 -06:00
Datasets Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-22 08:22:56 +03:00
Decals Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676) 2023-08-06 02:27: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-sync 2023-08-22 08:22:56 +03:00
EntityLists/Tools
Flavors Add Spaceshrooms (#17092) 2023-08-02 00:10:48 +10:00
GameRules Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-21 09:44:38 +03:00
Guidebook Add guidebook entries for the access configurator and installing airlock security upgrades (#18983) 2023-08-13 01:19:28 -06:00
Hydroponics Add cocoa cultivation (#18366) 2023-08-13 10:35:58 -04:00
InventoryTemplates Holoclown (clown only) syndicate uplink item. (#18966) 2023-08-13 01:18:09 -06:00
LootTables
MachineParts
Magic remove netsync false from sprite component in prototypes (#17207) 2023-06-10 21:51:26 +10:00
Maps Fix maps (#1349) 2023-08-21 10:51:01 +03:00
NPCs Medibot fixes (#18744) 2023-08-06 00:38:14 -06:00
Objectives Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-17 06:19:53 +03:00
Palettes
Parallaxes
Polymorphs Fix DNA scrambler (#19079) 2023-08-13 12:56:21 -04:00
Procedural Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
Reagents Add cocoa cultivation (#18366) 2023-08-13 10:35:58 -04:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-21 09:44:38 +03:00
Research C.H.I.M.P handcannon redesign (#19004) 2023-08-19 18:54:52 -04:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-21 09:44:38 +03:00
Shaders Improve paper stamping experience (#17135) 2023-08-13 14:28:10 -04:00
SoundCollections Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-21 09:44:38 +03:00
Species Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-22 08:22:56 +03:00
Stacks Arachnid rework (#18631) 2023-08-13 01:38:05 -06:00
StatusEffects Borgs (#18136) 2023-08-12 16:39:58 -05:00
StatusIcon Status Icons (#17529) 2023-06-27 20:31:53 -04:00
Store
Tiles Arachnid rework (#18631) 2023-08-13 01:38:05 -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-08-17 06:19:53 +03:00
Wires give shuttle airlocks a wire layout (#17318) 2023-06-15 13:37:58 +10: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
fonts.yml
game_presets.yml Revert "add syndies+nukies gamemode" (#19105) 2023-08-14 15:00:35 +10:00
holidays.yml
hud.yml
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 C.H.I.M.P handcannon redesign (#19004) 2023-08-19 18:54:52 -04:00
themes.yml
tool_qualities.yml Adds the Improvised Shotgun (#18025) 2023-07-18 15:10:07 -06:00
typing_indicator.yml Make speech bubble 32px (#1339) 2023-08-16 14:55:43 +03:00
weather.yml