NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Effects
History
Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
..
arcs.rsi Polish melee effects (#11653) 2022-11-08 14:28:49 -06:00
atmospherics.rsi miasma sprite tweak (#11006) 2022-09-11 00:00:42 -07:00
chempuff.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
chemsmoke.rsi Add Smoke and Foam chemical reaction effects. (#2913) 2021-02-03 15:26:46 +01:00
clicktest.rsi Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
crayondecals.rsi Add capitalism (#6617) 2022-03-03 21:11:35 +11:00
creampie.rsi Arachnid RE-REWORK (#19138) 2023-09-04 13:02:54 -07:00
electricity.rsi Electrified grille sparks effect (#15178) 2023-04-29 16:05:10 -04:00
emp.rsi Add emp grenade (#14393) 2023-03-06 11:05:12 -08:00
explosion.rsi Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
extinguisherSpray.rsi Fix the remaining invalid RSIs (#13113) 2022-12-20 11:49:18 -06:00
fire.rsi Cleaned up all produce meta.jsons (#3943) 2021-05-08 09:09:35 +00:00
fire_greyscale.rsi Explosion refactor (#5230) 2022-03-31 21:39:26 -05:00
foam.rsi Add Smoke and Foam chemical reaction effects. (#2913) 2021-02-03 15:26:46 +01:00
LightMasks nuke lights code change (#19315) 2023-09-04 17:14:10 +03:00
lightning.rsi Beam Component and Lightning Component (#10196) 2022-09-16 01:49:01 +10:00
portal.rsi Portal sprite & behavior tweaks (#19179) 2023-08-15 14:56:14 -06:00
sparks.rsi ninja 2 electric boogaloo (#15534) 2023-09-10 16:20:27 +10:00
speech.rsi Add arachnid idle state for typing indicator 2023-09-05 01:23:47 +03:00
ssd.rsi SSD Indicator (#19701) 2023-09-11 15:52:56 +10:00
text.rsi [Entity] Brig Timers (#15285) 2023-04-19 01:47:01 -06:00
weather.rsi Weather effects (#12528) 2023-01-17 20:26:52 +11:00