Merge branch 'master' of https://github.com/SerbiaStrong-220/space-st…

…ation-14 into microwave-fix
SerbiaStrong-220 · Feb 3, 2024 · 893106d · 893106d
2 parents 7906d45 + 236ee4e
commit 893106d
Show file tree

Hide file tree

Showing 9 changed files with 141,771 additions and 11 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -76,6 +76,7 @@ public sealed class PostMapInitTest
             "220Avrite",
             "220Marathon",
             "220Hive",
+            "VoidZone"
         };
 
         /// <summary>

diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml
@@ -0,0 +1,16 @@
+Entries:
+- author: Ady4
+  changes:
+  - message: "\u0417\u0430\u043C\u0435\u043D\u0435\u043D\u044B \u043F\u0430\u043A\u0435\
+      \u0442\u044B \u0441\u043E\u043B\u0438 \u0432 \u0428\u0435\u0444\u0432\u0435\u043D\
+      \u0434\u0435 \u043D\u0430 \u0441\u043E\u043B\u043E\u043D\u043A\u0438."
+    type: Tweak
+  - message: "\u0417\u0430\u043C\u0435\u043D\u0435\u043D\u044B \u043F\u0430\u043A\u0435\
+      \u0442\u044B \u0441\u043E\u043B\u0438 \u0432 \u0433\u0430\u0440\u0434\u0435\u0440\
+      \u043E\u0431\u0435 \u043F\u043E\u0432\u0430\u0440\u0430 \u043D\u0430 \u0441\u043E\
+      \u043B\u043E\u043D\u043A\u0443 \u0438 \u043F\u0430\u043A\u0435\u0442 \u0441\u043E\
+      \u043B\u0438."
+    type: Tweak
+  id: 1
+  time: '2024-01-30T11:51:26.0000000+00:00'
+  url: null
diff --git a/Resources/Maps/EventMaps/voidzone.yml b/Resources/Maps/EventMaps/voidzone.yml
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
@@ -86,7 +86,7 @@
   molarMass: 44
   color: 2887E8
   reagent: NitrousOxide
-  pricePerMole: 8 #ss220 Rebalance
+  pricePerMole: 1 #ss220 Rebalance
 
 - type: gas
   id: 8
@@ -99,4 +99,4 @@
   gasMolesVisible: 0.6
   color: 3a758c
   reagent: Frezon
-  pricePerMole: 13 #ss220 Rebalance
+  pricePerMole: 2.5 #ss220 Rebalance
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -9,6 +9,7 @@
       - id: ClothingMaskBreath
       - id: EmergencyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
@@ -28,6 +29,7 @@
       - id: ClothingMaskBreath
       - id: ExtendedEmergencyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
@@ -48,6 +50,7 @@
       - id: ClothingMaskGasSecurity
       - id: EmergencyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
@@ -67,9 +70,9 @@
     contents:
       - id: ClothingMaskBreathMedicalSecurity
       - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
+      - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
   - type: Sprite
@@ -89,6 +92,7 @@
       - id: ClothingMaskBreathMedical
       - id: EmergencyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
@@ -114,6 +118,7 @@
       - id: ClothingMaskBreath
       - id: EmergencyFunnyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull
@@ -132,6 +137,7 @@
       - id: ClothingMaskGasSyndicate
       - id: ExtendedEmergencyOxygenTankFilled
       - id: EmergencyMedipen
+      - id: SpaceMedipen # SS220 Revert deleted Medipen
       - id: Flare
       - id: FoodTinMRE
       - id: DrinkWaterBottleFull

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -41,7 +41,8 @@
         amount: 2
       - id: ReagentContainerSugar
       - id: FoodCondimentPacketSalt
-        amount: 3
+        amount: 1 # SS220 SaltRiot
+      - id: FoodShakerSalt # SS220 SaltRiot
       - id: FoodCondimentPacketPepper
         amount: 3
       - id: FoodCondimentBottleEnzyme

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -5,7 +5,7 @@
     ReagentContainerCornmeal: 2
     ReagentContainerSugar: 2
     ReagentContainerRice: 2
-    FoodCondimentPacketSalt: 4
+    FoodShakerSalt: 2 # SS220 SaltRiot
     FoodCondimentBottleEnzyme: 2
     FoodCondimentBottleHotsauce: 1
     FoodCondimentBottleKetchup: 1
@@ -20,4 +20,4 @@
     FoodButter: 4
     FoodCheese: 1
     FoodMeat: 6
-    
+
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -292,16 +292,16 @@
     emptySpriteName: hypovolemic_empty
   - type: Hypospray
     solutionName: pen
-    transferAmount: 30
+    transferAmount: 20 # SS220 Revert deleted medipen
   - type: SolutionContainerManager
     solutions:
       pen:
-        maxVol: 30
+        maxVol: 20 # SS220 Revert deleted medipen
         reagents:
           - ReagentId: Leporazine
-            Quantity: 10
+            Quantity: 10 # SS220 Revert deleted medipen
           - ReagentId: Barozine
-            Quantity: 20
+            Quantity: 10 # SS220 Revert deleted medipen
   - type: Tag
     tags: []
 

diff --git a/Resources/Prototypes/SS220/Maps/voidzone.yml b/Resources/Prototypes/SS220/Maps/voidzone.yml
@@ -0,0 +1,26 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+- type: gameMap
+  id: VoidZone
+  mapName: 'NN-271XX Зона пустоты'
+  mapPath: /Maps/EventMaps/voidzone.yml
+  minPlayers: 0
+  stations:
+    VoidZone:
+      stationProto: StandardVoidZoneStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'NN-271XX Зона пустоты'
+
+- type: entity
+  id: StandardVoidZoneStation
+  parent:
+    - BaseStation
+    - BaseStationCargo
+    - BaseStationJobsSpawning
+    - BaseStationRecords
+    - BaseStationAlertLevels
+    - BaseStationSiliconLawCrewsimov
+    - BaseStationNanotrasen
+  noSpawn: true
+  components:
+    - type: Transform