Merge branch 'master' into floof/cherrypick/ee-surgery

Content.Server/Implants/SubdermalImplantSystem.cs

@@ -22,6 +22,9 @@
 using Content.Shared.Movement.Pulling.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Map.Components;
+using Content.Shared.Zombies;
+using Content.Server.Polymorph.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.Implants;
 
@@ -39,6 +42,7 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
     [Dependency] private readonly PullingSystem _pullingSystem = default!;
     [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly PolymorphSystem _polymorphSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
     private HashSet<Entity<MapGridComponent>> _targetGrids = [];
@@ -54,6 +58,7 @@ public override void Initialize()
         SubscribeLocalEvent<SubdermalImplantComponent, ActivateImplantEvent>(OnActivateImplantEvent);
         SubscribeLocalEvent<SubdermalImplantComponent, UseScramImplantEvent>(OnScramImplant);
         SubscribeLocalEvent<SubdermalImplantComponent, UseDnaScramblerImplantEvent>(OnDnaScramblerImplant);
+        SubscribeLocalEvent<SubdermalImplantComponent, UseMagillitisSerumImplantEvent>(OnMagillitisSerumImplantImplant);
 
     }
 
@@ -222,4 +227,24 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp
         args.Handled = true;
         QueueDel(uid);
     }
+
+    private void OnMagillitisSerumImplantImplant(EntityUid uid, SubdermalImplantComponent component, UseMagillitisSerumImplantEvent args)
+    {
+        if (component.ImplantedEntity is not { } ent)
+            return;
+
+        if (HasComp<ZombieComponent>(uid))
+            return;
+
+        var polymorph = _polymorphSystem.PolymorphEntity(ent, "RampagingGorilla");
+
+        if (!polymorph.HasValue)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("magillitisserum-implant-activated-others", ("entity", polymorph.Value)), polymorph.Value, Filter.PvsExcept(polymorph.Value), true);
+        _popup.PopupEntity(Loc.GetString("magillitisserum-implant-activated-user"), polymorph.Value, polymorph.Value);
+
+        args.Handled = true;
+        QueueDel(uid);
+    }
 }

Content.Shared/Cuffs/SharedCuffableSystem.cs

@@ -472,7 +472,8 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff,
             else
             {
                 handcuff = Spawn("Zipties", Transform(user).Coordinates);
-                EnsureComp<HandcuffComponent>(handcuff);
+                var newcuffs = EnsureComp<HandcuffComponent>(handcuff);
+                newcuffs.Used = true;
             }
 
             _container.Insert(handcuff, component.Container);

Content.Shared/Implants/Components/SubdermalImplantComponent.cs

@@ -89,3 +89,8 @@ public sealed partial class UseDnaScramblerImplantEvent : InstantActionEvent
 {
 
 }
+
+public sealed partial class UseMagillitisSerumImplantEvent : InstantActionEvent
+{
+
+}

README.md

@@ -1,37 +1,19 @@
-# Einstein Engines
+# Floof Station
 
-<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="512px" /></p>
+<p align="center"><img src="https://raw.githubusercontent.com/Fansana/floofstation1/master/Resources/Textures/Logo/flooflogo.png" width="512px" /></p>
 
 ---
 
-Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14) built around the ideals and design inspirations of the Baystation family of servers from Space Station 13 with a focus on having modular code that anyone can use to make the RP server of their dreams.
-Our founding organization is based on a democratic system whereby our mutual contributors and downstreams have a say in what code goes into their own upstream.
-If you are a representative of a former downstream of Delta-V, we would like to invite you to contact us for an opportunity to represent your fork in this new upstream.
-
-Space Station 14 is inspired heavily by Space Station 13 and runs on [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), a homegrown engine written in C#.
-
-As a hard fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported.
-All code present in this repository is subject to change as desired by the council of maintainers.
-
-## Official Server Policy
-
-**No official servers will ever be made for Einstein-Engines**.
-
-In order to prevent a potential conflict of interest, we will never open any server directly using the Einstein Engines codebase itself.
-Any server claiming to be an official representation of this fork is not endorsed in any way by this organization.
-We however would like to invite anyone wishing to create a server to make a fork of Einstein Engines.
+Floof Station is a fork of [Einstein-Engines](https://github.com/Simple-Station/Einstein-Engines).
 
 ## Links
 
-[Website](https://simplestation.org) | [Discord](https://discord.gg/X4QEXxUrsJ) | [Steam(SSMV Launcher)](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/) | [Steam(WizDen Launcher)](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone](https://spacestationmultiverse.com/downloads/)
+[Steam(WizDen Launcher)](https://store.steampowered.com/app/1255460/Space_Station_14/)
 
 ## Contributing
 
 We are happy to accept contributions from anybody, come join our Discord if you want to help.
-We've got a [list of issues](https://github.com/Simple-Station/Einstein-Engines/issues) that need to be done and anybody can pick them up. Don't be afraid to ask for help in Discord either!
-
-We are currently accepting translations of the game on our main repository.
-If you would like to translate the game into another language check the #contributor-general channel in our Discord.
+We've got a [list of issues](https://github.com/Fansana/floofstation1/issues) that need to be done and anybody can pick them up. Don't be afraid to ask for help in Discord either!
 
 ## Building
 

Resources/Audio/Animals/attributions.yml

@@ -161,3 +161,8 @@
   copyright: "Created by fujiwaranao"
   license: "CC-BY-NC-SA-4.0"
   source: "https://github.com/space-wizards/space-station-14/pull/27578"
+
+- files: ["gorilla.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from ParadiseSS13"
+  source: "https://github.com/ParadiseSS13/Paradise/pull/20830"

Resources/Changelog/Floof.yml

@@ -2308,3 +2308,67 @@ Entries:
   id: 288
   time: '2025-01-16T14:59:22.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/485
+- author: VividPups
+  changes:
+    - type: Add
+      message: Clean grenades crate buyable from cargo
+  id: 289
+  time: '2025-01-17T11:22:58.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/491
+- author: Dunrab
+  changes:
+    - type: Tweak
+      message: Tweaked Edge based on community feedback
+  id: 290
+  time: '2025-01-18T11:37:52.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/490
+- author: fenndragon
+  changes:
+    - type: Add
+      message: Added some old powers back
+    - type: Tweak
+      message: 'Tweaked the Revenant Sprite '
+  id: 291
+  time: '2025-01-18T11:38:58.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/487
+- author: FoxxoTrystan
+  changes:
+    - type: Fix
+      message: Fixed cyborg zipties being unable to be removed.
+  id: 292
+  time: '2025-01-18T11:39:57.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/484
+- author: fenndragon
+  changes:
+    - type: Add
+      message: Added Salvage Qborg
+  id: 293
+  time: '2025-01-18T11:41:19.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/486
+- author: fenndragon
+  changes:
+    - type: Add
+      message: Added new xenonids
+    - type: Tweak
+      message: 'Tweaked xenonid values '
+  id: 294
+  time: '2025-01-18T12:18:14.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/488
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: magillitis serum implanter for 5 TC.
+    - type: Add
+      message: Cargorilla
+    - type: Tweak
+      message: Gorilla are now hostile and will punch the shit out of you.
+  id: 295
+  time: '2025-01-18T12:19:48.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/483
+- author: WhiteLightningTwister
+  changes:
+    - type: Tweak
+      message: Reworked Saltern based on player feedback.
+  id: 296
+  time: '2025-01-18T12:26:46.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/451

Resources/Locale/en-US/implant/implant.ftl

@@ -20,6 +20,8 @@ implanter-contained-implant-text = [color=green]{$desc}[/color]
 ## Implant Popups
 
 scramble-implant-activated-popup = Your appearance shifts and changes!
+magillitisserum-implant-activated-user = You feel your muscles swell and your hair grow as you return to monke.
+magillitisserum-implant-activated-others = {CAPITALIZE(THE($entity))} swells and their hair grows rapidly. Uh oh!.
 
 ## Implant Messages
 

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -194,6 +194,9 @@ uplink-death-acidifier-implant-desc = Completely melts the user and their equipm
 uplink-micro-bomb-implanter-name = Micro Bomb Implanter
 uplink-micro-bomb-implanter-desc = Explode on death or manual activation with this implant. Destroys the body with all equipment.
 
+uplink-magillitis-serum-implanter-name = Magillitis Serum Implanter
+uplink-magillitis-serum-implanter-desc = An experimental biochip which causes irreversable rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas.
+
 # Bundles
 uplink-observation-kit-name = Observation Kit
 uplink-observation-kit-desc = Includes syndicate crew monitor, high power cell and security hud disguised as sunglasses.