juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bagel-sec-count

Browse Source
This commit is contained in:
Damn Feds
2025-04-11 22:41:46 +12:00
parent a8e347c606 812d47bb2d
commit d66c59d38d
94 changed files with 1447 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Prototypes/Catalog/Bounties/bounties.yml
View File

@@ -529,6 +529,9 @@
whitelist:
components:
- HitscanBatteryAmmoProvider
blacklist:
components:
- PowerCell
- type: cargoBounty
id: BountyFood

4
Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
View File

@@ -79,9 +79,7 @@
group: market
#- type: cargoProduct
# name: "water vapor canister"
# id: AtmosphericsWaterVapor
# description: "Water vapor canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: water_vapor
@@ -101,9 +99,7 @@
group: market
#- type: cargoProduct
# name: "tritium canister"
# id: AtmosphericsTritium
# description: "Tritium canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: green

2
Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
View File

@@ -29,9 +29,7 @@
group: market
- type: cargoProduct
name: "emitter crate"
id: EngineSingularityEmitter
description: "Contains an emitter. Used only for dangerous applications."
icon:
sprite: Structures/Power/Generation/Singularity/emitter.rsi
state: emitter2

2
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
View File

@@ -18,7 +18,6 @@
- type: cargoProduct
id: CrateVendingMachineRestockChefvend
name: ChefVend restock crate
icon:
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
@@ -59,7 +58,6 @@
- type: cargoProduct
id: CrateVendingMachineRestockCondimentStation
name: condiment station restock crate
icon:
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base

20
Resources/Prototypes/Catalog/Fills/Backpacks/backpack.yml Normal file
View File

@@ -0,0 +1,20 @@
- type: entity
parent: ClothingBackpackSyndicate
id: ClothingBackpackSyndicateBundle
abstract: true
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: entity
parent: ClothingBackpackSyndicateBundle
id: ClothingBackpackSyndicateRaidBundle
name: syndicate raid suit bundle
description: "Contains the Syndicate's durable raid armor suit."
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorRaid
- id: ClothingHeadHelmetRaid
- id: ClothingMaskGasSyndicate
- id: ClothingHandsGlovesCombat

13
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
View File

@@ -226,19 +226,6 @@
- id: DoubleEmergencyOxygenTankFilled
- id: DoubleEmergencyNitrogenTankFilled
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateRaidBundle
name: syndicate raid suit bundle
description: "Contains the Syndicate's durable raid armor suit."
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorRaid
- id: ClothingHeadHelmetRaid
- id: ClothingMaskGasSyndicate
- id: ClothingHandsGlovesCombat
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateHardsuitBundle

2
Resources/Prototypes/Catalog/uplink_catalog.yml
View File

@@ -1624,7 +1624,7 @@
name: uplink-syndie-raid-name
description: uplink-syndie-raid-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateRaidBundle
productEntity: ClothingBackpackSyndicateRaidBundle
cost:
Telecrystal: 8
categories:

2
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
View File

@@ -179,6 +179,8 @@
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 2
- type: Item
size: Normal
- type: entity
parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]

4
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
View File

@@ -133,7 +133,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetective
name: hard-worn suit
name: hard-worn suitskirt
description: Someone who wears this means business.
components:
- type: Sprite
@@ -144,7 +144,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetectiveGrey
name: noir suit
name: noir suitskirt
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite

140
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View File

