Merge branch 'master' into Goblin-Species

Resources/Changelog/Changelog.yml

@@ -3888,3 +3888,41 @@ Entries:
       message: Courser X is updated to current mapping standards.
   id: 4893
   time: '2024-03-30T00:03:39.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Pathfinder tweaks: replaced outer hull diagonal steel walls with
+        diagonal reinforced steel walls.
+  id: 4894
+  time: '2024-03-30T21:18:02.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated Rosebud Mk II to current mapping standards.
+  id: 4895
+  time: '2024-03-30T21:30:21.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Fix NFSD job icons
+  id: 4896
+  time: '2024-03-30T22:24:37.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        NC Gasbender tweaks: replaced medical bay with cinema lounge, removed
+        microwave, added withdrawal-only ATM.
+    - type: Tweak
+      message: >-
+        NM Searchlight tweaks: added withdrawal-only ATM, temperatures in morgue
+        lowered, added health analyzer.
+  id: 4897
+  time: '2024-03-31T07:17:56.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Tweak
+      message: Harpies are no longer fast and furious.
+  id: 4898
+  time: '2024-03-31T20:42:53.0000000+00:00'

Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl

@@ -16,3 +16,6 @@ ghost-role-information-mistake-description = Ymg' ph'nglui ah li.
 
 ghost-role-information-ert-mailcarrier-name = ERT Mail Carrier
 ghost-role-information-ert-mailcarrier-description = Assist with paperworks efforts to resolve the stations issues.
+
+ghost-role-information-jerma-name = Jerma
+ghost-role-information-jerma-description = Pog moment

Resources/Maps/_NF/Shuttles/ceres.yml

@@ -2046,7 +2046,7 @@ entities:
   - uid: 147
     components:
     - type: Transform
-      pos: -0.5,-12.5
+      pos: 3.5,-9.5
       parent: 2
   - uid: 445
     components:

Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml

@@ -119,9 +119,6 @@
         singingLayer:
           False:  {visible: false}
           True:  {visible: true}
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 2.5
-    baseSprintSpeed: 5.0
   - type: Inventory 
     speciesId: harpy
     templateId: digitigrade

Resources/Prototypes/StatusEffects/job.yml

@@ -85,7 +85,7 @@
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsddeputy
 
 - type: statusIcon
@@ -225,14 +225,14 @@
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdsheriff
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdbrigmed
 
 - type: statusIcon
@@ -260,7 +260,7 @@
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdbailiff
 
 - type: statusIcon
@@ -323,7 +323,7 @@
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdcadet
 
 - type: statusIcon
@@ -351,7 +351,7 @@
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
-    sprite: _NF/Interface/Misc/job_icons.rsi
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
     state: nfsdsergeant
 
 - type: statusIcon

Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml

@@ -18,8 +18,8 @@
   id: UplinkSecurityHardsuit
   name:  uplink-security-hardsuit-name
   description: uplink-security-hardsuit-desc
-  productEntity: ClothingOuterHardsuitSecurity
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdBronze
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_bronze.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -34,8 +34,8 @@
   id: UplinkSecurityHardsuitPatrol
   name:  uplink-security-hardsuit-patrol-name
   description: uplink-security-hardsuit-patrol-desc
-  productEntity: ClothingOuterHardsuitSecuritypatrol
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdSilver
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_silver.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -50,8 +50,8 @@
   id: UplinkSecurityHardsuitBrigmedic
   name:  uplink-security-hardsuit-brigmedic-name
   description: uplink-security-hardsuit-brigmedic-desc
-  productEntity: ClothingOuterHardsuitBrigmedic
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdBrigMed
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -66,8 +66,8 @@
   id: UplinkSecurityHardsuitWarden
   name:  uplink-security-hardsuit-warden-name
   description: uplink-security-hardsuit-warden-desc
-  productEntity: ClothingOuterHardsuitWarden
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdGold
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_gold.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:
@@ -108,8 +108,8 @@
   id: UplinkSecurityHardsuitSheriff
   name:  uplink-security-hardsuit-sheriff-name
   description: uplink-security-hardsuit-sheriff-desc
