Glacier Port (#277)

🆑 april and Fox - tweak: Glacier has been updated to a newer version, bringing back the atmosphere and removing the ground. - add: Biogenerators have been added and currently only exist on Glacier! --------- Co-authored-by: deltanedas <[email protected]> Co-authored-by: Nemanja <[email protected]>
TheDenSS14 · Feb 23, 2025 · 1279871 · 1279871
1 parent 2836715
commit 1279871
Show file tree

Hide file tree

Showing 28 changed files with 12,315 additions and 10,308 deletions.
diff --git a/Content.Server/Materials/Components/ProduceMaterialExtractorComponent.cs b/Content.Server/Materials/Components/ProduceMaterialExtractorComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Materials;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Materials.Components;
+
+/// <summary>
+/// This is used for a machine that turns produce into a specified material.
+/// </summary>
+[RegisterComponent, Access(typeof(ProduceMaterialExtractorSystem))]
+public sealed partial class ProduceMaterialExtractorComponent : Component
+{
+    /// <summary>
+    /// The material that produce is converted into
+    /// </summary>
+    [DataField]
+    public ProtoId<MaterialPrototype> ExtractedMaterial = "Biomass";
+
+    /// <summary>
+    /// List of reagents that determines how much material is yielded from a produce.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<ReagentPrototype>> ExtractionReagents = new()
+    {
+        "Nutriment"
+    };
+
+    [DataField]
+    public SoundSpecifier? ExtractSound = new SoundPathSpecifier("/Audio/Effects/waterswirl.ogg");
+}
diff --git a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using Content.Server.Botany.Components;
+using Content.Server.Materials.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Interaction;
+using Robust.Server.Audio;
+
+namespace Content.Server.Materials;
+
+public sealed class ProduceMaterialExtractorSystem : EntitySystem
+{
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ProduceMaterialExtractorComponent, AfterInteractUsingEvent>(OnInteractUsing);
+    }
+
+    private void OnInteractUsing(Entity<ProduceMaterialExtractorComponent> ent, ref AfterInteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!this.IsPowered(ent, EntityManager))
+            return;
+
+        if (!TryComp<ProduceComponent>(args.Used, out var produce))
+            return;
+
+        if (!_solutionContainer.TryGetSolution(args.Used, produce.SolutionName, out var solution))
+            return;
+
+        // Can produce even have fractional amounts? Does it matter if they do?
+        // Questions man was never meant to answer.
+        var matAmount = solution.Value.Comp.Solution.Contents
+            .Where(r => ent.Comp.ExtractionReagents.Contains(r.Reagent.Prototype))
+            .Sum(r => r.Quantity.Float());
+        _materialStorage.TryChangeMaterialAmount(ent, ent.Comp.ExtractedMaterial, (int) matAmount);
+
+        _audio.PlayPvs(ent.Comp.ExtractSound, ent);
+        QueueDel(args.Used);
+        args.Handled = true;
+    }
+}
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -5,3 +5,4 @@ id-card-access-level-prosecutor = Prosecutor
 id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
+id-card-access-level-robotics = Robotics
diff --git a/Resources/Locale/en-US/lathe/components/lathe-component.ftl b/Resources/Locale/en-US/lathe/components/lathe-component.ftl
@@ -1,2 +1,4 @@
 lathe-component-upgrade-speed = speed
 lathe-component-upgrade-material-use = material use
+
+lathe-component-output-slot-beaker-name = Beaker slot
diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -6,3 +6,7 @@ lathe-category-robotics = Robotics
 lathe-category-tacsuits = Tacsuits
 lathe-category-tools = Tools
 lathe-category-weapons = Weapons
+
+lathe-category-food = Food
+lathe-category-chemicals = Chemicals
+lathe-category-materials = Materials
diff --git a/Resources/Maps/TheDen/glacier.yml b/Resources/Maps/TheDen/glacier.yml
diff --git a/Resources/Migrations/denMigrations.yml b/Resources/Migrations/denMigrations.yml
@@ -2,10 +2,6 @@ PlushieTrystan: PlushieDignifiedVulp
 PlushieDino: null
 PlushieChillHuman: null
 PlushieSlimeTider: null
-AirlockMaintRoboticsLocked: null
-AirlockRoboticsGlassLocked: null
-AirlockRoboticsLocked: null
-Biogenerator: null
 BoxEnvelope: null
 CigPackCandy: null
 CigPackPurple: null
@@ -46,3 +42,6 @@ SpawnPointCargoAssistant: null
 ToiletGoldenDirtyWater: null
 WoodenKegBeer: null
 WoodenKegWine: null
