Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Shared/CCVar/CCVars.Game.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static readonly CVarDef<int>
/// Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
/// </summary>
public static readonly CVarDef<string>
GameMap = CVarDef.Create("game.map", "HardCore", CVar.SERVERONLY); // Frontier: string.Empty<Frontier
GameMap = CVarDef.Create("game.map", "Frontier", CVar.SERVERONLY); // Frontier: string.Empty<Frontier

/// <summary>
/// Controls whether to use world persistence or not.
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,18 @@
- ClothingOuterWinterRobo
# - ClothingOuterWinterSec # Frontier
- ClothingOuterWinterCoatMail # Frontier
- ClothingLongcoatCaptain
- ClothingLongcoatCE
- ClothingLongcoatCMO
- ClothingLongcoatHoP
- ClothingLongcoatQM
- ClothingLongcoatRD
- ClothingLongcoatArashiLabs
- ClothingLongcoatNanoTrasen
- ClothingLongcoatBlack
- ClothingLongcoatBrown
- ClothingLongcoatMedic


- type: latheRecipePack
id: Ties
Expand Down
59 changes: 59 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,65 @@
id: ClothingOuterWinterSyndieCap
result: ClothingOuterWinterSyndieCap

# Command Longcoats # Frontier

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatCMO
result: ClothingLongcoatCMO

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatHoP
result: ClothingLongcoatHoP

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatCE
result: ClothingLongcoatCE

# Civilian Longcoats # Frontier

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatCaptain
result: ClothingLongcoatCaptain

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatQM
result: ClothingLongcoatQM

- type: latheRecipe
parent: BaseCommandCoatRecipe
id: ClothingLongcoatRD
result: ClothingLongcoatRD

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingLongcoatArashiLabs
result: ClothingLongcoatArashiLabs

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingLongcoatNanoTrasen
result: ClothingLongcoatNanoTrasen

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingLongcoatBlack
result: ClothingLongcoatBlack

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingLongcoatBrown
result: ClothingLongcoatBrown

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingLongcoatMedic
result: ClothingLongcoatMedic

# Hats
- type: latheRecipe
parent: BaseCommandHatRecipe
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
# Everyone

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatArashiLabs
name: arashi labs longcoat
description: A double-breasted longcoat sporting the colors of a company called Arashi Laboratories, a biotech corporation claiming to hail from the long rim, wherever that is. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/arashi-laboratories.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/arashi-laboratories.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatNanoTrasen
name: nanotrasen longcoat
description: A double-breasted longcoat sporting the the colors of NanoTrasen, the general-purpose spacefaring corporation that you (hopefully) work for! Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/nanotrasen.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/nanotrasen.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatBlack
name: black longcoat
description: A matte black double-breasted longcoat with gold-tinted brass buttons. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/black.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/black.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatBrown
name: brown longcoat
description: A matte brown double-breasted longcoat with stylish onyx buttons. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/brown.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/brown.rsi

- type: entity
parent: ClothingOuterWinterCoat # Frontier: Removed contraband tag
id: ClothingLongcoatQM
name: quartermaster's longcoat # Frontier: logistics officer's longcoat<quartermaster's longcoat
description: A saturated brown double-breasted longcoat with mossy trim, specifically designed for those with a passion for spreadsheets. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/logstics-officer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/logstics-officer.rsi

- type: entity
parent: ClothingOuterWinterCoat # Frontier: Removed contraband tag
id: ClothingLongcoatRD
name: research director's longcoat # Frontier: mystagogue's longcoat<research director's longcoat
description: A pure white double-breasted longcoat with a purple stripe, specifically designed for those dedicated to science. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/mystagogue.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/mystagogue.rsi

- type: entity
parent: ClothingOuterWinterCoat # Frontier: ClothingOuterArmorCaptainCarapace<ClothingOuterWinterCoat, removed contraband tag
id: ClothingLongcoatCaptain # Frontier: ClothingLongcoatCaptainArmored<ClothingLongcoatCaptain
name: captain's longcoat # Frontier: captain's armored longcoat>captain's longcoat
description: A navy blue double-breasted longcoat with gold embelleshments, fit for the station's best. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/captain.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/captain.rsi