@@ -14,11 +14,19 @@
- ReagentId: Cola
Quantity: 30
maxVol: 30
grindable:
reagents: # 5u -> 1/2 steel sheet (10u)
- ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron.
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: MixableSolution
solution: drink
- type: SolutionTransfer
canChangeTransferAmount: true
maxTransferAmount: 15
- type: Extractable
grindableSolutionName: grindable
- type: UserInterface
interfaces:
enum.TransferAmountUiKey.Key:
@@ -81,6 +89,12 @@
reagents:
- ReagentId: Cola
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Tag
tags:
- Cola
@@ -101,6 +115,12 @@
solutions:
drink:
maxVol: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Openable
opened: true
- type: Sprite
@@ -129,6 +149,12 @@
reagents:
- ReagentId: IcedTea
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
- type: Item
@@ -147,6 +173,12 @@
reagents:
- ReagentId: LemonLime
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/lemon-lime.rsi
- type: Item
@@ -165,6 +197,12 @@
reagents:
- ReagentId: LemonLimeCranberry
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
- type: Item
@@ -216,6 +254,12 @@
reagents:
- ReagentId: GrapeSoda
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/purple_can.rsi
- type: Item
@@ -234,6 +278,12 @@
reagents:
- ReagentId: RootBeer
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/rootbeer.rsi
- type: Item
@@ -255,6 +305,12 @@
reagents:
- ReagentId: SodaWater
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/sodawater.rsi
@@ -272,6 +328,12 @@
reagents:
- ReagentId: SpaceMountainWind
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
- type: Item
@@ -290,6 +352,12 @@
reagents:
- ReagentId: SpaceUp
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/space-up.rsi
- type: Item
@@ -308,6 +376,12 @@
reagents:
- ReagentId: SolDry
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/sol_dry.rsi
- type: Item
@@ -326,6 +400,12 @@
reagents:
- ReagentId: Starkist
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/starkist.rsi
- type: Item
@@ -344,6 +424,12 @@
reagents:
- ReagentId: TonicWater
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/tonic.rsi
@@ -361,6 +447,12 @@
reagents:
- ReagentId: FourteenLoko
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
- type: Item
@@ -379,6 +471,12 @@
reagents:
- ReagentId: ChangelingSting
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/changelingsting.rsi
@@ -398,6 +496,12 @@
reagents:
- ReagentId: DrGibb
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/dr_gibb.rsi
@@ -421,6 +525,12 @@
Quantity: 20
- ReagentId: Ice
Quantity: 5
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Tag
tags:
- DrinkCan
@@ -443,6 +553,12 @@
reagents:
- ReagentId: EnergyDrink
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/energy_drink.rsi
@@ -515,6 +631,12 @@
reagents:
- ReagentId: ShamblersJuice
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/shamblersjuice.rsi
@@ -534,6 +656,12 @@
reagents:
- ReagentId: PwrGame
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/pwrgame.rsi
@@ -553,6 +681,12 @@
reagents:
- ReagentId: Beer
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/beer_can.rsi
@@ -575,6 +709,12 @@
reagents:
- ReagentId: Wine
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/wine_can.rsi

100
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
View File

@@ -382,6 +382,13 @@
reagents:
- ReagentId: Ichor
Quantity: 10
- type: SliceableFood
count: 3
slice: FoodMeatDragonCutlet
- type: Construction
graph: DragonSteak
node: start
defaultTarget: dragon steak
- type: entity
name: raw rat meat
@@ -1243,6 +1250,41 @@
graph: AnomalyMeatSteak
node: anomaly steak
- type: entity
name: dragon steak
parent: FoodMeatBase
id: FoodMeatDragonCooked
description: Pouring ketchup on this is considered a capital crime on most stations.
components:
- type: Tag
tags:
- Cooked
- Meat
- Steak
- type: Sprite
layers:
- state: dragon-cooked
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Ichor
Quantity: 6
- ReagentId: Nutriment
Quantity: 6
- ReagentId: Protein
Quantity: 6
- type: SliceableFood
count: 3
slice: FoodMeatDragonCutletCooked
- type: Construction
graph: DragonSteak
node: dragon steak
- type: FoodSequenceElement
entries:
Burger: DragonSteak
Taco: DragonSteak
# Cutlets
# Raw
@@ -1505,6 +1547,33 @@
- ReagentId: Protein
Quantity: 1
- type: entity
name: raw dragon cutlet
parent: FoodMeatBase
id: FoodMeatDragonCutlet
description: A raw dragon meat cutlet.
components:
- type: Tag
tags:
- Raw
- Cutlet
- Meat
- type: Sprite
layers:
- state: dragoncutlet
- state: dragoncutlet_veins
shader: unshaded
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Ichor
Quantity: 3
- type: Construction
graph: DragonCutlet
node: start
defaultTarget: dragon cutlet
# Cooked
- type: entity
@@ -1746,3 +1815,34 @@
entries:
Burger: XenoCutlet
Taco: XenoCutlet
- type: entity
name: dragon cutlet
parent: FoodMeatBase
id: FoodMeatDragonCutletCooked
description: It's a meal for kings!
components:
- type: Tag
tags:
- Cooked
- Cutlet
- Meat
- type: Sprite
state: dragoncutlet-cooked
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Ichor
Quantity: 2
- ReagentId: Nutriment
Quantity: 2
- ReagentId: Protein
Quantity: 2
- type: Construction
graph: DragonCutlet
node: dragon cutlet
- type: FoodSequenceElement
entries:
Burger: DragonCutlet
Taco: DragonCutlet