+FoodDonutBluePumpkin: FoodDonutBlumpkin
+FoodDonutJellyBluePumpkin: FoodDonutJellyBlumpkin
+SpawnPointSecurityBorg: null
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -48,6 +48,7 @@
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
   - Clerk # DeltaV - Add Clerk access
+  - Robotics # DeltaV: Robotics access
   - Corpsman # DeltaV - Add Corpsman access
   - BlueshieldOfficer # Goobstation - Add BSO Access
   - NanotrasenRepresentative # Goobstation - Add NTR Access
@@ -81,3 +82,4 @@
   - Atmospherics
   - Library # DeltaV - Add Library access
   - Justice # DeltaV - Add Justice dept access
+  - Robotics # DeltaV: Robotics access
diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/research.yml
@@ -11,4 +11,5 @@
   tags:
   - ResearchDirector
   - Research
-  - Mantis # DeltaV - Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+  - Robotics # DeltaV: Robotics access
diff --git a/Resources/Prototypes/DeltaV/Access/epistemics.yml b/Resources/Prototypes/DeltaV/Access/epistemics.yml
@@ -1,3 +1,7 @@
 - type: accessLevel
   id: Mantis
   name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors
+
+- type: accessLevel
+  id: Robotics
+  name: id-card-access-level-robotics
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -24,6 +24,7 @@
     - Salvage
     - Cargo
     - Research
+    - Robotics # would be silly if they couldn't go to robo
     - Service
     - Maintenance
     - External

diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
@@ -65,3 +65,16 @@
       - state: green
       - sprite: DeltaV/Markers/jobs.rsi
         state: adminassistant
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointRoboticist
+  name: roboticist
+  components:
+  - type: SpawnPoint
+    job_id: Scientist # TODO: change to Roboticist after merged
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: roboticist
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml
@@ -0,0 +1,7 @@
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsRobotics
+  suffix: Robotics, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]] # Uses research access until the job is added
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -162,6 +162,16 @@
     - type: GridFill
       path: /Maps/Shuttles/DeltaV/sub_escape_pod.yml
 
+- type: entity
+  parent: AirlockRobotics
+  id: AirlockRoboticsLocked
+  suffix: Robotics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRobotics ]
+
+#Add airlocks from upstream roles
 - type: entity
   parent: Airlock
   id: AirlockBoxerLocked
@@ -325,6 +335,15 @@
     containers:
       board: [ DoorElectronicsPsychologist ]
 
+- type: entity
+  parent: AirlockRoboticsGlass
+  id: AirlockRoboticsGlassLocked
+  suffix: Robotics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRobotics ]
+
 # Maintenance Hatches
 - type: entity
   parent: AirlockMaint
@@ -407,6 +426,15 @@
     containers:
       board: [ DoorElectronicsSecurityLawyer ]
 
+- type: entity
+  parent: AirlockMaintRnDLocked
+  id: AirlockMaintRoboticsLocked
+  suffix: Robotics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRobotics ]
+
 # Command-locked External airlocks. These don't exist upstream for some reason.
 - type: entity
   parent: AirlockExternal

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: BlastDoor
+  id: BlastDoorUnlinkedRobotics
+  suffix: Robotics
+  components:
+  - type: AccessReader
+    access: [["Robotics"]]
+
+- type: entity
+  parent: BlastDoorOpen
+  id: BlastDoorUnlinkedRoboticsOpen
+  suffix: Open, Robotics
+  components:
+  - type: AccessReader
+    access: [["Robotics"]]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -66,3 +66,105 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsLawyer ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureMantisLocked
+  suffix: Mantis, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMantis ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureRoboticsLocked
+  suffix: Robotics, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRobotics ]
+
+#Add windoors from upstream roles
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBoxer ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClown ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMime ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMusician ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsReporter ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLibrary ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsZookeeper ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureCorpsmanLocked
+  suffix: Corpsman, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCorpsman ]
+  - type: Wires
+    layoutId: AirlockCommand
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecurePsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsPsychologist ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/switch.yml
@@ -0,0 +1,7 @@
+- type: entity
+  parent: LockableButton
+  suffix: Robotics
+  id: LockableButtonRobotics
+  components:
+  - type: AccessReader
+    access: [["Robotics"]]
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -475,18 +475,6 @@
       - sprite: DeltaV/Markers/jobs.rsi # DeltaV - Epistemics new labcoats
         state: scientist
 
-- type: entity
-  id: SpawnPointRoboticist
-  parent: SpawnPointJobBase
-  name: roboticist
-  components:
-  - type: SpawnPoint
-    job_id: Roboticist
-  - type: Sprite
-    layers:
-    - state: green
-    - state: roboticist
-
 # Security
 
 - type: entity