]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove rest of Geras files (#30912)
authorKillerqu00 <47712032+Killerqu00@users.noreply.github.com>
Sun, 11 Aug 2024 18:01:00 +0000 (20:01 +0200)
committerGitHub <noreply@github.com>
Sun, 11 Aug 2024 18:01:00 +0000 (14:01 -0400)
remove remaining geras stuff

Content.Server/Geras/GerasComponent.cs [deleted file]
Content.Server/Geras/GerasSystem.cs [deleted file]
Content.Shared/Geras/SharedGerasSystem.cs [deleted file]
Resources/Locale/en-US/geras/geras.ftl [deleted file]
Resources/Prototypes/Actions/types.yml
Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
Resources/Prototypes/Polymorphs/polymorph.yml

diff --git a/Content.Server/Geras/GerasComponent.cs b/Content.Server/Geras/GerasComponent.cs
deleted file mode 100644 (file)
index df1fccd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Geras;
-
-/// <summary>
-/// This component assigns the entity with a polymorph action.
-/// </summary>
-[RegisterComponent]
-public sealed partial class GerasComponent : Component
-{
-    [DataField] public ProtoId<PolymorphPrototype> GerasPolymorphId = "SlimeMorphGeras";
-
-    [DataField] public EntProtoId GerasAction = "ActionMorphGeras";
-
-    [DataField] public EntityUid? GerasActionEntity;
-}
diff --git a/Content.Server/Geras/GerasSystem.cs b/Content.Server/Geras/GerasSystem.cs
deleted file mode 100644 (file)
index f83f7c1..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Server.Polymorph.Systems;
-using Content.Shared.Zombies;
-using Content.Server.Actions;
-using Content.Server.Popups;
-using Content.Shared.Geras;
-using Robust.Shared.Player;
-
-namespace Content.Server.Geras;
-
-/// <inheritdoc/>
-public sealed class GerasSystem : SharedGerasSystem
-{
-    [Dependency] private readonly PolymorphSystem _polymorphSystem = default!;
-    [Dependency] private readonly ActionsSystem _actionsSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<GerasComponent, MorphIntoGeras>(OnMorphIntoGeras);
-        SubscribeLocalEvent<GerasComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<GerasComponent, EntityZombifiedEvent>(OnZombification);
-    }
-
-    private void OnZombification(EntityUid uid, GerasComponent component, EntityZombifiedEvent args)
-    {
-        _actionsSystem.RemoveAction(uid, component.GerasActionEntity);
-    }
-
-    private void OnMapInit(EntityUid uid, GerasComponent component, MapInitEvent args)
-    {
-        // try to add geras action
-        _actionsSystem.AddAction(uid, ref component.GerasActionEntity, component.GerasAction);
-    }
-
-    private void OnMorphIntoGeras(EntityUid uid, GerasComponent component, MorphIntoGeras args)
-    {
-        if (HasComp<ZombieComponent>(uid))
-            return; // i hate zomber.
-
-        var ent = _polymorphSystem.PolymorphEntity(uid, component.GerasPolymorphId);
-
-        if (!ent.HasValue)
-            return;
-
-        _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-others", ("entity", ent.Value)), ent.Value, Filter.PvsExcept(ent.Value), true);
-        _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-user"), ent.Value, ent.Value);
-
-        args.Handled = true;
-    }
-}
diff --git a/Content.Shared/Geras/SharedGerasSystem.cs b/Content.Shared/Geras/SharedGerasSystem.cs
deleted file mode 100644 (file)
index 8c99837..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared.Geras;
-
-/// <summary>
-/// Geras is the god of old age, and A geras is the small morph of a slime. This system allows the slimes to have the morphing action.
-/// </summary>
-public abstract class SharedGerasSystem : EntitySystem
-{
-
-}
-
-public sealed partial class MorphIntoGeras : InstantActionEvent
-{
-
-}
diff --git a/Resources/Locale/en-US/geras/geras.ftl b/Resources/Locale/en-US/geras/geras.ftl
deleted file mode 100644 (file)
index 3cd3f10..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-geras-popup-morph-message-user = You shift and morph into a small version of you!
-geras-popup-morph-message-others = {CAPITALIZE(THE($entity))} shifts and morphs into a blob of slime!
index af1333e14c5be58460d8e497b56bede90bb93a36..4fa9ed3135eecba234948d4a0ddf951df9c39926 100644 (file)
       state: icon
     event: !type:UseDnaScramblerImplantEvent
 
-- type: entity
-  id: ActionMorphGeras
-  name: Morph into Geras
-  description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
-  components:
-  - type: ConfirmableAction
-    popup: gera-transformation-popup
-  - type: InstantAction
-    itemIconStyle: BigAction
-    useDelay: 10 # prevent spam
-    priority: -20
-    icon:
-      sprite: Mobs/Aliens/slimes.rsi
-      state: blue_adult_slime
-    event: !type:MorphIntoGeras
-
 - type: entity
   id: ActionToggleSuitPiece
   name: Toggle Suit Piece
index b5929620eed222d21ae6c3f0cdf6e085efe90d30..9d8a851551799842cf30840197c55e7cd1bf520f 100644 (file)
     rootTask:
       task: SimpleHostileCompound
 
-- type: entity
-  name: geras
-  description: A geras of a slime - the name is ironic, isn't it?
-  id: MobSlimesGeras
-  parent: BaseMobAdultSlimes
-  categories: [ HideSpawnMenu ]
-  components:
-  # they portable...
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 3
-    baseSprintSpeed: 5 # +.5 from normal movement speed
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      80: Dead # weak af tho
-  - type: NpcFactionMember
-    factions:
-    - NanoTrasen
-  - type: MultiHandedItem
-  - type: Item
-    size: Huge
-  - type: Sprite
-    color: "#FFFFFF55"
-  - type: MeleeWeapon
-    attackRate: 2
-    damage:
-      types:
-        Blunt: 4
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: blue_adult_slime
-      Dead:
-        Base: blue_adult_slime_dead
-
 - type: entity
   name: blue slime
   id: MobAdultSlimesBlue
index a1a805c74fcdb27570f2370c8e60c524e2908c9a..96739a50d3caff0fc452cce3231ad1e982b4017b 100644 (file)
     inventory: Transfer
     revertOnDeath: true
 
-- type: polymorph
-  id: SlimeMorphGeras
-  configuration:
-    entity: MobSlimesGeras
-    transferName: true
-    transferHumanoidAppearance: false
-    inventory: Drop
-    transferDamage: true
-    revertOnDeath: true
-    revertOnCrit: true
-
 # this is a test for transferring some visual appearance stuff
 - type: polymorph
   id: TestHumanMorph