Merge branch 'togglable-accent-clothing' of https://github.com/Alkhee…

…mist/frontier-station-14 into togglable-accent-clothing
new-frontiers-14 · Jan 15, 2025 · 92a384f · 92a384f
2 parents 9b0643b + 584afff
commit 92a384f
Show file tree

Hide file tree

Showing 32 changed files with 304 additions and 42 deletions.
diff --git a/Resources/Audio/_NF/Jukebox/attributions.yml b/Resources/Audio/_NF/Jukebox/attributions.yml
@@ -1,3 +1,13 @@
+- files: ["victory.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
+  source: "https://github.com/Cheackraze"
+
+- files: ["shibamata.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
+  source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"
+
 - files: ["lateraligator.ogg"]
   license: "CC-BY-3.0"
   copyright: "Later Alligator By Silverman Sound Studios. Converted to mono OGG."

diff --git a/Resources/Audio/_NF/Jukebox/shibamata.ogg b/Resources/Audio/_NF/Jukebox/shibamata.ogg
diff --git a/Resources/Audio/_NF/Jukebox/victory.ogg b/Resources/Audio/_NF/Jukebox/victory.ogg
diff --git a/Resources/Audio/_NF/Lobby/attributions.yml b/Resources/Audio/_NF/Lobby/attributions.yml
diff --git a/Resources/Audio/_NF/Lobby/shibamata.ogg b/Resources/Audio/_NF/Lobby/shibamata.ogg
diff --git a/Resources/Audio/_NF/Lobby/victory.ogg b/Resources/Audio/_NF/Lobby/victory.ogg
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6292,3 +6292,21 @@ Entries:
   changes: []
   id: 5639
   time: '2025-01-08T10:17:27.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Dresses added to contractor loadout.
+  id: 5640
+  time: '2025-01-09T19:55:37.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Fix
+      message: Accentless now works on goblins.
+  id: 5641
+  time: '2025-01-10T11:01:45.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: Moved Victory and Shibamata from the lobby music to the jukebox.
+  id: 5642
+  time: '2025-01-10T17:58:03.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
@@ -1249,6 +1249,13 @@ entities:
     - type: Transform
       pos: 0.5,7.5
       parent: 2
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
 - proto: Stool
   entities:
   - uid: 170

diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -14,5 +14,3 @@
     - /Audio/Lobby/pwmur.ogg
 #    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/_NF/Lobby/victory.ogg # Frontier
-    - /Audio/_NF/Lobby/shibamata.ogg # Frontier
diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml
@@ -9,6 +9,7 @@
   components:
   - type: Accentless
     removes:
+    - type: GoblinAccent # Frontier
     - type: LizardAccent
     - type: MothAccent
     - type: ReplacementAccent

diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
@@ -1,14 +1,3 @@
-- type: cargoProduct
-  id: Materials
-  abstract: true
-  icon:
-    sprite: Objects/Materials/Sheets/metal.rsi
-    state: steel_3
-  product: CrateMaterials
-  cost: 8400 # TODO: Lower the cost back when possible
-  category: cargoproduct-category-name-materials
-  group: market
-
 - type: cargoProduct
   id: MaterialUranium
   abstract: true

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
@@ -1,17 +1,3 @@
-- type: entity
-  id: CrateMaterials
-  parent: CrateGenericSteel
-  name: materials crate
-  description: 1 stack of glass, plastic, steel, plasma and plasteel.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SheetGlass
-      - id: SheetPlastic
-      - id: SheetSteel
-      - id: SheetPlasma
-      - id: SheetPlasteel
-
 - type: entity
   id: CrateMaterialMetalRods
   parent: CrateGenericSteel

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml
@@ -0,0 +1,11 @@
+# region Materials
+- type: entity
+  parent: [ LockerMaterials, StorageFillMaterialsBasic ]
+  id: LockerMaterialsBasicFilled
+  suffix: Filled, Basic Materials (full)
+
+- type: entity
+  parent: [ LockerMaterials, StorageFillMaterialsBasic10 ]
+  id: LockerMaterialsBasic10Filled
+  suffix: Filled, Basic Materials (10)
+# endregion Materials
diff --git a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
@@ -1,3 +1,15 @@
+- type: jukebox
+  id: victory
+  name: Koruu Chan - Victory
+  path:
+    path: /Audio/_NF/Jukebox/victory.ogg
+
+- type: jukebox
+  id: shibamata
+  name: Shibamata
+  path:
+    path: /Audio/_NF/Jukebox/shibamata.ogg
+
 - type: jukebox
   id: lateraligator
   name: Silverman Sound Studios - Later Alligator
@@ -8,4 +20,4 @@
   id: frontierarrivals
   name: Troglodyte71 - Frontier Arrivals
   path:
-    path: /Audio/_NF/Jukebox/frontier-arrivals.ogg
+    path: /Audio/_NF/Jukebox/frontier-arrivals.ogg
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml
@@ -30,7 +30,6 @@
           state: icon
     - type: RandomSpawner
       prototypes:
-        - CrateMaterials
         - CrateMaterialGlass
         - CrateMaterialPlastic
         - CrateMaterialPlasteel

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -280,7 +280,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - WeldingFuelTankFull
     # Filled crates

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -327,7 +327,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - CrateMaterialMetalRods
     - CrateMaterialPaper

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
@@ -142,7 +142,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - CrateMaterialMetalRods
     - CrateMaterialPaper

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
@@ -485,6 +485,7 @@
   parent:
   - MobHumanoidHostileBase
   - MobHumanoidHostileAISimpleMelee
+  - NFMobRestrictions
   id: MobExperimentationVictim
   categories: [ HideSpawnMenu ]
   components:
@@ -501,6 +502,10 @@
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound
+    - type: NFSalvageMobRestrictions
+      despawnIfOffLinkedGrid: false
+      addComponentsOnDeath: []
+      removeComponentsOnDeath: []
 
 # Syndicate Commander, "armed" with AK
 - type: entity

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -47,6 +47,7 @@
   parent:
   - MobCleanBot
   - BaseC3SyndicateContrabandNoValue
+  - NFMobRestrictions
   id: MobCleanBotSyndie
   name: syndicate cleanbot
   description: The creep of automation now threatening space janitors with a knife.
@@ -59,3 +60,7 @@
   - type: HTN
     rootTask:
       task: CleanbotCompound
+  - type: NFSalvageMobRestrictions
+    despawnIfOffLinkedGrid: false
+    addComponentsOnDeath: []
+    removeComponentsOnDeath: []
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -56,6 +56,41 @@
     stateDoorOpen: pilot_open
     stateDoorClosed: pilot_door
 
+# Materials
+- type: entity
+  id: LockerMaterials
+  parent: NFLockerBaseSecure
+  name: materials locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: secure
+    stateDoorOpen: secure_open
+    stateDoorClosed: secure_door
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        decal1:
+          True: { visible: false }
+          False: { visible: true }
+        decal2:
+          True: { visible: false }
+          False: { visible: true }
+  - type: Sprite
+    layers:
+    - state: secure
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: secure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: door-decal-engi-01
+      map: [ decal1 ]
+      color: "#ad8c27"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
 # Wooden Cabinet
 - type: entity
   id: LockerWoodenGeneric