Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into togglable-accent-clothing
Browse files Browse the repository at this point in the history
dvir001 authored Jan 10, 2025
2 parents a306c1a + 7848475 commit 584afff
Showing 32 changed files with 304 additions and 42 deletions.
10 changes: 10 additions & 0 deletions Resources/Audio/_NF/Jukebox/attributions.yml
Original file line number Diff line number Diff line change
@@ -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."
Binary file added Resources/Audio/_NF/Jukebox/shibamata.ogg
Binary file not shown.
Binary file added Resources/Audio/_NF/Jukebox/victory.ogg
Binary file not shown.
9 changes: 0 additions & 9 deletions Resources/Audio/_NF/Lobby/attributions.yml

This file was deleted.

Binary file removed Resources/Audio/_NF/Lobby/shibamata.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Lobby/victory.ogg
Binary file not shown.
18 changes: 18 additions & 0 deletions Resources/Changelog/Frontier.yml
Original file line number Diff line number Diff line change
@@ -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'
7 changes: 7 additions & 0 deletions Resources/Maps/_NF/Shuttles/Scrap/tide.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions Resources/Prototypes/SoundCollections/lobby.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions Resources/Prototypes/Traits/speech.yml
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
components:
- type: Accentless
removes:
- type: GoblinAccent # Frontier
- type: LizardAccent
- type: MothAccent
- type: ReplacementAccent
11 changes: 0 additions & 11 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 0 additions & 14 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 13 additions & 1 deletion Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@
state: icon
- type: RandomSpawner
prototypes:
- CrateMaterials
- CrateMaterialGlass
- CrateMaterialPlastic
- CrateMaterialPlasteel
Original file line number Diff line number Diff line change
@@ -280,7 +280,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- WeldingFuelTankFull
# Filled crates
Original file line number Diff line number Diff line change
@@ -327,7 +327,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- CrateMaterialMetalRods
- CrateMaterialPaper
Original file line number Diff line number Diff line change
@@ -142,7 +142,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- CrateMaterialMetalRods
- CrateMaterialPaper
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
Original file line number Diff line number Diff line change
@@ -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: []
Original file line number Diff line number Diff line change
@@ -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
160 changes: 160 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
Original file line number Diff line number Diff line change
@@ -908,6 +908,166 @@
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerGood

- type: loadout
id: ContractorClothingUniformJumpskirtBlackElegantDress
name: black elegant dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtBlackElegantDress

- type: loadout
id: ContractorClothingUniformJumpskirtRedElegantDress
name: red elegant dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtRedElegantDress

- type: loadout
id: ContractorClothingUniformJumpskirtGreenElegantDress
name: green elegant dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtGreenElegantDress

- type: loadout
id: ContractorClothingUniformJumpskirtBlueElegantDress
name: blue elegant dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtBlueElegantDress

- type: loadout
id: ContractorClothingUniformJumpskirtPurpleElegantDress
name: purple elegant dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtPurpleElegantDress

- type: loadout
id: ContractorClothingUniformJumpskirtCyanStripedDress
name: cyan striped dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtCyanStripedDress

- type: loadout
id: ContractorClothingUniformJumpskirtRedStripedDress
name: red striped dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtRedStripedDress

- type: loadout
id: ContractorClothingUniformJumpskirtGreenStripedDress
name: green striped dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtGreenStripedDress

- type: loadout
id: ContractorClothingUniformJumpskirtPinkStripedDress
name: pink striped dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtPinkStripedDress

- type: loadout
id: ContractorClothingUniformJumpskirtOrangeStripedDress
name: orange striped dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtOrangeStripedDress

- type: loadout
id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress
name: purple turtleneck dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress

- type: loadout
id: ContractorClothingUniformJumpskirtRedTurtleneckDress
name: red turtleneck dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress

- type: loadout
id: ContractorClothingUniformJumpskirtGreenTurtleneckDress
name: green turtleneck dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress

- type: loadout
id: ContractorClothingUniformJumpskirtBlueTurtleneckDress
name: blue turtleneck dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress

- type: loadout
id: ContractorClothingUniformJumpskirtYellowTurtleneckDress
name: yellow turtleneck dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress

- type: loadout
id: ContractorClothingUniformJumpskirtYellowOldDress
name: yellow old dress
effects:
- !type:GroupLoadoutEffect
proto: ContractorT1
price: 500
equipment:
jumpsuit: ClothingUniformJumpskirtYellowOldDress

# Punk stuff
- type: loadout
id: ContractorClothingUniformRandomPunkCroptop
17 changes: 17 additions & 0 deletions Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -176,6 +176,23 @@
- ContractorClothingUniformJumpsuitMilitaryColorPurple
- ContractorClothingUniformJumpsuitMilitaryColorLightBrown
- ContractorClothingUniformJumpsuitMilitaryColorBrown
- ContractorClothingUniformJumpskirtBlackElegantDress
- ContractorClothingUniformJumpskirtRedElegantDress
- ContractorClothingUniformJumpskirtGreenElegantDress
- ContractorClothingUniformJumpskirtBlueElegantDress
- ContractorClothingUniformJumpskirtPurpleElegantDress
- ContractorClothingUniformJumpskirtCyanStripedDress
- ContractorClothingUniformJumpskirtRedStripedDress
- ContractorClothingUniformJumpskirtGreenStripedDress
- ContractorClothingUniformJumpskirtPinkStripedDress
- ContractorClothingUniformJumpskirtOrangeStripedDress
- ContractorClothingUniformJumpskirtPurpleTurtleneckDress
- ContractorClothingUniformJumpskirtRedTurtleneckDress
- ContractorClothingUniformJumpskirtGreenTurtleneckDress
- ContractorClothingUniformJumpskirtBlueTurtleneckDress
- ContractorClothingUniformJumpskirtYellowTurtleneckDress
- ContractorClothingUniformJumpskirtYellowOldDress

fallbacks:
- ContractorClothingUniformJumpsuitColorGrey
- ContractorClothingUniformJumpskirtColorGrey
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Shipyard/tyne.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
parent: BaseVessel
name: SBB Tyne
description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations.
price: 22250 #~5% markup as it's a med ship. Appraises at ~21001.
price: 23000 #~5% markup as it's a med ship. Appraises at ~22474.
category: Small
group: Shipyard
shuttlePath: /Maps/_NF/Shuttles/tyne.yml
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -19,9 +19,21 @@
{
"name": "generic"
},
{
"name": "secure_door"
},
{
"name": "secure_open"
},
{
"name": "secure"
},
{
"name": "generic_door"
},
{
"name": "generic_open"
},
{
"name": "locked"
},
@@ -135,6 +147,12 @@
},
{
"name": "o2n2_door"
},
{
"name": "door-decal-engi-01"
},
{
"name": "door-decal-null"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Resources/_NF/migration.yml
Original file line number Diff line number Diff line change
@@ -182,6 +182,9 @@ ScienceTechFab: UnfinishedMachineFrame
ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
ScienceTechFabFlatpack: ProtolatheFlatpack

# 2024-12-27 Materials crate
CrateMaterials: LockerMaterialsBasicFilled

# 2025-01-05 Lights
ColoredLightTubeRed: LightTubeCrystalRed
ColoredBlueLightTube: LightTubeCrystalBlue

0 comments on commit 584afff

Please sign in to comment.