CatStation

mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00

History

Morb0 d9bfc5cdcb Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.Spawning.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Maps/cog.yml # Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png # Resources/Textures/Structures/Walls/solid.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png # Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png # Resources/Textures/Structures/Walls/solid.rsi/solid0.png # Resources/Textures/Structures/Walls/solid.rsi/solid1.png # Resources/Textures/Structures/Walls/solid.rsi/solid2.png # Resources/Textures/Structures/Walls/solid.rsi/solid3.png # Resources/Textures/Structures/Walls/solid.rsi/solid4.png # Resources/Textures/Structures/Walls/solid.rsi/solid5.png # Resources/Textures/Structures/Walls/solid.rsi/solid6.png # Resources/Textures/Structures/Walls/solid.rsi/solid7.png		2024-09-11 10:56:49 +03:00
..
clockwork_diagonal.rsi	Clockwork structures and furniture (#24673 )	2024-03-06 03:25:59 +03:00
clockwork_window.rsi	Clockwork structures and furniture (#24673 )	2024-03-06 03:25:59 +03:00
cracks.rsi	Add easy window upgrading, fix some other window issues. (#31978 )	2024-09-09 13:26:10 -06:00
cracks_diagonal.rsi	Add easy window upgrading, fix some other window issues. (#31978 )	2024-09-09 13:26:10 -06:00
cracks_directional.rsi	Add easy window upgrading, fix some other window issues. (#31978 )	2024-09-09 13:26:10 -06:00
directional.rsi	Corvax Retexture pack 2! (#2012 )	2024-04-04 10:33:11 +03:00
mining.rsi	[Art] Mining structures retexture (#2465 )	2024-08-14 13:25:25 +03:00
mining_diagonal.rsi	[Art] Mining structures retexture (#2465 )	2024-08-14 13:25:25 +03:00
plasma_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00
plasma_window.rsi
plastitanium_window.rsi	New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723 )	2024-02-29 15:33:35 -07:00
plastitanium_window_diagonal.rsi	New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723 )	2024-02-29 15:33:35 -07:00
reinforced_plasma_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00
reinforced_plasma_window.rsi
reinforced_uranium_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00
reinforced_uranium_window.rsi	[Resprite] Uranium windows (#1089 )	2023-05-23 10:18:16 +03:00
reinforced_window.rsi
reinforced_window_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00
shuttle_window.rsi	Remove CRLF, enforce with workflow (#26401 )	2024-03-24 22:06:17 +01:00
shuttle_window_diagonal.rsi	diagonal window glass and pirate shuttle improvements (#21174 )	2023-11-05 19:38:02 -07:00
tinted_window.rsi
uranium_window.rsi	[Resprite] Uranium windows (#1089 )	2023-05-23 10:18:16 +03:00
uranium_window_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00
window.rsi
window_diagonal.rsi	Diagonal walls resprite (#1562 )	2023-11-09 12:20:22 +03:00