]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 23 Jun 2024 02:16:08 +0000 (12:16 +1000)
committerGitHub <noreply@github.com>
Sun, 23 Jun 2024 02:16:08 +0000 (22:16 -0400)
commit0546c9bf64fdf1a56c8745dee328fe4b272dd888
treef7dc8f1c40af0fe698f1ebf4af4e5e2e0cf87b2b
parent089cdcf777098bad67f60ab837fb7bfc8d57a705
Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326)

* Revert "Weapon Reflection Movement Mechanic (#27219)"

This reverts commit b90373356e7f4f0eee693732964eac9c9eaa1f02.

# Conflicts:
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs

* Add myself to codeowners

* Add myself to codeowners

* Also the alerts
13 files changed:
.github/CODEOWNERS
Content.Shared/Weapons/Reflect/ReflectComponent.cs
Content.Shared/Weapons/Reflect/ReflectSystem.cs
Resources/Locale/en-US/alerts/alerts.ftl
Resources/Prototypes/Alerts/alerts.yml
Resources/Prototypes/Anomaly/behaviours.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
Resources/Prototypes/Entities/Objects/Shields/shields.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png [deleted file]
Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json [deleted file]