8
Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
View File

@@ -31,8 +31,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DisassembleOnAltVerb
prototype: InflatableWallStack1
doAfter: 3
prototypeToSpawn: InflatableWallStack1
disassembleTime: 3
- type: Airtight
- type: Transform
anchored: true
@@ -79,7 +79,7 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DisassembleOnAltVerb
prototype: InflatableDoorStack1
doAfter: 3
prototypeToSpawn: InflatableDoorStack1
disassembleTime: 3
- type: Occluder
enabled: false

14
Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
View File

@@ -13,7 +13,7 @@
- state: icon
- state: scanner
shader: unshaded
visible: true
visible: false
map: [ "enum.PowerDeviceVisualLayers.Powered" ]
- type: RadarConsole
maxRange: 256
@@ -48,18 +48,6 @@
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
- type: Item
size: Normal
sprite: Objects/Tools/handheld_mass_scanner.rsi
- type: Sprite
sprite: Objects/Tools/handheld_mass_scanner.rsi
state: icon
layers:
- state: icon
- state: scanner
shader: unshaded
visible: false
map: [ "enum.PowerDeviceVisualLayers.Powered" ]
- type: entity
id: HandHeldMassScannerBorg

2
Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
View File

@@ -2,7 +2,7 @@
name: spider clan charge
description: A modified C-4 charge supplied to you by the Spider Clan. Its explosive power has been juiced up, but only works in one specific area.
# not actually modified C-4! oh the horror!
parent: BaseItem
parent: [ BaseItem, BaseMajorContraband ]
id: SpiderCharge
components:
- type: Sprite

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View File

@@ -40,7 +40,7 @@
- type: entity
name: Kardashev-Mosin
parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband]
parent: [BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband]
id: WeaponSniperMosin
description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
components:

11
Resources/Prototypes/Entities/Structures/Machines/holopad.yml
View File

@@ -14,17 +14,6 @@
radius: 0.25
mask:
- Impassable
- HighImpassable
- MidImpassable
fix2:
shape:
!type:PhysShapeCircle
radius: 0.25
mask:
- MachineLayer
layer:
- LowImpassable
hard: false
- type: ApcPowerReceiver
powerLoad: 300
- type: StationAiVision

42
Resources/Prototypes/Maps/amber.yml
View File

@@ -16,11 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_amber.yml
- type: StationJobs
availableJobs:
# command
availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
#service
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (14)
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -28,39 +33,34 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Reporter: [ 1, 1 ]
#engineering (5 - 7)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 2, 4 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 2, 2 ] #intern, not counted
#medical (9 - 11)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 6 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 2, 2 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (4 - 6)
Scientist: [ 4, 6 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (8 - 10)
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 6 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
SecurityCadet: [ 2, 2 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (6 - 7)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 4 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 1, 1 ]
#silicon
#silicon (4)
StationAi: [ 1, 1 ]
Borg: [ 3, 3 ]

34
Resources/Prototypes/Maps/bagel.yml
View File

@@ -19,8 +19,13 @@
availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns
#command
Captain: [ 1, 1 ]
#service
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (13 - 14)
Bartender: [ 1, 2 ]
Botanist: [ 2, 2 ]
Chef: [ 2, 2 ]
@@ -28,38 +33,33 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Reporter: [ 2, 2 ]
#engineering (7)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (6)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ]
#security (10)
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 6 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (6)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 2, 2 ]
#silicon
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

