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 d791eb37bd Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
#	Content.Server/Access/Systems/AgentIDCardSystem.cs
#	Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
#	Content.Server/Entry/IgnoredComponents.cs
#	Content.Shared/Access/Systems/SharedIdCardSystem.cs
#	Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
#	Resources/Locale/en-US/_strings/atmos/atmos-pipe-layers.ftl
#	Resources/Locale/en-US/_strings/chat/highlights.ftl
#	Resources/Locale/en-US/_strings/implant/chameleon-controller.ftl
#	Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
#	Resources/Locale/en-US/_strings/reagents/absinthe.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
#	Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
#	Resources/Prototypes/Recipes/Lathes/categories.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/official.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
#	Resources/Textures/Structures/Doors/secret_door.rsi/open.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/migration.yml
2025-06-04 13:39:57 +03:00
..
Fixtures Incendiary projectiles and lava firestack reduction (#23479) 2024-01-08 00:41:42 -05:00
animate_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
event_spells.yml Merge remote-tracking branch 'space-wizards/master' 2025-05-29 10:45:58 +03:00
forcewall_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
knock_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
mindswap_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
projectile_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
recall_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
repulse_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
rune_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
smoke_spell.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
spawn_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
staves.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
teleport_scroll.yml Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
teleport_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
touch_spells.yml fix smite use delay (#37940) 2025-05-29 19:41:25 -04:00
utility_spells.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00