-  productEntity: ClothingOuterHardsuitSecurityRed
-  icon: { sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitNfsdSheriff
+  icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_sheriff.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:

Resources/Prototypes/_NF/Entities/Mobs/Player/jerma.yml

@@ -0,0 +1,123 @@
+- type: entity
+  parent: SimpleSpaceMobBase
+  id: MobJerma
+  suffix: ""
+  name: Jerma
+  description: Its Jerma.
+  components:
+  - type: Bloodstream
+    bloodMaxVolume: 650
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-jerma-name
+    description: ghost-role-information-jerma-description
+  - type: GhostTakeoverAvailable
+  - type: HTN
+    rootTask:
+      task: XenoCompound
+    blackboard:
+      NavInteract: !type:Bool
+        true
+      NavPry: !type:Bool
+        true
+      NavSmash: !type:Bool
+        true
+  - type: NpcFactionMember
+    factions:
+    - Dragon
+  - type: Speech
+    speechVerb: LargeMob
+  - type: CombatMode
+  - type: MobMover
+  - type: InputMover
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3
+    baseSprintSpeed: 5
+    weightlessModifier: 1.5
+  - type: Sprite
+    sprite: _NF/Mobs/Wildcards/jerma.rsi
+    scale: 0.25, 0.35
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: alive
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: alive
+      Critical:
+        Base: crit
+      Dead:
+        Base: dead
+  - type: Physics
+    bodyType: KinematicController
+  - type: MobState
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritLastWords
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      450: Critical
+      500: Dead
+  - type: Metabolizer
+    solutionOnBody: false
+    updateFrequency: 0.25
+    metabolizerTypes: [ Dragon ]
+    groups:
+    - id: Medicine
+    - id: Poison
+  - type: Butcherable
+    spawned:
+    - id: FoodCakePlain
+      amount: 2
+  - type: InteractionPopup
+    successChance: 0.25 # It's no goose, but you better smell like carp.
+    interactSuccessString: petting-success-dragon
+    interactSuccessSound:
+      collection: Jerma
+    interactFailureString: petting-failure-dragon
+    interactFailureSound:
+      collection: JermaDidi
+    soundPerceivedByOthers: false # A 75% chance for a loud roar would get old fast.
+  - type: MeleeWeapon
+    altDisarm: false
+    soundHit:
+      collection: JermaDidi
+    damage:
+      types:
+        Piercing: 15
+        Slash: 15
+  - type: Devourer
+    foodPreference: Humanoid
+    shouldStoreDevoured: true
+    chemical: Ichor
+    healRate: 15.0
+    whitelist:
+      components:
+      - MobState
+      - Door
+      tags:
+      - Wall
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - DoorBumpOpener
+    - FootstepSound
+  - type: Puller
+    needsHands: false
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Vocal
+    sounds:
+      Male: Jerma
+      Female: Jerma
+      Unsexed: Jerma
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: JermaClap

Resources/Prototypes/_NF/Shipyard/gasbender.yml

@@ -36,7 +36,6 @@
           availableJobs:
             Pilot: [ 0, 0 ]
             ChiefEngineer: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
             AtmosphericTechnician: [ 0, 0 ]
             StationEngineer: [ 0, 0 ]
             Borg: [ 0, 0 ]

Resources/Prototypes/_NF/SoundCollections/jerma.yml

@@ -0,0 +1,20 @@
+- type: soundCollection
+  id: Jerma
+  files:
+  - /Audio/_NF/Jerma/pog_in_pants.ogg
+  - /Audio/_NF/Jerma/pog_moment.ogg
+  - /Audio/_NF/Jerma/pog_moment_right_there.ogg
+  - /Audio/_NF/Jerma/soup_pizza.ogg
+  - /Audio/_NF/Jerma/thats_kinda_pog.ogg
+
+- type: soundCollection
+  id: JermaDidi
+  files:
+  - /Audio/_NF/Jerma/didi.ogg
+  - /Audio/_NF/Jerma/dididi.ogg
+  - /Audio/_NF/Jerma/satellite.ogg
+
+- type: soundCollection
+  id: JermaClap
+  files:
+  - /Audio/_NF/Jerma/clap.ogg

Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml

@@ -167,3 +167,12 @@
       collection: GoblinCry
     Whistle:
       collection: Whistles
+
+- type: emoteSounds
+  id: Jerma
+  params:
+    variation: null
+  sounds:
+    Scream:
+      collection: Jerma
+

Resources/Textures/_NF/Mobs/Wildcards/jerma.rsi/meta.json

@@ -0,0 +1,55 @@
+{
+  "version": 1,
+  "size": {
+    "x": 128,
+    "y": 128
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "A mistake",
+  "states": [
+    {
+      "name": "alive",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "crit"
+    },
+    {
+      "name": "dead"
+    }
+  ]
+}