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/Interface/Actions
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
..
actions_borg.rsi Borgs (#18136) 2023-08-12 16:39:58 -05:00
actions_crit.rsi Deathgasp + last words / succumbing / fake deathgasp as crit actions (#18993) 2023-08-11 22:56:34 -07:00
actions_mecha.rsi [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
carp_rift.rsi Carp wave spawner and dragons as an actual event (#10254) 2022-08-08 10:18:14 +10:00
devour.rsi Update dragon devour action icon (#20020) 2023-09-12 22:05:04 -07:00
blight.png Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
carp_summon.png Cleanup the remainder of dragon (#8881) 2022-06-16 19:30:49 -05:00
defile.png Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
disarm.png [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
disarmOff.png [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
harm.png [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
harmOff.png [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
malfunction.png Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
manifest.png Guardian brushup and bullet passthrough (#7035) 2022-03-17 11:46:11 -07:00
meta.json Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
overloadlight.png Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
pai-midi.png Adds new pAI sprites (#6205) 2022-01-17 12:21:40 -07:00
ratKingArmy.png The Rat King [Antag] (#8706) 2022-06-16 10:53:26 +10:00
ratKingDomain.png The Rat King [Antag] (#8706) 2022-06-16 10:53:26 +10:00
scream.png Actions System + UI (#2710) 2020-12-13 23:28:20 +01:00
shop.png Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
web.png Spiders Buff and critters change (#13377) 2023-01-22 18:50:05 -04:00
zombie-turn.png Zombie Mode [New Game Mode] (#8501) 2022-07-06 13:42:51 +10:00