41
Resources/Prototypes/Maps/box.yml
View File

@@ -15,10 +15,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 63 jobs total w/o latejoins & interns, 81 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (14)
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
Librarian: [ 1, 1 ]
Reporter: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (8)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, exclude from dept count
#medical (8)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
MedicalIntern: [ 4, 4 ] #intern, exclude from dept count
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 4, 4 ] #intern, exclude from dept count
#security (9 - 11)
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 4 ]
SecurityCadet: [ 2, 4 ] #intern, exclude from dept count
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (6)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
Borg: [ 2, 2 ]

41
Resources/Prototypes/Maps/convex.yml
View File

@@ -14,11 +14,17 @@
prefixCreator: '14-SM'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
- type: StationJobs
- type: StationJobs # 74 jobs total w/o latejoins & interns, 93 jobs total w/ latejoins & interns
availableJobs:
#service
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (18 - 19)
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Reporter: [ 1, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Boxer: [2, 2]
#engineering (8)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (10)
Chemist: [ 3, 3 ]
MedicalDoctor: [ 6, 6 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 6, 6 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 6, 6 ] #intern, not counted
#security (12)
Warden: [ 1, 1 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (7)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Boxer: [2, 2]
#silicon
#silicon (4)
StationAi: [ 1, 1 ]
Borg: [ 3, 3 ]

51
Resources/Prototypes/Maps/core.yml
View File

@@ -18,50 +18,51 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_core.yml
- type: StationJobs
availableJobs:
#service
Bartender: [ 2, 2 ]
Botanist: [ 2, 2]
Chef: [ 1, 1 ]
Janitor: [ 2, 2 ]
availableJobs: # 56 jobs total w/o latejoins & interns, 64 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (16)
Bartender: [ 2, 2 ]
Botanist: [ 2, 2 ]
Chef: [ 1, 1 ]
Janitor: [ 2, 2 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Boxer: [ 2, 2 ]
Reporter: [ 2, 2 ]
#engineering (6)
StationEngineer: [ 4, 4 ]
AtmosphericTechnician: [ 2, 2 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 2, 2 ] #intern, not counted
#medical (6 - 8)
MedicalDoctor: [ 3, 4 ]
Chemist: [ 2, 2 ]
MedicalIntern: [ 2, 2 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
Paramedic: [ 1, 2 ]
#science
ResearchDirector: [ 1, 1 ]
#science (3)
Scientist: [ 3, 3 ]
ResearchAssistant: [ 1, 1 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 1, 1 ] #intern, not counted
#security (7)
SecurityOfficer: [ 4, 4 ]
Warden: [ 1, 1 ]
Lawyer: [ 1, 1 ]
SecurityCadet: [ 1, 1 ]
SecurityCadet: [ 1, 1 ] #intern, not counted
Detective: [ 1, 1 ]
#supply
#supply (5)
CargoTechnician: [ 3, 3 ]
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Boxer: [ 2, 2 ]
Reporter: [ 2, 2 ]
# silicon
# silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

39
Resources/Prototypes/Maps/elkridge.yml
View File

@@ -18,10 +18,16 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_elkridge.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 46 jobs total w/o latejoins & interns, 61 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (9 - 11)
Bartender: [ 1, 1 ]
Botanist: [ 1, 2 ]
Chef: [ 1, 1 ]
@@ -30,38 +36,33 @@
Librarian: [ 1, 1 ]
Reporter: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (5 - 6)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 3, 4 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 2, 2 ] #intern, not counted
#medical (6 - 7)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 2, 3 ]
MedicalIntern: [ 2, 2 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
Paramedic: [ 1, 1 ]
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (3 - 4)
Scientist: [ 3, 4 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (6 - 7)
Warden: [ 1, 1 ]
SecurityOfficer: [ 3, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
SecurityCadet: [ 2, 2 ] #intern, not counted
Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (4 - 5)
SalvageSpecialist: [ 2, 2 ]
CargoTechnician: [ 2, 3 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

39
Resources/Prototypes/Maps/fland.yml
View File

@@ -17,10 +17,16 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_fland.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 81 jobs total w/o latejoins & interns, 101 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (17)
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -29,37 +35,32 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (9)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 6, 6 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (11)
Chemist: [ 3, 3 ]
MedicalDoctor: [ 6, 6 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 6, 6 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 6, 6 ] #intern, not counted
#security (14)
Warden: [ 1, 1 ]
SecurityOfficer: [ 10, 10 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 6, 6 ]
SecurityCadet: [ 6, 6 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (9)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 6, 6 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (6)
StationAi: [ 1, 1 ]
Borg: [ 5, 5 ]

42
Resources/Prototypes/Maps/loop.yml
View File

@@ -16,11 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_wode.yml
- type: StationJobs
availableJobs:
#command
availableJobs: # 66 jobs total w/o latejoins & interns, 85 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
#service
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (14)
Bartender: [ 2, 2 ]
Botanist: [ 2, 2 ]
Chef: [ 2, 2 ]
@@ -28,39 +33,34 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Reporter: [ 1, 1 ]
#engineering (8)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 5, 5 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 5, 5 ] #intern, not counted
#medical (10 - 11)
Chemist: [ 3, 3 ]
MedicalDoctor: [ 4, 5 ]
Paramedic: [ 2, 2 ]
Psychologist: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 4, 4 ] #intern, not counted
#security (9)
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 5 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (7)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Reporter: [ 1, 1 ]
#silicon
#silicon (3 - 4)
StationAi: [ 1, 1 ]
Borg: [ 2, 3 ]

39
Resources/Prototypes/Maps/marathon.yml
View File

@@ -16,10 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 61 jobs total w/o latejoins & interns, 76 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (11 - 13)
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (7)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 3, 3 ] #intern, not counted
#medical (8)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
MedicalIntern: [ 3, 3 ]
MedicalIntern: [ 3, 3 ] #intern, not counted
Psychologist: [ 1, 1 ]
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 3, 3 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 3, 3 ] #intern, not counted
#security (12)
Warden: [ 1, 1 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (6)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

35
Resources/Prototypes/Maps/meta.yml
View File

@@ -16,10 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_meta.yml
- type: StationJobs
availableJobs:
#service (18)
availableJobs: # 68 jobs total w/o latejoins & interns, 95 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (14 - 16)
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
@@ -28,34 +34,29 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 2, 2 ]
#engineering (11)
ChiefEngineer: [ 1, 1 ]
#engineering (8 - 10)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 7 ]
TechnicalAssistant: [ 4, 4 ]
#medical (11)
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (7 - 10)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 6 ]
MedicalIntern: [ 4, 4 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
Paramedic: [ 1, 2 ]
#science (9)
ResearchDirector: [ 1, 1 ]
#science (6 - 8)
Scientist: [ 6, 8 ]
ResearchAssistant: [ 4, 4 ]
#security (12)
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 4, 4 ] #intern, not counted
#security (11)
Warden: [ 1, 1 ]
SecurityOfficer: [ 7, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]
#supply (10)
Quartermaster: [ 1, 1 ]
#supply (7 - 9)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 6 ]
#civilian (3+)
Passenger: [ -1, -1 ]
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]

42
Resources/Prototypes/Maps/oasis.yml
View File

@@ -15,10 +15,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 72 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (15 - 16)
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
@@ -28,37 +34,33 @@
ServiceWorker: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Reporter: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (8)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (11)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 6, 6 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 4, 4 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 6, 6 ]
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 6, 6 ] #intern, not counted
#security (13)
Warden: [ 1, 1 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 3, 3 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (7)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon (3)
Borg: [ 2, 2 ]
StationAi: [ 1, 1 ]

39
Resources/Prototypes/Maps/omega.yml
View File

@@ -16,10 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 48 jobs total w/o latejoins & interns, 57 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (9 - 10)
Bartender: [ 1, 1 ]
Botanist: [ 2, 2 ]
Chef: [ 1, 1 ]
@@ -27,37 +33,32 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (5)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 3, 3 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 2, 2 ] #intern, not counted
#medical (6)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 2, 2 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (7)
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
SecurityCadet: [ 2, 2 ] #intern, not counted
Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (4)
SalvageSpecialist: [ 2, 2 ]
CargoTechnician: [ 2, 2 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

39
Resources/Prototypes/Maps/packed.yml
View File

@@ -16,10 +16,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_crimson.yml
- type: StationJobs
availableJobs:
#service
availableJobs: # 46 jobs total w/o latejoins & interns, 57 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (8 - 10)
Bartender: [ 1, 1 ]
Botanist: [ 1, 2 ]
Chef: [ 1, 1 ]
@@ -27,37 +33,32 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (6)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 3, 3 ] #intern, not counted
#medical (6)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
MedicalIntern: [ 2, 2 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (6)
Warden: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
SecurityCadet: [ 2, 2 ] #intern, not counted
Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (4)
SalvageSpecialist: [ 2, 2 ]
CargoTechnician: [ 2, 2 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (2)
StationAi: [ 1, 1 ]
Borg: [ 1, 1 ]

43
Resources/Prototypes/Maps/plasma.yml
View File

@@ -18,8 +18,8 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_plasma.yml
- type: StationJobs
availableJobs: #Total of 66 jobs roundstart, max of 93 inc. latejoins and trainees.
#command - 7
availableJobs: # 66 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
@@ -27,7 +27,7 @@
ResearchDirector: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service - 18-21
#service (15 - 17)
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
@@ -36,32 +36,33 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 2, 3 ]
Clown: [ 1, 2 ] # This might be fun
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#engineering - 8-12
#engineering (8)
AtmosphericTechnician: [ 4, 4 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical - 9-13
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (9)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 4, 4 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
Psychologist: [ 1, 1 ]
#science - 7-13
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
StationAi: [ 1, 1 ]
Borg: [ 2, 4 ]
#security - 9-17
ResearchAssistant: [ 4, 4 ] #intern, not counted
#security (9 - 11)
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 8 ]
Detective: [ 1, 2 ]
SecurityCadet: [ 4, 4 ]
Detective: [ 1, 2 ] #good cop, bad cop
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 1, 2 ]
#supply - 8-10
SalvageSpecialist: [ 4, 4 ]
#supply (8 - 10)
SalvageSpecialist: [ 4, 4 ] #the salvagers yearn for the mines
CargoTechnician: [ 4, 6 ]
#civilian - the tiders yearn for the mines
Passenger: [ -1, -1 ]
#civilian (3 - 4+)
Passenger: [ -1, -1 ] #infinite, the tiders yearn for the mines
Clown: [ 1, 2 ] # this might be fun!
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon (3 - 5)
Borg: [ 2, 4 ]
StationAi: [ 1, 1 ]

25
Resources/Prototypes/Maps/reach.yml
View File

@@ -16,21 +16,28 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency.yml
- type: StationJobs
availableJobs:
availableJobs: # 15 jobs total w/o latejoins, 19 jobs total w/ latejoins
#command (2)
Captain: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
SecurityOfficer: [ 1, 3 ]
CargoTechnician: [ 1, 1 ]
SalvageSpecialist: [ 1, 1 ]
#service (4)
Bartender: [ 1, 1 ]
Botanist: [ 1, 1 ]
Chef: [ 1, 1 ]
MedicalDoctor: [ 1, 2 ]
Chemist: [ 1, 1 ]
Janitor: [ 1, 1 ]
Musician: [ 1, 1 ]
#engineering (2 - 3)
AtmosphericTechnician: [ 1, 1 ]
StationEngineer: [ 1, 2 ]
#medical (2 - 3)
Chemist: [ 1, 1 ]
MedicalDoctor: [ 1, 2 ]
#science (1)
Scientist: [ 1, 1 ]
Passenger: [ -1, -1 ]
#security (1 - 3)
SecurityOfficer: [ 1, 3 ]
#supply (2)
CargoTechnician: [ 1, 1 ]
SalvageSpecialist: [ 1, 1 ]
#civilian (1+)
Passenger: [ -1, -1 ] #infinite, not counted
Musician: [ 1, 1 ]

40
Resources/Prototypes/Maps/relic.yml
View File

@@ -20,44 +20,44 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_relic.yml
- type: StationJobs
availableJobs:
#command
availableJobs: # 31 jobs total w/o latejoins & interns, 43 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
#service
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (6 - 7)
Bartender: [ 1, 1 ]
Botanist: [ 1, 2 ]
Chef: [ 1, 1 ]
Janitor: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (4)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 2, 2 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 2, 2 ] #intern, not counted
#medical (4)
Chemist: [ 1, 1 ]
MedicalDoctor: [ 2, 2 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 2, 2 ]
#science
ResearchDirector: [ 1, 1 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
#science (1 - 3)
Scientist: [ 1, 3 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (4 - 5)
Warden: [ 1, 1 ]
SecurityOfficer: [ 1, 2 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
SecurityCadet: [ 2, 2 ] #intern, not counted
Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
#supply (2)
CargoTechnician: [ 2, 2 ]
#civilian
Passenger: [ -1, -1 ]
#silicon
#civilian (1+)
Passenger: [ -1, -1 ] #infinite, not counted
#silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]

41
Resources/Prototypes/Maps/saltern.yml
View File

@@ -15,10 +15,16 @@
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
availableJobs:
#service
availableJobs: # 45 jobs total w/o latejoins & interns, 62 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (8 - 9)
Bartender: [ 1, 1 ]
Botanist: [ 1, 2 ]
Chef: [ 1, 1 ]
@@ -26,35 +32,30 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
#engineering (6)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 4, 4 ] #intern, not counted
#medical (6)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
MedicalIntern: [ 4, 4 ]
MedicalIntern: [ 4, 4 ] #intern, not counted
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 2, 2 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (6)
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
SecurityCadet: [ 4, 4 ]
#supply
Quartermaster: [ 1, 1 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
#supply (3 - 5)
SalvageSpecialist: [ 1, 3 ]
CargoTechnician: [ 2, 2 ]
#civillian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon (2)
Borg: [ 2, 2 ]

42
Resources/Prototypes/Maps/train.yml
View File

@@ -18,10 +18,16 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # TODO - add railway station
- type: StationJobs
availableJobs:
#service
availableJobs: # 53 jobs total w/o latejoins & interns, 65 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (11 - 12)
Bartender: [ 1, 1 ]
Botanist: [ 2, 2 ]
Chef: [ 1, 1 ]
@@ -29,36 +35,32 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 3 ]
Detective: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Reporter: [ 1, 1 ]
#engineering (6)
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
TechnicalAssistant: [ 3, 3 ] #intern, not counted
#medical (5)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 2, 2 ]
MedicalIntern: [ 2, 2 ]
MedicalIntern: [ 2, 2 ] #intern, not counted
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science (4)
Scientist: [ 4, 4 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
ResearchAssistant: [ 2, 2 ] #intern, not counted
#security (9 - 10)
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 6 ]
SecurityCadet: [ 3, 3 ]
SecurityCadet: [ 3, 3 ] #intern, not counted
Lawyer: [ 1, 2 ]
#supply
Quartermaster: [ 1, 1 ]
Detective: [ 1, 1 ]
#supply (6)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
#civilian
Passenger: [ -1, -1 ]
#civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon (2)
Borg: [ 2, 2 ]
Reporter: [ 1, 1 ]

3
Resources/Prototypes/Objectives/dragon.yml
View File

@@ -9,8 +9,7 @@
issuer: objective-issuer-dragon
- type: RoleRequirement
roles:
mindRoles:
- DragonRole
- DragonRole
- type: entity
parent: BaseDragonObjective

3
Resources/Prototypes/Objectives/ninja.yml
View File

@@ -9,8 +9,7 @@
issuer: objective-issuer-spiderclan
- type: RoleRequirement
roles:
mindRoles:
- NinjaRole
- NinjaRole
- type: entity
parent: BaseNinjaObjective

3
Resources/Prototypes/Objectives/paradoxClone.yml
View File

@@ -9,8 +9,7 @@
issuer: objective-issuer-paradox
- type: RoleRequirement
roles:
mindRoles:
- ParadoxCloneRole
- ParadoxCloneRole
- type: Tag
tags:
- ParadoxCloneObjectiveBlacklist # don't copy the objectives from other clones

3
Resources/Prototypes/Objectives/thief.yml
View File

@@ -7,8 +7,7 @@
issuer: objective-issuer-thief
- type: RoleRequirement
roles:
mindRoles:
- ThiefRole
- ThiefRole
- type: entity
abstract: true

3
Resources/Prototypes/Objectives/traitor.yml
View File

@@ -7,8 +7,7 @@
issuer: objective-issuer-syndicate
- type: RoleRequirement
roles:
mindRoles:
- TraitorRole
- TraitorRole
- type: entity
abstract: true

3
Resources/Prototypes/Objectives/wizard.yml
View File

@@ -9,8 +9,7 @@
issuer: objective-issuer-swf
- type: RoleRequirement
roles:
mindRoles:
- WizardRole
- WizardRole
- type: entity
parent: [BaseWizardObjective, BaseSurviveObjective]

30
Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
View File

@@ -190,6 +190,21 @@
- node: anomaly steak
entity: FoodMeatAnomalyCooked
- type: constructionGraph
id: DragonSteak
start: start
graph:
- node: start
edges:
- to: dragon steak
completed:
- !type:PlaySound
sound: /Audio/Effects/sizzle.ogg
steps:
- minTemperature: 445
- node: dragon steak
entity: FoodMeatDragonCooked
# cutlets
- type: constructionGraph
@@ -311,3 +326,18 @@
- minTemperature: 345
- node: xeno cutlet
entity: FoodMeatXenoCutletCooked
- type: constructionGraph
id: DragonCutlet
start: start
graph:
- node: start
edges:
- to: dragon cutlet
completed:
- !type:PlaySound
sound: /Audio/Effects/sizzle.ogg
steps:
- minTemperature: 445
- node: dragon cutlet
entity: FoodMeatDragonCutletCooked

25
Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
View File

@@ -67,6 +67,18 @@
- Cooked
- Meat
# Dragon Steak
- type: foodSequenceElement
id: DragonSteak
name: food-sequence-content-dragon
sprites:
- sprite: Objects/Consumable/Food/meat.rsi
state: dragon-cooked
tags:
- Cooked
- Meat
# Bacon
- type: foodSequenceElement
@@ -437,6 +449,19 @@
- Cutlet
- Meat
# Dragon cutlet
- type: foodSequenceElement
id: DragonCutlet
name: food-sequence-content-dragon
sprites:
- sprite: Objects/Consumable/Food/meat.rsi
state: dragoncutlet-cooked
tags:
- Cooked
- Cutlet
- Meat
# Brain
- type: foodSequenceElement

7
Resources/Prototypes/Shaders/shaders.yml
View File

@@ -108,4 +108,9 @@
- type: shader
id: Hologram
kind: source
path: "/Textures/Shaders/hologram.swsl"
path: "/Textures/Shaders/hologram.swsl"
- type: shader
id: RadialMenu
kind: source
path: "/Textures/Shaders/radial-menu.swsl"