rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Prototypes/Magic
History
Vigers Ray 0e350ab6d3 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Actions/ActionsSystem.cs
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
#	Content.Server/GameTicking/GameTicker.GamePreset.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Actions/BaseActionComponent.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Weapons/Reflect/ReflectComponent.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	README.md
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
#	Resources/Prototypes/ai_factions.yml
2025-04-19 00:46:30 +03:00
..
Fixtures Incendiary projectiles and lava firestack reduction (#23479) 2024-01-08 00:41:42 -05:00
animate_spell.yml Action charges refactor (#33993) 2025-04-18 13:45:48 +10:00
event_spells.yml Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
forcewall_spells.yml Lowercase some prototypes names (#29990) 2024-07-23 11:16:11 +03:00
knock_spell.yml Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00
mindswap_spell.yml Mind Swap Fix (#33553) 2025-02-04 17:25:54 +01:00
projectile_spells.yml Action charges refactor (#33993) 2025-04-18 13:45:48 +10:00
recall_spell.yml Wizard Item Recall Spell (#34411) 2025-02-08 16:56:08 -05:00
repulse_spell.yml Wizard: Repulse Spell (#35377) 2025-02-22 10:56:54 -05:00
rune_spells.yml Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00
smoke_spell.yml Wizard: Smoke Spell (#35403) 2025-02-22 15:04:42 -08:00
spawn_spells.yml Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00
staves.yml Action charges refactor (#33993) 2025-04-18 13:45:48 +10:00
teleport_spells.yml Void's Applause (#34591) 2025-01-31 01:10:35 +01:00
touch_spells.yml 2 lines yaml cleanup (#35338) 2025-02-20 20:24:21 +01:00
utility_spells.yml Remove noSpawn: true from action entity prototypes (#28508) 2024-06-02 01:11:48 -07:00