FixMerge

Content.Client/StatusIcon/StatusIconOverlay.cs

@@ -66,7 +66,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
             var countL = 0;
             var countR = 0;
-            var accOffsetL = 0;
+            var accOffsetL = 8; // Frontier: 0<8 - do not overlap the speech bubble
             var accOffsetR = 0;
             icons.Sort();
 

Resources/Changelog/Changelog.yml

@@ -6505,3 +6505,21 @@ Entries:
       message: the partycrate is now more expensive and its contents have been changed.
   id: 5224
   time: '2024-08-24T17:19:47.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Moved health status icons for medical HUDs.
+  id: 5225
+  time: '2024-08-24T22:29:12.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: >-
+        The piercing, heat, radiation and caustic armor of the captain's armored
+        spacesuit has been reduced to its old values.
+  id: 5226
+  time: '2024-08-24T23:48:49.0000000+00:00'
+- author: ThatOneGoblin25
+  changes: []
+  id: 5227
+  time: '2024-08-25T23:07:16.0000000+00:00'

Resources/Locale/en-US/_NF/guidebook/guides.ftl

@@ -52,6 +52,7 @@ guide-entry-shipyard-pioneer = Pioneer
 guide-entry-shipyard-prospector = Prospector
 guide-entry-shipyard-searchlight = Searchlight
 guide-entry-shipyard-spirit = Spirit
+guide-entry-shipyard-stasis = Stasis
 guide-entry-shipyard-vagabond = Vagabond
 
 # Rules entries

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

@@ -16,7 +16,7 @@
     damageContainers:
     - Biological
   - type: ShowHealthIcons
-    damageContainers: 
+    damageContainers:
     - Biological
 
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -53,7 +53,7 @@
         Slash: 0.4
         Piercing: 0.7
         Heat: 0.9
-        Caustic: 0.9
+        Caustic: 0.9 # Frontier
   - type: ExplosionResistance
     damageCoefficient: 0.9
   - type: GroupExamine
@@ -200,16 +200,16 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.70
-        Slash: 0.70
-        Piercing: 0.70
-        Heat: 0.80
+        Blunt: 0.7 # Frontier 0.5<0.7
+        Slash: 0.7 # Frontier 0.5<0.7
+        Piercing: 0.7 # Frontier 0.6<0.7
+        Heat: 0.8 # Frontier 0.5<0.8
         Caustic: 0.9
   - type: ClothingSpeedModifier
     walkModifier: 1.0
     sprintModifier: 1.0
   - type: ExplosionResistance
-    damageCoefficient: 0.90
+    damageCoefficient: 0.9 # Frontier 0.65<0.9
   - type: GroupExamine
 
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -298,10 +298,10 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.6
-        Heat: 0.5
-        Radiation: 0.5
-        Caustic: 0.6
+        Piercing: 0.7 #Frontier 0.6<0.7
+        Heat: 0.75 #Frontier 0.5<0.75
+        Radiation: 0.75 #Frontier 0.5<0.75
+        Caustic: 0.85 #Frontier 0.6<0.85
   - type: ClothingSpeedModifier
     walkModifier: 0.8
     sprintModifier: 0.8

Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml

@@ -4,3 +4,6 @@
     sprite: /Textures/Effects/ssd.rsi
     state: default0
   locationPreference: Left
+  priority: -1 # Frontier: should appear first
+  layer: Mod # Frontier: do not increment the position, draw "on top of" the previous icon
+  offset: 0 # Frontier: overlap the chat bubble

Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml

@@ -78,6 +78,3 @@
     - Inorganic
     - Silicon
     - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological

Resources/Prototypes/_NF/Guidebook/shipyard.yml

@@ -36,6 +36,7 @@
   - ShipyardProspector
   - ShipyardSearchlight
   - ShipyardSpirit
+  - ShipyardStasis
   - ShipyardVagabond
 
 - type: guideEntry
@@ -193,6 +194,11 @@
   name: guide-entry-shipyard-spirit
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml"
 
+- type: guideEntry
+  id: ShipyardStasis
+  name: guide-entry-shipyard-stasis
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Stasis.xml"
+
 - type: guideEntry
   id: ShipyardVagabond
   name: guide-entry-shipyard-vagabond

Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml

@@ -308,3 +308,14 @@
     sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
     state: spirit
     scale: 1.2, 1.2
+
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapStasis
+  name: "NM Stasis"
+  description: "Detailed map of a Stasis shuttle."
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: stasis
+    scale: 1.2, 1.2

Resources/Prototypes/_NF/Shipyard/eagle.yml

@@ -1,15 +1,18 @@
 # Author Info
