Merge branch 'DeltaV-Station:master' into swords

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -60,7 +60,8 @@ public sealed class PostMapInitTest
             "Hammurabi", // DeltaV
             "Lighthouse", // DeltaV
             "Micro", // DeltaV
-            "Chibi" // DeltaV
+            "Chibi", // DeltaV
+			"Elegance" // DeltaV
         };
 
         /// <summary>

Resources/Changelog/DeltaVChangelog.yml

@@ -1,39 +1,4 @@
 Entries:
-- author: Adeinitas, Timemaster99
-  changes:
-  - message: Gave Carpy the legal carp a suit or shirt.
-    type: Add
-  id: 473
-  time: '2024-08-12T22:47:30.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1456
-- author: rosieposieeee
-  changes:
-  - message: Added more access-locked blast doors for mappers.
-    type: Add
-  id: 474
-  time: '2024-08-13T12:35:00.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1615
-- author: DarkenedSynergy
-  changes:
-  - message: Nukie mouse reinforcement radios can no longer call in humans.
-    type: Fix
-  id: 475
-  time: '2024-08-13T15:55:28.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1617
-- author: portfiend
-  changes:
-  - message: Mail now shows the job icon of the recipient again.
-    type: Fix
-  id: 476
-  time: '2024-08-13T16:05:55.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1620
-- author: Velcroboy
-  changes:
-  - message: Tweaked the AME to produce power with diminishing returns
-    type: Tweak
-  id: 477
-  time: '2024-08-14T12:16:48.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1625
 - author: MilonPL
   changes:
   - message: Backpacks are now available in prisoner and gladiator loadouts.
@@ -3864,3 +3829,41 @@
   id: 972
   time: '2025-02-01T19:49:51.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2829
+- author: IAmNotGray
+  changes:
+  - message: Elegance, a service station, is now recieving crew members!
+    type: Add
+  - message: The new NTES Transport is here to take you to Central Command. _In style!_
+    type: Add
+  id: 973
+  time: '2025-02-02T04:03:34.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2020
+- author: Velcroboy
+  changes:
+  - message: Removed Hammurabi Prison Station. Map is undergoing a significant overhaul.
+      It will be back...eventually.
+    type: Remove
+  id: 974
+  time: '2025-02-02T04:32:32.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2851
+- author: Radezolid
+  changes:
+  - message: The medical multitool is no longer available as a researcheable technology.
+    type: Tweak
+  id: 975
+  time: '2025-02-02T06:08:13.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2834
+- author: Radezolid
+  changes:
+  - message: Universals are now way more expensive.
+    type: Tweak
+  id: 976
+  time: '2025-02-02T06:09:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2833
+- author: Radezolid
+  changes:
+  - message: Ported the conveyor arrows from Frontier Station!
+    type: Tweak
+  id: 977
+  time: '2025-02-02T06:12:55.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2846

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -1084,7 +1084,7 @@
       - EnergyScalpel
       - EnergyCautery
       - AdvancedRetractor
-      - OmnimedTool
+      #- OmnimedTool # DeltaV - Removed medical multi tool as a tech.
       - MedicalCyberneticEyes
   - type: Machine
     board: MedicalTechFabCircuitboard

Resources/Prototypes/Entities/Structures/conveyor.yml

@@ -12,7 +12,7 @@
   - type: Transform
     anchored: true
   - type: Sprite
-    sprite: Structures/conveyor.rsi
+    sprite: _NF/Structures/conveyor.rsi # Frontier
     state: conveyor_started_cw
     drawdepth: HighFloorObjects
   - type: ApcPowerReceiver
@@ -41,6 +41,7 @@
       - Forward
       - Off
   - type: Appearance
+  - type: SyncSprite # DeltaV
   - type: GenericVisualizer
     visuals:
       enum.ConveyorVisuals.State:

Resources/Prototypes/Maps/Pools/default.yml

@@ -7,8 +7,9 @@
   - Byoin
   - Chibi
   - Edge
+  - Elegance
   - Glacier
-  - Hammurabi
+#  - Hammurabi - undergoing extensive maintenance
   - Lighthouse
 #  - Micro - to be revisited later ~Colin
   - Pebble

Resources/Prototypes/Maps/elegance.yml

@@ -0,0 +1,77 @@
+- type: gameMap
+  id: Elegance
+  mapName: 'Elegance'
+  mapPath: /Maps/elegance.yml
+  minPlayers: 40
+  stations:
+    Elegance:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Lady Elegance {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'DV'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Transport.yml
+        - type: StationJobs
+          availableJobs:
+          #civilian
+            Passenger: [ -1, -1 ]
+            Librarian: [ 1, 1 ]
+            Boxer: [ 2, 2 ]
+          #command
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ChiefJustice: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
+            AdministrativeAssistant: [ 1, 1 ]
+          #engineering
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 4, 5 ]
+            TechnicalAssistant: [ 2, 4 ]
+          #justice
+            Clerk: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Prosecutor: [ 1, 1 ]
+          #medical
+            Chemist: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
+            MedicalDoctor: [ 4, 6 ]
+            MedicalIntern: [ 4, 4 ]
+            Psychologist: [ 1, 1 ]
+            Surgeon: [ 1, 1]
+          #security
+            Brigmedic: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            Prisoner: [ 3, 4 ]
+            PrisonGuard: [ 1, 2 ]
+            SecurityOfficer: [ 4, 6 ]
+            SecurityCadet: [ 2, 4 ]
+            Warden: [ 1, 1 ]
+          #service
+            Bartender: [ 2, 3 ]
+            Botanist: [ 2, 3 ]
+            Chef: [ 2, 3 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 2, 3 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
+            ServiceWorker: [ 4, 6 ]
+          #science
+            Chaplain: [ 1, 1 ]
+            ForensicMantis: [ 1, 1 ]
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 4, 6 ]
+            Borg: [ 2, 3 ]
+          #supply
+            CargoTechnician: [ 2, 4 ]
+            CargoAssistant: [ 2 , 2 ]
+            Courier: [ 2, 2 ]
+            SalvageSpecialist: [ 4, 4 ]

Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml

@@ -8,7 +8,7 @@
           steps:
             - tag: ConveyorAssembly
               icon:
-                sprite: Structures/conveyor.rsi
+                sprite: _NF/Structures/conveyor.rsi # Frontier
                 state: conveyor_loose
               name: conveyor belt assembly
               doAfter: 2

Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml

@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 6500
+  cost: 16500
   category: Armory
   group: market
 

Resources/Prototypes/_Shitmed/Research/civilianservices.yml

@@ -51,14 +51,16 @@
 
 # Tier 3
 
-- type: technology
-  id: HighEndSurgery
-  name: research-technology-high-end-surgery
-  icon:
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
-    state: omnimed
-  discipline: CivilianServices
-  tier: 3
-  cost: 10000
-  recipeUnlocks:
-  - OmnimedTool
+# Start DeltaV changes - Removed the medical multitool.
+#- type: technology
+#  id: HighEndSurgery
+#  name: research-technology-high-end-surgery
+#  icon:
+#    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
+#    state: omnimed
+#  discipline: CivilianServices
+#  tier: 3
+#  cost: 10000
+#  recipeUnlocks:
+#  - OmnimedTool
+# End of DeltaV changes