Morb0 0cffa43345 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Decals/bricktile.rsi/dark_box.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_end_e.png # Resources/Textures/Decals/bricktile.rsi/dark_end_n.png # Resources/Textures/Decals/bricktile.rsi/dark_end_s.png # Resources/Textures/Decals/bricktile.rsi/dark_end_w.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png # Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/dark_line_e.png # Resources/Textures/Decals/bricktile.rsi/dark_line_n.png # Resources/Textures/Decals/bricktile.rsi/dark_line_s.png # Resources/Textures/Decals/bricktile.rsi/dark_line_w.png # Resources/Textures/Decals/bricktile.rsi/meta.json # Resources/Textures/Decals/bricktile.rsi/steel_box.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_end_e.png # Resources/Textures/Decals/bricktile.rsi/steel_end_n.png # Resources/Textures/Decals/bricktile.rsi/steel_end_s.png # Resources/Textures/Decals/bricktile.rsi/steel_end_w.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png # Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/steel_line_e.png # Resources/Textures/Decals/bricktile.rsi/steel_line_n.png # Resources/Textures/Decals/bricktile.rsi/steel_line_w.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_corner_se.png # Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_end_e.png # Resources/Textures/Decals/bricktile.rsi/white_end_n.png # Resources/Textures/Decals/bricktile.rsi/white_end_s.png # Resources/Textures/Decals/bricktile.rsi/white_end_w.png # Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png # Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png # Resources/Textures/Decals/bricktile.rsi/white_inner_se.png # Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png # Resources/Textures/Decals/bricktile.rsi/white_line_e.png # Resources/Textures/Decals/bricktile.rsi/white_line_n.png # Resources/Textures/Decals/bricktile.rsi/white_line_s.png # Resources/Textures/Decals/bricktile.rsi/white_line_w.png # Resources/Textures/Decals/minitile.rsi/dark_box.png # Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_corner_se.png # Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_end_e.png # Resources/Textures/Decals/minitile.rsi/dark_end_n.png # Resources/Textures/Decals/minitile.rsi/dark_end_s.png # Resources/Textures/Decals/minitile.rsi/dark_end_w.png # Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png # Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png # Resources/Textures/Decals/minitile.rsi/dark_inner_se.png # Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png # Resources/Textures/Decals/minitile.rsi/dark_line_e.png # Resources/Textures/Decals/minitile.rsi/dark_line_n.png # Resources/Textures/Decals/minitile.rsi/dark_line_s.png # Resources/Textures/Decals/minitile.rsi/dark_line_w.png # Resources/Textures/Decals/minitile.rsi/meta.json # Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_corner_se.png # Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_end_e.png # Resources/Textures/Decals/minitile.rsi/steel_end_n.png # Resources/Textures/Decals/minitile.rsi/steel_end_s.png # Resources/Textures/Decals/minitile.rsi/steel_end_w.png # Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png # Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png # Resources/Textures/Decals/minitile.rsi/steel_inner_se.png # Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png # Resources/Textures/Decals/minitile.rsi/steel_line_e.png # Resources/Textures/Decals/minitile.rsi/steel_line_n.png # Resources/Textures/Decals/minitile.rsi/steel_line_s.png # Resources/Textures/Decals/minitile.rsi/steel_line_w.png # Resources/Textures/Decals/minitile.rsi/white_box.png # Resources/Textures/Decals/minitile.rsi/white_corner_ne.png # Resources/Textures/Decals/minitile.rsi/white_corner_nw.png # Resources/Textures/Decals/minitile.rsi/white_corner_se.png # Resources/Textures/Decals/minitile.rsi/white_corner_sw.png # Resources/Textures/Decals/minitile.rsi/white_end_e.png # Resources/Textures/Decals/minitile.rsi/white_end_n.png # Resources/Textures/Decals/minitile.rsi/white_end_s.png # Resources/Textures/Decals/minitile.rsi/white_end_w.png # Resources/Textures/Decals/minitile.rsi/white_inner_ne.png # Resources/Textures/Decals/minitile.rsi/white_inner_nw.png # Resources/Textures/Decals/minitile.rsi/white_inner_se.png # Resources/Textures/Decals/minitile.rsi/white_inner_sw.png # Resources/Textures/Decals/minitile.rsi/white_line_w.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/dark_diagonal.png # Resources/Textures/Tiles/dark_diagonal_mini.png # Resources/Textures/Tiles/dark_herringbone.png # Resources/Textures/Tiles/dark_mini.png # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/dark_offset.png # Resources/Textures/Tiles/dark_pavement.png # Resources/Textures/Tiles/dark_pavement_vertical.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_diagonal.png # Resources/Textures/Tiles/steel_diagonal_mini.png # Resources/Textures/Tiles/steel_herringbone.png # Resources/Textures/Tiles/steel_mini.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/steel_offset.png # Resources/Textures/Tiles/steel_pavement.png # Resources/Textures/Tiles/steel_pavement_vertical.png # Resources/Textures/Tiles/white.png # Resources/Textures/Tiles/white_diagonal.png # Resources/Textures/Tiles/white_diagonal_mini.png # Resources/Textures/Tiles/white_herringbone.png # Resources/Textures/Tiles/white_mini.png # Resources/Textures/Tiles/white_mono.png # Resources/Textures/Tiles/white_offset.png # Resources/Textures/Tiles/white_pavement.png # Resources/Textures/Tiles/white_pavement_vertical.png		2023-08-02 15:13:51 +03:00
..
Accents	[Tweak] Remove some confusing words from archaic. (#18393)	2023-07-28 13:51:52 -06:00
Access	Paramedic role, redone (#15439)	2023-05-01 17:13:56 +10:00
Actions	Allow Initial Infected to turn undead while crit (#18411)	2023-07-29 00:09:53 -06:00
AlertLevels	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
Alerts	Improve hunger and thirst warning icons (#18390)	2023-07-29 12:19:09 -07:00
Atmospherics
Body	Nerf silicon prices (#18455)	2023-07-30 12:53:41 -06:00
Catalog	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00
Chemistry	Chem guidebook (#17123)	2023-06-04 15:45:02 -05:00
Corvax	Revert "Add syndicate crate sprites" (#1244)	2023-08-02 15:05:24 +03:00
Damage	Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199)	2023-07-25 15:31:35 -06:00
Datasets	[Translate] Names dataset (#1061)	2023-07-28 14:22:17 +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-08-02 15:13:51 +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-02 15:13:51 +03:00
GC	Dynamic space world generation and debris. (#15120)	2023-05-16 06:36:45 -05:00
Guidebook	Bartender Filter (#18440)	2023-07-29 18:59:58 -04: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
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-08-02 15:13:51 +03:00
NPCs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
Objectives	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00
Palettes	Makes unpowered flashlights emmagables. (#16143)	2023-05-07 16:08:03 +10:00
Parallaxes
Polymorphs	New implanters for uplink (#18038)	2023-07-17 13:48:09 -06:00
Procedural	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
Reagents	Chemical Wiki Descriptions, Recipe Tweaks & Effect Tweaks (2) (#16157)	2023-07-31 16:03:49 +10:00
Recipes	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00
Research	Add chemical scanning goggles (#18373)	2023-08-01 15:57:22 -04:00
Roles	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-02 15:13:51 +03:00
Shaders	Light-reactive interaction outlines (#18343)	2023-08-02 20:07:12 +10:00
SoundCollections	Title2 lobby music (#1160)	2023-07-19 13:47:04 +03:00
Species	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-07-28 01:02:37 +03:00
Stacks	Adds Advanced ointment and bruisepack recipes (#17583)	2023-07-09 20:22:10 -06:00
StatusEffects	security HUD now shows a job icon on entities with a body (#18054)	2023-08-02 07:17:03 +10:00
StatusIcon	Status Icons (#17529)	2023-06-27 20:31:53 -04:00
Store
Tiles	fire axe plating (#18087)	2023-07-17 01:47:20 -06:00
Traits	[Add] Adds the accentless trait (#18303)	2023-07-26 00:54:45 -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	bye bye syndicate channel (#18375)	2023-07-27 14:03:47 -06: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	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	Add Spaceshrooms (#17092)	2023-08-02 00:10:48 +10: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	Decrease chance of extended mode in Secret (#1241)	2023-07-30 14:59:28 +03:00
status_effects.yml	Ratvarian Language and CogChamp (#15639)	2023-04-29 18:34:19 +10:00
tags.yml	New crafting recipes for hair flower and flower crown (#18421)	2023-07-29 11:46:29 -07:00
themes.yml
tool_qualities.yml	Adds the Improvised Shotgun (#18025)	2023-07-18 15:10:07 -06:00
typing_indicator.yml	Copy-paste moth3 state	2023-04-15 19:19:17 +03:00
weather.yml