- type: entity
parent: [ClothingOuterWinterCoat, BaseC1Contraband] # Frontier: ClothingOuterCoatStasecWarden<ClothingOuterWinterCoat, changed contraband tag from Command to C1
id: ClothingLongcoatFormal # Frontier: ClothingLongcoatWarden<ClothingLongcoatFormal
name: armored formal longcoat # Frontier: warden's armored longcoat<armored formal longcoat
description: A black double-breasted longcoat with silver buttons and cuffs, reinforced with light armor plates. Offers minor protection. # Frontier: Description altered to remove reference to Security.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/warden.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/warden.rsi
- type: Armor # Frontier: added armor after reparent, values are set to match mercenary webvest
modifiers:
coefficients:
Blunt: 0.7 # Frontier
Slash: 0.7 # Frontier
Piercing: 0.7 # Frontier
Heat: 0.8 # Frontier
Caustic: 0.9 # Frontier

- type: entity
parent: ClothingOuterWinterCoat # Frontier: Removed contraband tag
id: ClothingLongcoatMedic # Frontier: ClothingLongcoatBrigmedic<ClothingLongcoatMedic
name: medic's sterile longcoat # Frontier: corpsman's armored longcoat<medic's sterile longcoat
description: A black double-breasted longcoat with silver buttons, blue bands, and sterile fabric cuffs. Cut-resistant fibers provide some measure of protection against infectious bites. # Frontier: Altered description to hint at poison resistance
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/medic.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/medic.rsi
- type: Armor # Frontier - Added poison resistance
modifiers:
coefficients:
Poison: 0.8 # Frontier: Added poison resist, previously had none

- type: entity
parent: [ClothingOuterWinterCoat, BaseC1Contraband] # Frontier: ClothingOuterCoatStasecHoS<ClothingOuterWinterCoat, changed contraband tag from Command to C1
id: ClothingLongcoatRegal # Frontier: ClothingLongcoatHoS<ClothingLongcoatRegal
name: armored regal longcoat # Frontier: head of security's armored longcoat<armored regal longcoat
description: A black double-breasted longcoat with gold buttons and trim, reinforced with finely crafted plastitanium weave. A true mark of luxury. # Frontier: Altered description to avoid references to Securitye
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-security.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-security.rsi
- type: Armor # Frontier: added armor after reparent, values are set to match mercenary webvest
modifiers:
coefficients:
Blunt: 0.7 # Frontier
Slash: 0.7 # Frontier
Piercing: 0.7 # Frontier
Heat: 0.8 # Frontier
Caustic: 0.9 # Frontier
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
- type: entity
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
id: ClothingLongcoatCMO
name: chief medical officer's longcoat
description: A double-breasted longcoat with a green cross, specifically designed for the chief medical officer. Cut-resistant fibers provide some measure of protection against infectious bites. # Frontier: Description altered to hint at poison resistance
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-medical-officer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-medical-officer.rsi
- type: Armor
modifiers:
coefficients:
Slash: 0.9
Heat: 0.9
Caustic: 0.75
Poison: 0.8 # Frontier: Added poison resist, previously had none

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatCE
name: chief engineer's longcoat
description: A dark green double-breasted with LED strip trim, specifically designed for the chief engineer. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-engineer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-engineer.rsi

- type: entity
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
id: ClothingLongcoatHoP
name: head of personnel's longcoat
description: A navy blue double-breasted longcoat with red shoulderpads, specifically designed for the head of personnel. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-personnel.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-personnel.rsi
10 changes: 5 additions & 5 deletions Resources/Prototypes/_HL/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
#Triad end

- id: ArgocyteVents
#- id: XenoVents
#- id: XenoVents Triad
- id: reagentslimeVents
- id: SpaceVents
- id: CarpVents
- id: TickVents
- id: AiVents
#- id: AiVents Triad
- id: LizardVents
- id: WawaVents

Expand All @@ -109,7 +109,7 @@
- id: SleeperAgents
- id: SleeperRevolutionaries
- id: ZombieOutbreak
- id: LoneOpsSpawn
#- id: LoneOpsSpawn
#- id: WizardSpawn

# Triad change
Expand Down Expand Up @@ -302,7 +302,7 @@
pickPlayer: false
mindRoles:
- MindRoleDragon

- type: entity
parent: BaseGameRule
id: MagicDragonSpawn
Expand Down Expand Up @@ -335,7 +335,7 @@
pickPlayer: false
mindRoles:
- MindRoleDragon

- type: entity
parent: BaseGameRule
id: HoloDragonSpawn
Expand Down
Loading
Loading