-# GitHub: ThatOneGoblin25
-# Discord: thedaarkgoblin
+# GitHub: ThatOneGoblin25 (https://github.com/ThatOneGoblin25)
+# Discord: ???
 
-# Shuttle Notes:
-# 
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
 
+# Shuttle Notes:
+#
 - type: vessel
   id: Eagle
   name: NM Орлан
   description: Среднегабаритный медико-инженерный шаттл. Рекомендованный размер команды 3-5 человек.
-  price: 57550 
+  price: 50950 
   category: Medium
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/eagle.yml

Resources/Prototypes/_NF/Shipyard/stasis.yml

@@ -0,0 +1,38 @@
+# Author Info
+# GitHub: dustylens (https://github.com/dustylens)
+# Discord: dustylens
+
+# Maintainer Info
+# GitHub: dustylens (https://github.com/dustylens)
+# Discord: dustylens
+
+# Shuttle Notes:
+#
+- type: vessel
+  id: Stasis
+  name: NM Stasis
+  description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations.
+  price: 47000 #Appraise value 40800 with 15% markup.
+  category: Medium
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/stasis.yml
+
+- type: gameMap
+  id: Stasis
+  mapName: 'NM Stasis'
+  mapPath: /Maps/_NF/Shuttles/stasis.yml
+  minPlayers: 0
+  stations: 
+    Stasis:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Stasis {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]

Resources/ServerInfo/_NF/Guidebook/Shipyard/Stasis.xml

@@ -0,0 +1,107 @@
+<Document>
+  # STASIS-CLASS MEDICAL RESPONSE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="BannerMedical" Caption="medical"/> 
+  <GuideEntityEmbed Entity="ComputerCrewMonitoring" Caption="crew monitor"/>
+  <GuideEntityEmbed Entity="RollerBed"/>
+  <GuideEntityEmbed Entity="CryoPod"/>
+  </Box>  
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapStasis" Caption=""/>
+  </Box>
+    [color=#a4885c]Ship Size:[/color] Medium
+
+	[color=#a4885c]Recommended Crew:[/color] 1-3
+
+	[color=#a4885c]Power Gen Type:[/color] Plasma
+
+    [color=#a4885c]Base Power Draw:[/color] 27kw
+
+	[color=#a4885c]Expeditions:[/color] None
+
+	[color=#a4885c]IFF Console:[/color] None
+
+	[color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary
+
+ The Stasis is designed to meet the needs of deep space disasters that call for cryogenic and other advanced tissue restoring medicines.
+
+  # Piloting
+  <Box>
+    <GuideEntityEmbed Entity="ComputerShuttle"/>
+  </Box>
+  After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
+
+  - First, disconnect any airlocks that are connected to the dock.
+  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
+
+  # Hiring crew
+  <Box>
+    <GuideEntityEmbed Entity="ComputerStationRecords"/>
+    <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
+    <GuideEntityEmbed Entity="IntercomCommon"/>
+  </Box>
+  As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew.
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+    - Check if the APC unit's Main Breaker is toggled on.
+    - Check the APC unit's current Load* (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+
+  - Check if the P.A.C.M.A.N. generator unit is anchored to the floor.
+  - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check if the P.A.C.M.A.N. generator unit is set to HV output.
+  - Set Target Power for 30 [bold]k[/bold]W.
+  - Start the P.A.C.M.A.N. generator unit.
+  - Close radiation shielding.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  </Box>
+
+  - Check if the air canister is anchored to connector port.
+  - Check if the distribution pump is set to normal pressure (101kPa).
+  - Enable the distribution pump.
+
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+
+  - Enable waste loop pump.
+  - Disable Auto Mode on the Air Alarm in the Engine Room.
+  - Set the Air Alarm in the Engine Room to Filtering (Wide).
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check if the gyroscope is anchored, powered, and enabled.
+  - Check if the mini gravity generator is anchored, powered, and enabled.
+
+  ## Sidenotes
+
+  * - The Stasis is equipped with a secondary ventilation system for specific atmospheric needs within its surgery suite. Scrubbers, pumps and vents may be configured appropriately.
+
+</Document>

Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond maps sprited by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi Spirit map sprited by iNoahGuy/actualcatmoment (discord/github)",
+  "copyright": "Ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond maps sprited by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi Spirit map sprited by iNoahGuy/actualcatmoment (discord/github) Apothecary and Stasis maps sprited by dustylens (discord/github)",
   "size": {
     "x": 128,
     "y": 96
@@ -82,8 +82,11 @@
     {
       "name": "vagabond"
     },
-	  {
+	{
 	  "name": "spirit"
-    }
+    },
+    {
+	  "name": "stasis"
+    }  
   ]
 }