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

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

Browse Source 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Access/misc.yml
View File

@@ -32,3 +32,5 @@
- Chapel
- Hydroponics
- Atmospherics
- GenpopEnter
- GenpopLeave

8
Resources/Prototypes/Access/security.yml
View File

@@ -18,6 +18,14 @@
id: Detective
name: id-card-access-level-detective
- type: accessLevel
id: GenpopEnter
name: id-card-access-level-genpop-enter
- type: accessLevel
id: GenpopLeave
name: id-card-access-level-genpop-leave
- type: accessGroup
id: Security
tags:

4
Resources/Prototypes/Access/xenoborg.yml Normal file
View File

@@ -0,0 +1,4 @@
- type: accessLevel
id: Xenoborg
name: id-card-access-level-basic-xenoborg
canAddToIdCard: false

24
Resources/Prototypes/Actions/types.yml
View File

@@ -93,8 +93,9 @@
name: Break Free
description: Activating your freedom implant will free you from any hand restraints
components:
- type: LimitedCharges
maxCharges: 3
- type: InstantAction
charges: 3
checkCanInteract: false
itemIconStyle: BigAction
priority: -20
@@ -121,9 +122,10 @@
name: Activate EMP
description: Triggers a small EMP pulse around you
components:
- type: LimitedCharges
maxCharges: 3
- type: InstantAction
checkCanInteract: false
charges: 3
useDelay: 5
itemIconStyle: BigAction
priority: -20
@@ -137,9 +139,10 @@
name: SCRAM!
description: Randomly teleports you within a large distance.
components:
- type: LimitedCharges
maxCharges: 2
- type: InstantAction
checkCanInteract: false
charges: 2
useDelay: 5
itemIconStyle: BigAction
priority: -20
@@ -155,8 +158,9 @@
components:
- type: ConfirmableAction
popup: dna-scrambler-action-popup
- type: LimitedCharges
maxCharges: 1
- type: InstantAction
charges: 1
itemIconStyle: BigAction
priority: -20
icon:
@@ -216,18 +220,6 @@
useDelay: 30
event: !type:VendingMachineSelfDispenseEvent
- type: entity
id: ActionArtifactActivate
name: Activate Artifact
description: Immediately activates your current artifact node.
components:
- type: InstantAction
icon:
sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
state: ano01
useDelay: 60
event: !type:ArtifactSelfActivateEvent
- type: entity
id: ActionToggleBlock
name: Block

1
Resources/Prototypes/Body/Organs/moth.yml
View File

@@ -8,6 +8,7 @@
tags:
- ClothMade
- Paper
- Pill
- type: SolutionContainerManager
solutions:
stomach:

5
Resources/Prototypes/Body/Parts/skeleton.yml
View File

@@ -14,7 +14,6 @@
ents: []
- type: StaticPrice
price: 20
- type: Gibbable
- type: Tag
tags:
- Trash
@@ -37,7 +36,7 @@
id: HeadSkeleton
name: "skull"
description: Alas poor Yorick...
parent: PartSkeleton
parent: [ PartSkeleton, BaseMob ]
components:
- type: Sprite
sprite: Mobs/Species/Skeleton/parts.rsi
@@ -47,10 +46,12 @@
state: "skull_icon"
- type: BodyPart
partType: Head
- type: BlockMovement
- type: Input
context: "human"
- type: Speech
speechVerb: Skeleton
speechSounds: Alto
- type: SkeletonAccent
- type: Actions
- type: Vocal

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

@@ -7,7 +7,7 @@
amount: 1
whitelist:
components:
- Artifact
- XenoArtifact
- type: cargoBounty
id: BountyBaseballBat
@@ -564,6 +564,7 @@
- Cake
- Pie
- Bread
- Pistachios
- type: cargoBounty
id: BountyVegetable

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

@@ -4,7 +4,7 @@
sprite: Structures/Storage/canister.rsi
state: grey
product: AirCanister
cost: 1100
cost: 300
category: cargoproduct-category-name-atmospherics
group: market
@@ -14,7 +14,7 @@
sprite: Structures/Storage/canister.rsi
state: blue
product: OxygenCanister
cost: 1100
cost: 300
category: cargoproduct-category-name-atmospherics
group: market
@@ -24,7 +24,7 @@
sprite: Structures/Storage/canister.rsi
state: blue
product: LiquidOxygenCanister
cost: 2500
cost: 1000
category: cargoproduct-category-name-atmospherics
group: market
@@ -34,7 +34,7 @@
sprite: Structures/Storage/canister.rsi
state: red
product: NitrogenCanister
cost: 1100
cost: 300
category: cargoproduct-category-name-atmospherics
group: market
@@ -44,7 +44,7 @@
sprite: Structures/Storage/canister.rsi
state: red
product: LiquidNitrogenCanister
cost: 2500
cost: 1000
category: cargoproduct-category-name-atmospherics
group: market
@@ -54,7 +54,7 @@
sprite: Structures/Storage/canister.rsi
state: black
product: CarbonDioxideCanister
cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
cost: 400 # even though it's poisonous, it comes locked and only damages you slowly even with high amounts (tested)
category: cargoproduct-category-name-atmospherics
group: market
@@ -64,7 +64,7 @@
sprite: Structures/Storage/canister.rsi
state: black
product: LiquidCarbonDioxideCanister
cost: 4000
cost: 1800 # much less deadly than the plasma can (this has been tested) even though this is cold+poison
category: cargoproduct-category-name-atmospherics
group: market
@@ -74,14 +74,12 @@
sprite: Structures/Storage/canister.rsi
state: yellow
product: StorageCanister
cost: 1010 # No gases in it so it's cheaper
cost: 210 # No gases in it so it's cheaper
category: cargoproduct-category-name-atmospherics
group: market
#- type: cargoProduct
# name: "water vapor canister"
# id: AtmosphericsWaterVapor
# description: "Water vapor canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: water_vapor
@@ -96,14 +94,12 @@
sprite: Structures/Storage/canister.rsi
state: orange
product: PlasmaCanister
cost: 4000
cost: 2500 # for reference, bagel's 3x1 roundstart plasma chamber contains ~16kmol for free, this is $2.5k for 1870mol, so $20k to nearly refill a 3x1 (some are 3x3) chamber
category: cargoproduct-category-name-atmospherics
group: market
#- type: cargoProduct
# name: "tritium canister"
# id: AtmosphericsTritium
# description: "Tritium canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: green

10
Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
View File

@@ -47,3 +47,13 @@
cost: 750
category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
id: HydroponicsTray
icon:
sprite: Structures/Hydroponics/containers.rsi
state: hydrotray3
product: CrateHydroponicsTray
cost: 750
category: cargoproduct-category-name-hydroponics
group: market

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

@@ -29,14 +29,12 @@
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
product: CrateEngineeringSingularityEmitter
cost: 3000
cost: 1500
category: cargoproduct-category-name-engineering
group: market

40
Resources/Prototypes/Catalog/Cargo/cargo_food.yml
View File

@@ -77,3 +77,43 @@
cost: 2400
category: cargoproduct-category-name-food
group: market
- type: cargoProduct
id: FoodCookGetmore
icon:
sprite: Objects/Consumable/Food/snacks.rsi
state: raisins
product: CrateFoodGetMore
cost: 750
category: cargoproduct-category-name-food
group: market
- type: cargoProduct
id: FoodHappyHonkMeals
icon:
sprite: Objects/Consumable/Food/burger.rsi
state: bigbite
product: CrateFoodHappyHonkBigBite
cost: 1400
category: cargoproduct-category-name-food
group: market
- type: cargoProduct
id: FoodIceCream
icon:
sprite: Objects/Consumable/Food/frozen.rsi
state: sandwich
product: CrateFoodIceCream
cost: 1200
category: cargoproduct-category-name-food
group: market
- type: cargoProduct
id: FoodSnowcone
icon:
sprite: Objects/Consumable/Food/frozen.rsi
state: cone
product: CrateFoodSnowcone
cost: 1100
category: cargoproduct-category-name-food
group: market

10
Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
View File

@@ -117,6 +117,16 @@
cost: 500
category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
id: FunSharkPlushies
icon:
sprite: Objects/Fun/sharkplush.rsi
state: blue
product: CrateFunSharkPlushieBulk
cost: 500
category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
id: FunBoardGames

49
Resources/Prototypes/Catalog/Cargo/cargo_lockbox.yml Normal file
View File

@@ -0,0 +1,49 @@
- type: cargoProduct
id: CrateLockBoxEngineering
icon:
sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
product: CrateLockBoxEngineering
cost: 100
category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
id: CrateLockBoxMedical
icon:
sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
product: CrateLockBoxMedical
cost: 100
category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
id: CrateLockBoxScience
icon:
sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
product: CrateLockBoxScience
cost: 100
category: cargoproduct-category-name-science
group: market
- type: cargoProduct
id: CrateLockBoxSecurity
icon:
sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
product: CrateLockBoxSecurity
cost: 100
category: cargoproduct-category-name-security
group: market
- type: cargoProduct
id: CrateLockBoxService
icon:
sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
product: CrateLockBoxService
cost: 100
category: cargoproduct-category-name-service
group: market

24
Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
View File

@@ -44,7 +44,7 @@
sprite: Objects/Materials/Sheets/metal.rsi
state: plasteel_3
product: CrateMaterialPlasteel
cost: 4800
cost: 1600
category: cargoproduct-category-name-materials
group: market
@@ -64,7 +64,7 @@
sprite: Objects/Materials/Sheets/other.rsi
state: plasma_3
product: CrateMaterialPlasma
cost: 2000
cost: 1500
category: cargoproduct-category-name-materials
group: market
@@ -88,6 +88,26 @@
category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
id: MaterialBasic
icon:
sprite: Objects/Materials/Sheets/other.rsi
state: generic_materials
product: CrateMaterialBasicResource
cost: 1660
category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
id: MaterialSilo
icon:
sprite: Structures/Machines/silo.rsi
state: silo
product: CrateMaterialSilo
cost: 5000
category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
id: MaterialFuelTank
icon:

10
Resources/Prototypes/Catalog/Cargo/cargo_science.yml
View File

@@ -8,6 +8,16 @@
category: cargoproduct-category-name-science
group: market
- type: cargoProduct
id: HandheldArtifactContainer
icon:
sprite: Objects/Storage/artifact_container.rsi
state: icon
product: HandheldArtifactContainer
cost: 500
category: cargoproduct-category-name-science
group: market
- type: cargoProduct
id: RandomArtifact
icon:

10
Resources/Prototypes/Catalog/Cargo/cargo_security.yml
View File

@@ -67,3 +67,13 @@
cost: 1000
category: cargoproduct-category-name-security
group: market
- type: cargoProduct
id: SecurityNonlethalThrowables
icon:
sprite: Objects/Weapons/Grenades/stingergrenade.rsi
state: icon
product: CrateSecNonlethalThrowables
cost: 2500
category: cargoproduct-category-name-security
group: market

12
Resources/Prototypes/Catalog/Cargo/cargo_service.yml
View File

@@ -28,6 +28,16 @@
category: cargoproduct-category-name-service
group: market
- type: cargoProduct
id: ServiceLightsColorful
icon:
sprite: Objects/Power/light_bulb.rsi
state: normal
product: CrateServiceColorfulLights
cost: 800
category: cargoproduct-category-name-service
group: market
- type: cargoProduct
id: MousetrapBoxes
icon:
@@ -217,5 +227,3 @@
cost: 500
category: cargoproduct-category-name-service
group: market

4
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
@@ -33,7 +32,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 2440
cost: 2480
category: cargoproduct-category-name-service
group: market
@@ -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

40
Resources/Prototypes/Catalog/Fills/Boxes/service.yml
View File

@@ -38,3 +38,43 @@
guides:
- Botanical
- Chemicals
- type: entity
parent: BoxLightbulb
id: BoxLightbulbColorfulMixed
name: mixed colorful lightbulb box
components:
- type: StorageFill
contents:
- id: LightBulbCrystalCyan
amount: 2
- id: LightBulbCrystalBlue
amount: 2
- id: LightBulbCrystalGreen
amount: 2
- id: LightBulbCrystalPink
amount: 2
- id: LightBulbCrystalRed
amount: 2
- id: LightBulbCrystalOrange
amount: 2
- type: entity
parent: BoxLighttube
id: BoxLighttubeColorfulMixed
name: mixed colorful lighttube box
components:
- type: StorageFill
contents:
- id: LightTubeCrystalCyan
amount: 2
- id: LightTubeCrystalBlue
amount: 2
- id: LightTubeCrystalGreen
amount: 2
- id: LightTubeCrystalPink
amount: 2
- id: LightTubeCrystalRed
amount: 2
- id: LightTubeCrystalOrange
amount: 2

10
Resources/Prototypes/Catalog/Fills/Crates/botany.yml
View File

@@ -92,3 +92,13 @@
- id: WatermelonSeeds
- id: PeaSeeds
- id: CherrySeeds
- type: entity
id: CrateHydroponicsTray
parent: CrateHydroponics
name: hydroponics tray crate
description: Contains a hydroponics tray flatpack.
components:
- type: StorageFill
contents:
- id: HydroponicsTrayFlatpack

4
Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
View File

@@ -228,6 +228,8 @@
- id: SignalTimerElectronics
- id: SMESMachineCircuitboard
- id: SubstationMachineCircuitboard
- id: BorgChargerCircuitboard
- id: CellRechargerCircuitboard
- id: SpaceVillainArcadeComputerCircuitboard
- id: BlockGameArcadeComputerCircuitboard
@@ -242,4 +244,4 @@
entity_storage: !type:NestedSelector
tableId: RandomTechBoardTable
rolls: !type:RangeNumberSelector
range: 3, 7
range: 6, 8

81
Resources/Prototypes/Catalog/Fills/Crates/food.yml
View File

@@ -166,3 +166,84 @@
- id: DrinkFourteenLokoCan
amount: 4
- type: entity
id: CrateFoodGetMore
parent: CratePlastic
name: Getmore Bakemore crate
description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines!
components:
- type: StorageFill
contents:
- id: FoodSnackRaisins
amount: 4
- id: FoodSnackChocolate
amount: 6
- id: FoodSnackPistachios
amount: 4
- id: ReagentContainerFlour
amount: 3
- id: ReagentContainerSugar
amount: 2
- id: FoodCondimentPacketSalt
amount: 3
- id: DrinkMilkCarton
amount: 2
- id: FoodContainerEgg
amount: 2
- id: FoodBoxCloth
amount: 1
- type: entity
id: CrateFoodIceCream
parent: CrateFreezer
name: ice cream delivery
description: An assortment of ice cream delights for any occasion! Includes 16 frozen treats.
components:
- type: StorageFill
contents:
- id: FoodFrozenSandwich
amount: 3
- id: FoodFrozenSandwichStrawberry
amount: 2
- id: FoodFrozenPopsicleOrange
amount: 2
- id: FoodFrozenPopsicleBerry
amount: 2
- id: FoodFrozenPopsicleJumbo
amount: 3
- id: FoodFrozenCornuto
amount: 2
- id: FoodFrozenSundae
amount: 2
- type: entity
id: CrateFoodSnowcone
parent: CrateFreezer
name: snowcone delivery
description: A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones.
components:
- type: StorageFill
contents:
- id: FoodFrozenSnowconeBase
amount: 3
- id: FoodFrozenSnowconeBerry
amount: 3
- id: FoodFrozenSnowconeFruit
amount: 3
- id: FoodFrozenSnowconeRainbow
amount: 3
- id: FoodFrozenSnowconeClown
amount: 2
- id: FoodFrozenSnowconeMime
amount: 2
- type: entity
id: CrateFoodHappyHonkBigBite
parent: CratePlastic
name: Happy Honk meal delivery
description: Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy!
components:
- type: StorageFill
contents:
- id: FoodMealHappyHonkBigBite
amount: 2

21
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
View File

@@ -10,6 +10,7 @@
- id: PlushieNuke
- id: PlushieSlime
- id: PlushieSnake
- id: PlushieExperiment
- !type:GroupSelector
children:
- id: PlushieLizard
@@ -72,6 +73,26 @@
amount: !type:ConstantNumberSelector
value: 3
- type: entity
id: CrateFunSharkPlushieBulk
parent: CrateGenericSteel
name: bulk soft toy shark crate
description: A crate filled with a variety of everyone's favorite finned friend. Rawr!
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- id: PlushieSharkBlue
amount: !type:ConstantNumberSelector
value: 2
- id: PlushieSharkPink
amount: !type:ConstantNumberSelector
value: 2
- id: PlushieSharkGrey
amount: !type:ConstantNumberSelector
value: 2
- type: entity
id: CrateFunInstrumentsVariety
parent: CrateGenericSteel

35
Resources/Prototypes/Catalog/Fills/Crates/materials.yml
View File

@@ -68,12 +68,11 @@
id: CrateMaterialPlasteel
parent: CrateGenericSteel
name: plasteel crate
description: 90 sheets of plasteel.
description: 30 sheets of plasteel.
components:
- type: StorageFill
contents:
- id: SheetPlasteel
amount: 3
- type: entity
id: CrateMaterialPlasma
@@ -149,9 +148,35 @@
entity_storage: !type:NestedSelector
tableId: RandomMaterialCrateTable
rolls: !type:RangeNumberSelector
range: 1, 3
# for some reason, the selector here adds 1 to whatever value it generates,
# so this is actually 2-4
range: 2, 4
- type: entity
id: CrateMaterialSilo
parent: CrateGenericSteel
name: material silo crate
description: A package including all the materials to create a material silo.
components:
- type: StorageFill
contents:
- id: MaterialSiloMachineCircuitboard
- id: SheetSteel1
amount: 5
- id: MatterBinStockPart
amount: 4
- id: CableApcStack1
amount: 2
- type: entity
id: CrateMaterialBasicResource
parent: CrateGenericSteel
name: basic sheet crate
description: 30 sheets of steel, glass, and plastic.
components:
- type: StorageFill
contents:
- id: SheetSteel
- id: SheetGlass
- id: SheetPlastic
#- type: entity
# id: CrateMaterialHFuelTank

17
Resources/Prototypes/Catalog/Fills/Crates/security.yml
View File

@@ -93,4 +93,19 @@
- id: TrackingImplanter
amount: 4
# Cosmetic Crates
- type: entity
parent: CrateSecgear
id: CrateSecNonlethalThrowables
name: nonlethal throwables crate
description: Contains one box each of flashbangs, stingers, tear gas grenades, and four bolas. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: BoxFlashbang
amount: 1
- id: BoxStinger
amount: 1
- id: BoxTearGas
amount: 1
- id: Bola # replace with 4 e-bolas when added
amount: 4

13
Resources/Prototypes/Catalog/Fills/Crates/service.yml
View File

@@ -7,7 +7,7 @@
- type: StorageFill
contents:
- id: MopItem
- id: MopBucket
- id: MopBucketCubeWrapped
- id: Bucket
amount: 3
- id: WetFloorSign
@@ -361,3 +361,14 @@
amount: 2
- id: BoxCandleSmall
amount: 2
- type: entity
parent: CrateGenericSteel
id: CrateServiceColorfulLights
name: colorful lights crate
description: It's not a party until it's hard to see, a little disorienting, and your ears hurt.
components:
- type: StorageFill
contents:
- id: BoxLightbulbColorfulMixed
- id: BoxLighttubeColorfulMixed

6
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View File

@@ -130,6 +130,8 @@
- id: DoorRemoteService
- id: HoPIDCard
- id: IDComputerCircuitboard
- id: FundingAllocationComputerCircuitboard
- id: CargoRequestServiceComputerCircuitboard
- id: RubberStampApproved
- id: RubberStampDenied
- id: RubberStampHop
@@ -160,6 +162,7 @@
- id: ClothingHandsGlovesColorYellow
- id: ClothingHeadsetAltEngineering
- id: DoorRemoteEngineering
- id: CargoRequestEngineeringComputerCircuitboard
- id: RCD
- id: RCDAmmo
- id: RubberStampCE
@@ -218,6 +221,7 @@
- id: HandheldCrewMonitor
- id: Hypospray
- id: MedicalTechFabCircuitboard
- id: CargoRequestMedicalComputerCircuitboard
- id: MedkitFilled
- id: RubberStampCMO
- id: MedTekCartridge
@@ -271,6 +275,7 @@
- id: HandTeleporter
- id: ProtolatheMachineCircuitboard
- id: ResearchComputerCircuitboard
- id: CargoRequestScienceComputerCircuitboard
- id: RubberStampRd
# Hardsuit table, used for suit storage as well
@@ -328,6 +333,7 @@
- id: HoloprojectorSecurity
- id: RubberStampHos
- id: SecurityTechFabCircuitboard
- id: CargoRequestSecurityComputerCircuitboard
- id: WeaponDisabler
- id: WantedListCartridge
- id: DrinkHosFlask

3
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View File

@@ -125,7 +125,8 @@
- id: ClothingHeadHatDetGadget
- id: ClothingNeckTieDet
- id: ClothingOuterVestDetective
- id: ClothingOuterCoatDetective
- id: ClothingOuterCoatDetectiveLoadout
- id: FlippoEngravedLighter
- id: FlashlightSeclite
- id: ForensicScanner
- id: LogProbeCartridge

5
Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
View File

@@ -270,6 +270,7 @@
- type: StorageFill
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitWizard
- id: ClothingMaskBreath
- id: JetpackVoidFilled
# TODO: Gone until reworked to have no space protection
#- id: ClothingOuterHardsuitWizard
#- id: JetpackVoidFilled

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View File

@@ -26,6 +26,7 @@
DrinkGrenadineBottleFull: 2
DrinkJuiceLimeCarton: 3
DrinkJuiceLemonCarton: 3
DrinkJuicePineappleCarton: 3
DrinkJuiceOrangeCarton: 3
DrinkJuiceTomatoCarton: 3
DrinkCoffeeLiqueurBottleFull: 3

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View File

@@ -7,6 +7,7 @@
ClothingBackpackSatchel: 3
ClothingBackpackSatchelLeather: 2
ClothingRandomSpawner: 8
ClothingUniformRandomShorts: 4
ClothingHeadHatBeret: 4
ClothingHeadBandBlack: 2
ClothingHeadBandBlue: 2
@@ -99,4 +100,5 @@
ToyFigurinePassenger: 1
ToyFigurineGreytider: 1
ClothingBackpackSatchelSmugglerUnanchored: 1
ClothingHeadHatSolidHeadband: 2
# DO NOT ADD MORE, USE UNIFORM DYING

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
View File

@@ -12,8 +12,10 @@
ClothingNeckLesbianPin: 3
ClothingNeckNonBinaryPin: 3
ClothingNeckPansexualPin: 3
ClothingNeckPluralPin: 3
ClothingNeckOmnisexualPin: 3
ClothingNeckGenderqueerPin: 3
ClothingNeckGenderfluidPin: 3
ClothingNeckTransPin: 3
ClothingNeckAutismPin: 3
ClothingNeckGoldAutismPin: 3

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
View File

@@ -15,7 +15,6 @@
CornSeeds: 5
CottonSeeds: 5
EggplantSeeds: 5
EggySeeds: 5
GalaxythistleSeeds: 3
GarlicSeeds: 3
GrapeSeeds: 5

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
View File

@@ -16,6 +16,7 @@
ClothingOuterFlannelBlue: 2
ClothingOuterFlannelGreen: 2
ClothingOuterCoatBomber: 3
ClothingHeadHatCanadaBeanie: 4
ClothingHeadHatSantahat: 2
ClothingHeadHatXmasCrown: 2

42
Resources/Prototypes/Catalog/cargo_accounts.yml Normal file
View File

@@ -0,0 +1,42 @@
- type: cargoAccount
id: Cargo
name: cargo-account-cargo-name
code: cargo-account-cargo-code
color: "#b48b57"
radioChannel: Supply
- type: cargoAccount
id: Engineering
name: cargo-account-engineering-name
code: cargo-account-engineering-code
color: "#ff733c"
radioChannel: Engineering
- type: cargoAccount
id: Medical
name: cargo-account-medical-name
code: cargo-account-medical-code
color: "#57b8f0"
radioChannel: Medical
- type: cargoAccount
id: Science
name: cargo-account-science-name
code: cargo-account-science-code
color: "#cd7ccd"
radioChannel: Science
- type: cargoAccount
id: Security
name: cargo-account-security-name
code: cargo-account-security-code
color: "#ff4242"
radioChannel: Security
- type: cargoAccount
id: Service
name: cargo-account-service-name
code: cargo-account-service-code
color: "#539c00"
radioChannel: Service

43
Resources/Prototypes/Catalog/pai_catalog.yml Normal file
View File

@@ -0,0 +1,43 @@
# Some things might seem like great ideas on paper for pAI apps, but have deliberately been excluded.
# e.g. Monitoring (Power/Atmos/Crew), Cameras, etc. are excluded as apps for performance and balance reasons.
# Generally speaking, if you're adding an application, it needs to *not* be round-impacting.
# Remember that pAI's are *assistants*, not players.
- type: listing
id: PAIMassScanner
name: pai-mass-scanner-name
description: pai-mass-scanner-desc
productAction: ActionPAIMassScanner
cost:
SiliconMemory: 10
categories:
- PAIAbilities
conditions:
- !type:ListingLimitedStockCondition
stock: 1
- type: listing
id: PAIMIDIPlayer
name: pai-midi-player-name
description: pai-midi-player-desc
productAction: ActionPAIPlayMidi
cost:
SiliconMemory: 5
categories:
- PAIAbilities
conditions:
- !type:ListingLimitedStockCondition
stock: 1
- type: listing
id: PAIStationMap
name: pai-station-map-name
description: pai-station-map-desc
productAction: ActionPAIOpenMap
cost:
SiliconMemory: 5
categories:
- PAIAbilities
conditions:
- !type:ListingLimitedStockCondition
stock: 1

13
Resources/Prototypes/Catalog/spellbook_catalog.yml
View File

@@ -146,6 +146,19 @@
- !type:ListingLimitedStockCondition
stock: 1
- type: listing
id: SpellbookKnock
name: spellbook-knock-name
description: spellbook-knock-desc
productAction: ActionKnock
cost:
WizCoin: 1
categories:
- SpellbookUtility
conditions:
- !type:ListingLimitedStockCondition
stock: 1
- type: listing
id: SpellbookCharge
name: spellbook-charge-name

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

@@ -980,18 +980,19 @@
categories:
- UplinkDisruption
- type: listing
id: UplinkDuffelSurgery
name: uplink-duffel-surgery-name
description: uplink-duffel-surgery-desc
productEntity: ClothingBackpackDuffelSyndicateFilledMedical
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
categories:
- UplinkDisruption
# Note: Removed for the time being until surgery/newmed is added. Considered bloat until then.
# - type: listing
# id: UplinkDuffelSurgery
# name: uplink-duffel-surgery-name
# description: uplink-duffel-surgery-desc
# productEntity: ClothingBackpackDuffelSyndicateFilledMedical
# discountCategory: usualDiscounts
# discountDownTo:
# Telecrystal: 2
# cost:
# Telecrystal: 4
# categories:
# - UplinkDisruption
- type: listing
id: UplinkPowerSink
@@ -1564,6 +1565,19 @@
categories:
- UplinkWearables
- type: listing
id: UplinkClothingOuterVestWebElite
name: uplink-clothing-outer-vest-web-elite-name
description: uplink-clothing-outer-vest-web-elite-desc
productEntity: ClothingOuterVestWebElite
discountCategory: usualDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 5
categories:
- UplinkWearables
- type: listing
id: UplinkClothingShoesBootsMagSyndie
name: uplink-clothing-shoes-boots-mag-syndie-name
@@ -1624,7 +1638,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:
@@ -1641,13 +1655,15 @@
description: uplink-hardsuit-syndieelite-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 7
cost:
Telecrystal: 12
categories:
- UplinkWearables
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink
- type: listing
id: UplinkClothingOuterHardsuitJuggernaut
@@ -1655,13 +1671,15 @@
description: uplink-clothing-outer-hardsuit-juggernaut-desc
icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
productEntity: CrateCybersunJuggernautBundle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 12
categories:
- UplinkWearables
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink
- type: listing
id: UplinkClothingEyesHudSyndicate
@@ -2161,3 +2179,21 @@
Telecrystal: 2
categories:
- UplinkDeception
- type: listing
id: UplinkSawAdvanced
name: uplink-saw-advanced-name
description: uplink-saw-advanced-desc
icon: { sprite: Objects/Specific/Medical/Surgery/saw.rsi, state: advanced}
productEntity: SawAdvanced
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 1
cost:
Telecrystal: 2
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- MedicalDoctor

11
Resources/Prototypes/Datasets/Names/dragon.yml Normal file
View File

@@ -0,0 +1,11 @@
- type: localizedDataset
id: NamesDragon
values:
prefix: names-dragon-dataset-
count: 31
- type: localizedDataset
id: NamesDragonTitle
values:
prefix: names-dragon-title-dataset-
count: 30

5
Resources/Prototypes/Datasets/Names/xenoborg.yml Normal file
View File

@@ -0,0 +1,5 @@
- type: localizedDataset
id: NamesXenoborg
values:
prefix: names-xenoborg-dataset-
count: 60

5
Resources/Prototypes/Datasets/deliveries.yml Normal file
View File

@@ -0,0 +1,5 @@
- type: localizedDataset
id: DeliverySpamLetters
values:
prefix: delivery-spam-
count: 12

2
Resources/Prototypes/Datasets/figurines.yml
View File

@@ -212,7 +212,7 @@
id: FigurinesFootsoldier
values:
prefix: figurines-footsoldier-
count: 2
count: 5
- type: localizedDataset
id: FigurinesWizard

2
Resources/Prototypes/Datasets/tips.yml
View File

@@ -2,4 +2,4 @@
id: Tips
values:
prefix: tips-dataset-
count: 137
count: 139

10
Resources/Prototypes/Device/devicenet_frequencies.yml
View File

@@ -136,3 +136,13 @@
id: BasicDevice
name: device-frequency-prototype-name-basic-device
frequency: 1280
- type: deviceFrequency
id: Xenoborg
name: device-frequency-prototype-name-xenoborg
frequency: 2004
- type: deviceFrequency
id: Mothership
name: device-frequency-prototype-name-mothership
frequency: 2005

2
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
View File

@@ -182,7 +182,6 @@
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateAmmo
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
@@ -203,7 +202,6 @@
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateMedical
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi

133
Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
View File

@@ -28,22 +28,23 @@
- !type:NestedSelector
tableId: RandomSatchelTable6
#number after each group indicates potential max inventory fill. If all combined fills are too high, it could result in an over-filled bag/error.
- type: entityTable
id: RandomSatchelTable1
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelGenericTable
tableId: RandomSatchelGenericTableSmallx2 #2x small
- !type:NestedSelector
tableId: RandomSatchelFunnyTable
tableId: RandomSatchelFunnyTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelClothingTable
tableId: RandomSatchelClothingTable #1x small
- !type:NestedSelector
tableId: RandomSatchelCannabisTable
tableId: RandomSatchelCannabisTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelGizmosTable
tableId: RandomSatchelGizmosTable #2x small
- !type:NestedSelector
tableId: RandomSatchelChemsTable
tableId: RandomSatchelChemsTable #5x tiny
- type: entityTable
id: RandomSatchelFunnyTable
@@ -63,7 +64,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelCannabisTable
table: !type:GroupSelector
children:
@@ -82,7 +83,7 @@
amount: !type:RangeNumberSelector
range: 1, 15
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelGizmosTable
table: !type:GroupSelector
children:
@@ -99,7 +100,7 @@
range: 1, 2
- id: ProximitySensor
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelChemsTable
table: !type:GroupSelector
children:
@@ -134,17 +135,17 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelTobaccoTable
tableId: RandomSatchelTobaccoTable #2x 2x3(12 slots)
- !type:NestedSelector
tableId: RandomSatchelPartyTable
tableId: RandomSatchelPartyTable #5x small
- !type:NestedSelector
tableId: RandomSatchelClothingTable
tableId: RandomSatchelClothingTable #1x small
- !type:NestedSelector
tableId: RandomSatchelPayloadTable
tableId: RandomSatchelPayloadTable #2x small
- !type:NestedSelector
tableId: RandomSatchelCircuitboardsTable
tableId: RandomSatchelCircuitboardsTable #1x small
- type: entityTable
- type: entityTable #2x 2x3(12 slots)
id: RandomSatchelTobaccoTable
table: !type:GroupSelector
children:
@@ -157,14 +158,10 @@
- id: CigCartonGreen
- id: CigCartonBlack
- id: CigarCase
amount: !type:RangeNumberSelector
range: 1, 2
- id: CigarGoldCase
weight: 0.25
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelPartyTable
table: !type:GroupSelector
children:
@@ -186,7 +183,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelClothingTable
table: !type:GroupSelector
children:
@@ -200,7 +197,7 @@
- id: ClothingHandsGlovesCombat
- id: ClothingNeckScarfStripedSyndieRed
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelPayloadTable
table: !type:GroupSelector
children:
@@ -216,7 +213,7 @@
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCircuitboardsTable
table: !type:GroupSelector
children:
@@ -245,19 +242,19 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelPresentsOrToysTable
tableId: RandomSatchelPresentsOrToysTable #3x small
- !type:NestedSelector
tableId: RandomSatchelCashTable
tableId: RandomSatchelCashTable #1x small
- !type:NestedSelector
tableId: RandomSatchelWeaponTable
tableId: RandomSatchelWeaponTable #5x small
- !type:NestedSelector
tableId: RandomSatchelBurgerTable
tableId: RandomSatchelBurgerTable #5x small
- !type:NestedSelector
tableId: RandomSatchelGenericTable
tableId: RandomSatchelGenericTableSmall #1x small
- !type:NestedSelector
tableId: RandomSatchelKeysTable
tableId: RandomSatchelKeysTable #1x small
- type: entityTable
- type: entityTable #3x small
id: RandomSatchelPresentsOrToysTable
table: !type:GroupSelector
children:
@@ -271,7 +268,7 @@
- id: ToyFigurineQueen
- id: ToyFigurineRatKing
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCashTable
table: !type:GroupSelector
children:
@@ -301,7 +298,7 @@
amount: !type:RangeNumberSelector
range: 1, 10
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelWeaponTable
table: !type:GroupSelector
children:
@@ -312,7 +309,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelBurgerTable
table: !type:GroupSelector
children:
@@ -331,8 +328,8 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
id: RandomSatchelGenericTable
- type: entityTable #1x small
id: RandomSatchelGenericTableSmall
table: !type:GroupSelector
children:
- id: SpaceCash100
@@ -342,6 +339,13 @@
- id: WeaponFlareGun
- id: ModularReceiver
- id: RifleStock
- type: entityTable #2x small
id: RandomSatchelGenericTableSmallx2
table: !type:GroupSelector
children:
- id: SpaceCash100
weight: 15
- id: DrinkSpaceGlue
amount: !type:RangeNumberSelector
range: 1, 2
@@ -352,7 +356,7 @@
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelKeysTable
table: !type:GroupSelector
children:
@@ -377,17 +381,17 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelMaterialsTable
tableId: RandomSatchelMaterialsTable #1x medium
- !type:NestedSelector
tableId: RandomSatchelImplantersTable
tableId: RandomSatchelImplantersTable #1x small
- !type:NestedSelector
tableId: RandomSatchelCellsTable
tableId: RandomSatchelCellsTable #1x small
- !type:NestedSelector
tableId: RandomSatchelSyndicateTable
tableId: RandomSatchelSyndicateTable #1x medium
- !type:NestedSelector
tableId: RandomSatchelToolsTable
tableId: RandomSatchelToolsTable #1x small
- type: entityTable
- type: entityTable #1x medium
id: RandomSatchelMaterialsTable
table: !type:GroupSelector
children:
@@ -424,7 +428,7 @@
weight: 2
- id: SheetUranium
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelImplantersTable
table: !type:GroupSelector
children:
@@ -434,7 +438,7 @@
- id: BikeHornImplanter
- id: SadTromboneImplanter
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCellsTable
table: !type:GroupSelector
children:
@@ -444,7 +448,7 @@
- id: PowerCellMicroreactor
- id: PowerCellHigh
- type: entityTable
- type: entityTable #1x medium
id: RandomSatchelSyndicateTable
table: !type:GroupSelector
children:
@@ -459,8 +463,9 @@
- id: RadioJammer
- id: SoapSyndie
- id: SingularityToy
- id: DehydratedSpaceCarp
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelToolsTable
table: !type:GroupSelector
children:
@@ -477,15 +482,15 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelAlcoholTable
tableId: RandomSatchelAlcoholTable #2x medium
- !type:NestedSelector
tableId: RandomSatchelInstrumentTable
tableId: RandomSatchelInstrumentTable #1x Medium
- !type:NestedSelector
tableId: RandomSatchelMedsTable
tableId: RandomSatchelMedsTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelMysteriesTable
tableId: RandomSatchelMysteriesTable #1x Medium
- type: entityTable
- type: entityTable #2x medium
id: RandomSatchelAlcoholTable
table: !type:GroupSelector
children:
@@ -493,18 +498,18 @@
weight: 5
- id: DrinkCognacBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkGildlagerBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkPatronBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkRumBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- type: entityTable
- type: entityTable #1x Medium
id: RandomSatchelInstrumentTable
table: !type:GroupSelector
children:
@@ -517,7 +522,7 @@
- id: RockGuitarInstrument
- id: BassGuitarInstrument
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelMedsTable
table: !type:GroupSelector
children:
@@ -552,7 +557,7 @@
- id: Stimpack
- id: CombatMedipen
- type: entityTable
- type: entityTable #1x Medium
id: RandomSatchelMysteriesTable
table: !type:GroupSelector
children:
@@ -597,13 +602,13 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelGearTable
tableId: RandomSatchelGearTable #1x Huge
- !type:NestedSelector
tableId: RandomSatchelGadgetsTable
tableId: RandomSatchelGadgetsTable #2x small
- !type:NestedSelector
tableId: CubeTable
tableId: CubeTable #10x tiny
- type: entityTable
- type: entityTable #1x Huge
id: RandomSatchelGearTable
table: !type:GroupSelector
children:
@@ -615,7 +620,7 @@
- id: HandheldStationMap
- id: PinpointerStation
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelGadgetsTable
table: !type:GroupSelector
children:
@@ -633,7 +638,7 @@
- id: ChameleonProjector
weight: 0.25
- type: entityTable
- type: entityTable #10x tiny
id: CubeTable
table: !type:GroupSelector
children:

3
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -481,6 +481,7 @@
- MagazineMagnum
- CombatKnife
- Truncheon
- HandGrenade
components:
- Stunbaton
- FlashOnTrigger
@@ -656,7 +657,7 @@
- type: Clothing
sprite: Clothing/Belt/militarywebbing.rsi
- type: ExplosionResistance
damageCoefficient: 0.5
damageCoefficient: 0.1
- type: entity
parent: ClothingBeltMilitaryWebbing

17
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
View File

@@ -283,8 +283,23 @@
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyFreelance
- EncryptionKeyFreelance
- type: Sprite
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: entity
parent: [ClothingHeadset, BaseMagicalContraband]
id: ClothingHeadsetWizard
name: wizard headset
description: A headset used by the dreaded space wizards.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyStationMaster
- type: Sprite
sprite: Clothing/Ears/Headsets/wizard.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/wizard.rsi

17
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
View File

@@ -155,3 +155,20 @@
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: entity
parent: [ClothingHeadsetAlt, BaseMagicalContraband]
id: ClothingHeadsetAltWizard
name: wizard's over-ear headset
components:
- type: Headset
- type: EncryptionKeyHolder
keySlots: 5
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyStationMaster
- type: Sprite
sprite: Clothing/Ears/Headsets/wizard.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/wizard.rsi

4
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
View File

@@ -210,8 +210,8 @@
- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband]
id: ClothingEyesHudSyndicateAgent
name: syndicate agent visor
description: The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status.
name: syndicate medical visor
description: The Syndicate Corpsman's professional heads-up display, designed for quick diagnosis of their team's status.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/syndagent.rsi

5
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
View File

@@ -249,6 +249,11 @@
- type: TemperatureProtection
heatingCoefficient: 1.05
coolingCoefficient: 0.7
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.90
- type: Armor # so zombification resistance shows up
modifiers:
coefficients: { }
- type: GroupExamine
- type: HideLayerClothing
slots:

19
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -453,7 +453,7 @@
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndieElite
name: syndicate elite helmet
description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
description: An elite version of the blood-red hardsuit's helmet, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndieelite.rsi
@@ -580,7 +580,7 @@
#Pirate Captain Hardsuit
- type: entity
parent: ClothingHeadHardsuitBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitPirateCap
name: pirate captain's hardsuit helmet
suffix: Pirate
@@ -590,9 +590,20 @@
sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
- type: PointLight # Color matches visor colors, radius/energy same as mining hardsuit for the big captain.
color: "#f3ea9c"
radius: 7
energy: 3
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
#CENTCOMM / ERT HARDSUITS
#ERT Leader Hardsuit
@@ -643,6 +654,8 @@
sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
- type: PointLight
color: "#f4ffad"
- type: FireProtection
reduction: 0.2
- type: Armor
modifiers:
coefficients:
@@ -738,6 +751,8 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.75
#Deathsquad Hardsuit
- type: entity

85
Resources/Prototypes/Entities/Clothing/Head/hats.yml
View File

@@ -192,6 +192,22 @@
- type: Clothing
sprite: Clothing/Head/Hats/beret_merc.rsi
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretCommand
name: command beret
description: A beret with a Command insignia emblazoned on it. It has an aura of authority.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_command.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_command.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBowlerHat
@@ -421,15 +437,28 @@
sprite: Clothing/Head/Hats/redwizard.rsi
- type: entity
parent: ClothingHeadBase
parent: [ClothingHeadBase, BaseFoldable]
id: ClothingHeadHatSantahat
name: santa hat
description: A festive hat worn by Santa Claus.
description: A festive hat worn by Santa Claus. Now with a foldable beard.
components:
- type: Sprite
sprite: Clothing/Head/Hats/santahat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/santahat.rsi
- type: Appearance
- type: Foldable
canFoldInsideContainer: true
- type: FoldableClothing
foldedEquippedPrefix: nobeard
foldedHeldPrefix: nobeard
- type: Sprite
sprite: Clothing/Head/Hats/santahat.rsi
layers:
- state: icon
map: ["unfoldedLayer"]
- state: icon-nobeard
map: [ "foldedLayer" ]
visible: true
- type: entity
parent: ClothingHeadBase
@@ -523,6 +552,43 @@
map: ["foldedLayer"]
visible: false
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCanadaBeanie
name: beanie
description: Red, white and snug. It radiates a homely feeling, if your home happens to be chilly and filled with coffeehouses.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beanie.rsi
layers:
- state: body-icon
- state: cuffcrown-icon
color: "#a60b0b"
- state: pompom-icon
color: "#a60b0b"
- type: Item
inhandVisuals:
left:
- state: body-inhand-left
- state: cuffcrown-inhand-left
color: "#a60b0b"
- state: pompom-inhand-left
color: "#a60b0b"
right:
- state: body-inhand-right
- state: cuffcrown-inhand-right
color: "#a60b0b"
- state: pompom-inhand-right
color: "#a60b0b"
- type: Clothing
sprite: Clothing/Head/Hats/beanie.rsi
clothingVisuals:
head:
- state: body-equipped-HELMET
- state: cuffcrown-equipped-HELMET
color: "#a60b0b"
- state: pompom-equipped-HELMET
color: "#a60b0b"
- type: entity
parent: ClothingHeadHatWizardBase
@@ -1148,3 +1214,14 @@
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatSolidHeadband
name: solid headband
description: "You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)"
components:
- type: Sprite
sprite: Clothing/Head/Hats/solidheadband.rsi
- type: Clothing
sprite: Clothing/Head/Hats/solidheadband.rsi

54
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View File

@@ -6,6 +6,19 @@
id: ClothingHeadHelmetBase
abstract: true
components:
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetArmoredBase
abstract: true
components:
- type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
modifiers:
coefficients:
@@ -13,17 +26,10 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
#Basic Helmet (Security Helmet)
- type: entity
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband]
id: ClothingHeadHelmetBasic
name: helmet
description: Standard security gear. Protects the head from impacts.
@@ -39,7 +45,7 @@
#Mercenary Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMajorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ]
id: ClothingHeadHelmetMerc
name: mercenary helmet
description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
@@ -51,7 +57,7 @@
#SWAT Helmet
- type: entity
parent: [ClothingHeadBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
id: ClothingHeadHelmetSwat
name: SWAT helmet
description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
@@ -87,7 +93,7 @@
#Light Riot Helmet
- type: entity
parent: [ClothingHeadBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
id: ClothingHeadHelmetRiot
name: light riot helmet
description: It's a helmet specifically designed to protect against close range attacks.
@@ -146,7 +152,7 @@
#Cult Helmet
- type: entity
parent: [ClothingHeadBase, BaseMajorContraband]
parent: [ClothingHeadHelmetBase, BaseMajorContraband]
id: ClothingHeadHelmetCult
name: cult helmet
description: A robust, evil-looking cult helmet.
@@ -189,7 +195,7 @@
#Knight Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetTemplar
name: knight helmet
description: Decorative helmet fashioned to resemble the knights of old.
@@ -203,7 +209,7 @@
#Thunderdome Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetThunderdome
name: thunderdome helmet
description: Let the battle commence!
@@ -215,7 +221,7 @@
#Wizard Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetWizardHelm
name: wizard helm
description: Strange-looking helmet that most certainly belongs to a real magic user.
@@ -293,7 +299,7 @@
#Chitinous Helmet
- type: entity
parent: [ ClothingHeadBase, BaseMajorContraband]
parent: [ ClothingHeadHelmetBase, BaseMajorContraband]
id: ClothingHeadHelmetLing
name: chitinous helmet
description: An all-consuming chitinous mass of armor.
@@ -313,7 +319,7 @@
#ERT HELMETS
#ERT Leader Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: [ BaseCentcommContraband, ClothingHeadHelmetArmoredBase ]
id: ClothingHeadHelmetERTLeader
name: ERT leader helmet
description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights.
@@ -325,7 +331,7 @@
#ERT Security Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTSecurity
name: ERT security helmet
description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights.
@@ -337,7 +343,7 @@
#ERT Medic Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTMedic
name: ERT medic helmet
description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights.
@@ -349,7 +355,7 @@
#ERT Engineer Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTEngineer
name: ERT engineer helmet
description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights.
@@ -361,7 +367,7 @@
#ERT Janitor Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTJanitor
name: ERT janitor helmet
description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights.
@@ -391,7 +397,7 @@
#Bone Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetBone
name: bone helmet
description: Cool-looking helmet made of skull of your enemies.
@@ -405,7 +411,7 @@
node: helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetPodWars
name: ironclad II helmet
description: An ironclad II helmet, a relic of the pod wars.
@@ -417,7 +423,7 @@
#Justice Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseSecurityContraband ]
parent: ClothingHeadHelmetBasic
id: ClothingHeadHelmetJustice
name: justice helm
description: Advanced security gear. Protects the station from ne'er-do-wells.

11
Resources/Prototypes/Entities/Clothing/Head/hoods.yml
View File

@@ -11,6 +11,11 @@
sprite: Clothing/Head/Hoods/Bio/general.rsi
- type: BreathMask
- type: IngestionBlocker
- type: GroupExamine
- type: Armor
modifiers: { }
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.9
- type: Tag
tags:
- WhitelistChameleon
@@ -33,6 +38,8 @@
sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: Clothing
sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.8
- type: entity
parent: ClothingHeadHatHoodBioGeneral
@@ -78,13 +85,15 @@
id: ClothingHeadHatHoodBioVirology
name: bio hood
suffix: Virology
description: A hood that protects the head and face from biological contaminants.
description: A hood that strongly protects the head and face from biological contaminants.
components:
- type: IdentityBlocker
- type: Sprite
sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: Clothing
sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.8
- type: entity
parent: ClothingHeadBase

16
Resources/Prototypes/Entities/Clothing/Head/soft.yml
View File

@@ -99,6 +99,22 @@
id: ClothingHeadHatQMsoftFlipped
name: quartermaster's cap
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCommandSoft
name: command cap
description: It's a baseball hat painted in Command colours.
components:
- type: Sprite
sprite: Clothing/Head/Soft/commandsoft.rsi
- type: Clothing
sprite: Clothing/Head/Soft/commandsoft.rsi
- type: entity
parent: [ ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCommandSoft ]
id: ClothingHeadHatCommandSoftFlipped
name: command cap
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCorpsoft

4
Resources/Prototypes/Entities/Clothing/Masks/masks.yml
View File

@@ -137,6 +137,10 @@
tags:
- PetWearable
- WhitelistChameleon
- type: PhysicalComposition
materialComposition:
Steel: 50
Plastic: 50
- type: entity
parent: ClothingMaskBreathMedical

6
Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
View File

@@ -12,8 +12,8 @@
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
id: ClothingNeckMantleCE
name: chief engineer's mantle
description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle.
name: chief engineer's manica
description: A segmented arm covering for the experienced Chief Engineer, to signify the hazards of the job and the dangers faced to earn it.
components:
- type: Sprite
sprite: Clothing/Neck/mantles/cemantle.rsi
@@ -84,4 +84,4 @@
- type: Sprite
sprite: Clothing/Neck/mantles/mantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/mantle.rsi
sprite: Clothing/Neck/mantles/mantle.rsi

22
Resources/Prototypes/Entities/Clothing/Neck/pins.yml
View File

@@ -133,6 +133,17 @@
- type: Clothing
equippedPrefix: pan
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckPluralPin
name: plural pin
description: Be plural, do crimes.
components:
- type: Sprite
state: plural
- type: Clothing
equippedPrefix: plural
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckOmnisexualPin
@@ -155,6 +166,17 @@
- type: Clothing
equippedPrefix: gender
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckGenderfluidPin
name: genderfluid pin
description: be gender, be fluid
components:
- type: Sprite
state: fluid
- type: Clothing
equippedPrefix: fluid
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckTransPin

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

@@ -130,6 +130,8 @@
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.35
#- type: StaminaResistance
# damageCoefficient: 0.45
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
@@ -179,6 +181,8 @@
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 2
- type: Item
size: Normal
- type: entity
parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]

30
Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
View File

@@ -12,7 +12,13 @@
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
Caustic: 0.75
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.35
- type: GroupExamine
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 0.95
- type: entity
parent: ClothingOuterBioGeneral
@@ -31,12 +37,16 @@
id: ClothingOuterBioJanitor
name: bio suit
suffix: Janitor
description: A suit that protects against biological contamination, in Janitor colors.
description: A suit that protects against biological contamination and caustic spills.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.4
- type: entity
parent: ClothingOuterBioGeneral
@@ -51,25 +61,35 @@
sprite: Clothing/OuterClothing/Bio/scientist.rsi
- type: entity
parent: ClothingOuterBioGeneral
parent: [ClothingOuterBioGeneral, BaseSecurityContraband]
id: ClothingOuterBioSecurity
name: bio suit
suffix: Security
description: A suit that protects against biological contamination, in Security colors.
description: A suit that protects against biological contamination, kitted out with additional armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.8
Slash: 0.6
Piercing: 0.8
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.4
- type: entity
parent: ClothingOuterBioGeneral
id: ClothingOuterBioVirology
name: bio suit
suffix: Virology
description: A suit that protects against biological contamination, in Virology colors.
description: A suit that strongly protects against biological contamination.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.25

11
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
View File

@@ -66,9 +66,9 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.7
Blunt: 0.65
Slash: 0.65
Piercing: 0.6
Heat: 0.7
Caustic: 0.75 # not the full 90% from ss13 because of the head
- type: ExplosionResistance
@@ -82,10 +82,11 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Blunt: 0.65
Slash: 0.65
Piercing: 0.7
Heat: 0.7
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9

40
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
View File

@@ -251,6 +251,7 @@
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.8
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
@@ -305,9 +306,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.6
Blunt: 0.4
Slash: 0.5
Piercing: 0.6
Heat: 0.8
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.7
@@ -466,13 +468,14 @@
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.6
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.5
Piercing: 0.5
Heat: 0.8
Radiation: 0.5
Caustic: 0.6
- type: ClothingSpeedModifier
@@ -533,6 +536,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.75
- type: Armor
modifiers:
coefficients:
@@ -577,7 +582,7 @@
parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband]
id: ClothingOuterHardsuitSyndieElite
name: syndicate elite hardsuit
description: An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.
description: An elite version of the blood-red hardsuit, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/syndieelite.rsi
@@ -593,6 +598,8 @@
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -627,6 +634,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -637,8 +646,8 @@
Radiation: 0.25
Caustic: 0.4
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
@@ -659,6 +668,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.3
#- type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
# damageCoefficient: 0.99
- type: Armor
modifiers:
coefficients:
@@ -674,6 +685,9 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCybersun
- type: Tag
tags:
- MonkeyWearable
#Wizard Hardsuit
- type: entity
@@ -740,7 +754,7 @@
#Pirate EVA Suit (Deep Space EVA Suit)
#Despite visually appearing like a softsuit, it functions exactly like a hardsuit would (parents off of base hardsuit, has resistances and toggleable clothing, etc.) so it goes here.
- type: entity
parent: ClothingOuterHardsuitBase
parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ]
id: ClothingOuterHardsuitPirateEVA
name: deep space EVA suit
suffix: Pirate
@@ -748,6 +762,8 @@
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
- type: Item
size: Huge
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
- type: ExplosionResistance
@@ -771,13 +787,15 @@
#Pirate Captain Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ]
id: ClothingOuterHardsuitPirateCap
name: pirate captain's hardsuit
description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
- type: Item
size: Huge
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
- type: PressureProtection
@@ -844,6 +862,8 @@
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
- type: FireProtection
reduction: 0.8
#ERT Medic Hardsuit
- type: entity
@@ -912,6 +932,8 @@
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8
- type: StaminaResistance
damageCoefficient: 0.15 # Needs 21 hits with a disabler to stun :godo:
- type: Armor
modifiers:
coefficients:
@@ -958,6 +980,8 @@
Shock: 0.1
Radiation: 0.1
Caustic: 0.1
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.25
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0

32
Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
View File

@@ -19,6 +19,34 @@
- type: ExplosionResistance
damageCoefficient: 0.9
#Elite web vest
- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband]
id: ClothingOuterVestWebElite
name: elite web vest
description: A synthetic armor vest. This one has added webbing and heat resistant fibers.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Vests/elitevest.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/elitevest.rsi
- type: TemperatureProtection
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.7
Heat: 0.3
Radiation: 0.5
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.5
- type: FireProtection
reduction: 0.85
#Mercenary web vest
- type: entity
parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo
@@ -99,3 +127,7 @@
sprite: Clothing/OuterClothing/Vests/tankharness.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/tankharness.rsi
- type: Item
size: Normal # Make smaller than typical outer clothing
shape:
- 0, 0, 0, 1

4
Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
View File

@@ -19,6 +19,8 @@
Slash: 0.95
Heat: 0.90
priceMultiplier: 0
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.55
- type: Food
requiresSpecialDigestion: true
- type: SolutionContainerManager
@@ -781,7 +783,7 @@
##############################################################
- type: entity
parent: [ClothingOuterWinterWarden, BaseSyndicateContraband]
parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ]
id: ClothingOuterWinterSyndieCapArmored
name: syndicate's armored winter coat
description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool."

4
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
View File

@@ -18,6 +18,10 @@
- type: ComponentToggler
components:
- type: NoSlip
- type: ItemTogglePrefix
prefixOn: on
- type: ToggleClothingPrefix
prefixOn: on
- type: Magboots
- type: ClothingSpeedModifier
walkModifier: 0.85

17
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
@@ -221,6 +221,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
id: ClothingUniformJumpskirtCommandGeneric
name: command jumpskirt
description: A generic Command-colored jumpsuit not associated with any particular department.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtHydroponics
@@ -614,7 +625,7 @@
sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi
- type: entity
parent: ClothingUniformSkirtBase
parent: [ ClothingUniformSkirtBase, BaseSyndicateContraband ]
id: ClothingUniformJumpskirtSyndieFormalDress
name: syndicate formal dress
description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."

11
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
View File

@@ -396,6 +396,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
- type: entity
parent: [ ClothingUniformBase, BaseCommandContraband ]
id: ClothingUniformJumpsuitCommandGeneric
name: command jumpsuit
description: A generic Command-colored jumpsuit not associated with any particular department.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHydroponics

8
Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
View File

@@ -15,7 +15,7 @@
sprite: Clothing/Uniforms/Jumpsuit/recruit_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitRecruitSyndie
name: syndicate recruit jumpsuit
description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.
@@ -38,7 +38,7 @@
sprite: Clothing/Uniforms/Jumpsuit/repairman_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitRepairmanSyndie
name: syndicate repairman jumpsuit
description: Functional, fashionable, and badass. Nanotrasen's engineers wish they could look as good as this.
@@ -61,7 +61,7 @@
sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitParamedicSyndie
name: syndicate paramedic jumpsuit
description: For some reason, wearing this makes you feel like you're awfully close to violating the Geneva Convention.
@@ -85,7 +85,7 @@
sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitChiefEngineerSyndie
name: syndicate chief engineer jumpsuit
description: An evil-looking jumpsuit with a reflective vest & red undershirt. #TODO: Write a better description for this once Ship vs. Ship is real and actual player habits begin forming

8
Resources/Prototypes/Entities/Effects/admin_triggers.yml
View File

@@ -20,6 +20,14 @@
range: 4
energyConsumption: 50000
- type: entity
id: AdminInstantEffectBluespace
suffix: BluespaceFlash
parent: AdminInstantEffectBase
components:
- type: SpawnOnTrigger
proto: EffectFlashBluespace
- type: entity
id: AdminInstantEffectFlash
suffix: Flash

2
Resources/Prototypes/Entities/Effects/chemistry_effects.yml
View File

@@ -183,7 +183,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 50
damage: 12
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]

19
Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml Normal file
View File

@@ -0,0 +1,19 @@
- type: entity
id: EffectDesynchronizer
categories: [ HideSpawnMenu ]
components:
- type: Sprite
drawdepth: Effects
noRot: true
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Effects/chronofield.rsi
state: chronofield
- type: AnimationPlayer
- type: EffectVisuals
- type: TimedDespawn
lifetime: 0.8
- type: Tag
tags:
- HideContextMenu

2
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -113,6 +113,8 @@
components:
- type: Clickable
- type: Slippery
- type: TileFrictionModifier
modifier: 0.3
- type: Transform
noRot: true
anchored: true

3
Resources/Prototypes/Entities/Effects/shuttle.yml
View File

@@ -3,6 +3,9 @@
categories: [ HideSpawnMenu ]
description: Visualizer for shuttles arriving. You shouldn't see this!
components:
- type: Transform
noRot: true
gridTraversal: false
- type: FtlVisualizer
sprite:
sprite: /Textures/Effects/medi_holo.rsi

1
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
View File

@@ -18,5 +18,6 @@
- FoodBoxDonkpocketBerry
- FoodBoxDonkpocketHonk
- FoodBoxDonkpocketDink
- FoodBoxDonkpocketMoth
chance: 0.5
offset: 0.0

12
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
View File

@@ -16,6 +16,7 @@
prototypes:
- DrinkAbsintheGlass
- DrinkAleGlass
- DrinkAlienBrainHemorrhage
- DrinkAloe
- DrinkAndalusia
- DrinkAntifreeze
@@ -32,17 +33,21 @@
- DrinkBloodyMaryGlass
- DrinkBooger
- DrinkBraveBullGlass
- DrinkBronxGlass
- BudgetInsulsDrinkGlass
- DrinkCarrotJuice
- DrinkCoconutRum
- DrinkChocolateGlass
- DrinkCognacGlass
- DrinkCosmopolitan
- DrinkCrushDepthGlass
- DrinkCubaLibreGlass
- DrinkDarkandStormyGlass
- DrinkDeadRumGlass
- DrinkDevilsKiss
- DrinkDriestMartiniGlass
- DrinkDrGibbGlass
- DrinkElectricSharkGlass
- DrinkErikaSurprise
- DrinkFourteenLokoGlass
- DrinkGargleBlasterGlass
@@ -62,6 +67,9 @@
- DrinkIrishSlammer
- DrinkIrishCoffeeGlass
- DrinkLemonadeGlass
- DrinkJackRoseGlass
- DrinkJungleBirdGlass
- DrinkKalimotxoGlass
- DrinkKiraSpecial
- DrinkLongIslandIcedTeaGlass
- DrinkManhattanGlass
@@ -71,11 +79,13 @@
- DrinkMeadGlass
- DrinkMilkshake
- DrinkMojito
- DrinkMonkeyBusinessGlass
- DrinkNTCahors
- DrinkPainkillerGlass
- DrinkPatronGlass
- DrinkPinaColadaGlass
- DrinkPoscaGlass
- DrinkRadlerGlass
- DrinkRedMeadGlass
- DrinkRewriter
- DrinkRoyRogersGlass
@@ -92,7 +102,9 @@
- DrinkSyndicatebomb
- DrinkTequilaSunriseGlass
- DrinkThreeMileIslandGlass
- DrinkTortugaGlass
- DrinkToxinsSpecialGlass
- DrinkVampiroGlass
- DrinkVodkaMartiniGlass
- DrinkVodkaRedBool
- DrinkVodkaTonicGlass

1
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
View File

@@ -56,6 +56,7 @@
- FoodBakedCookieRaisin
- FoodBakedCookieSugar
- FoodBakedGrilledCheeseSandwich
- FoodBakedGrilledCheeseSandwichCotton
- FoodBakedNugget
- FoodBakedPancake
- FoodBakedPancakeBb

3
Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
View File

@@ -30,6 +30,7 @@
- type: entity
id: RandomRockAnomalySpawner
name: random rock anomaly spawner
parent: MarkerBase
components:
- type: Sprite
@@ -50,6 +51,7 @@
- type: entity
id: RandomAnomalyInjectorSpawner
name: random anomaly injector spawner
parent: MarkerBase
components:
- type: Sprite
@@ -71,4 +73,3 @@
- AnomalyTrapRock
#- AnomalyTrapSanta
chance: 1

8
Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
View File

@@ -10,16 +10,8 @@
state: ano01
- type: RandomSpawner
prototypes:
- SimpleXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- ComplexXenoArtifact
- ComplexXenoArtifact
- ComplexXenoArtifact
- SimpleXenoArtifactItem
- MediumXenoArtifactItem
- ComplexXenoArtifactItem
chance: 1

61
Resources/Prototypes/Entities/Markers/Spawners/Random/cables.yml Normal file
View File

@@ -0,0 +1,61 @@
- type: entity
parent: MarkerBase
id: RandomCableHVSpawner
name: HV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/hv_cable.rsi
state: hvcable_3
- sprite: Structures/Power/Cables/hv_cable.rsi
state: hvcable_12
- type: RandomSpawner
prototypes:
- CableHV
chance: 0.5
- type: entity
parent: MarkerBase
id: RandomCableMVSpawner
name: MV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvcable_3
color: Yellow
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvstripes_3
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvcable_12
color: Yellow
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvstripes_12
- type: RandomSpawner
prototypes:
- CableMV
chance: 0.5
- type: entity
parent: MarkerBase
id: RandomCableApcExtensionSpawner
name: LV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/lv_cable.rsi
state: lvcable_3
color: Green
- sprite: Structures/Power/Cables/lv_cable.rsi
state: lvcable_12
color: Green
- type: RandomSpawner
prototypes:
- CableApcExtension
chance: 0.5

191
Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
View File

@@ -24,6 +24,138 @@
chance: 0.7
offset: 0.0
- type: entityTable
id: LowValueInstrumentCrateTable
table: !type:GroupSelector
children:
- id: CrateFunInstrumentsVariety
- id: CrateFunInstrumentsBrass
- id: CrateFunInstrumentsString
- id: CrateFunInstrumentsWoodwind
- id: CrateFunInstrumentsKeyedPercussion
- id: CrateFunInstrumentsSpecial
weight: 0.01
- id: CrateFunSadTromboneImplants
weight: 0.01
- type: entityTable
id: LowValueFunCrateTable
table: !type:GroupSelector
children:
- id: CrateFunPlushie
weight: 2
- id: CrateFunLizardPlushieBulk
- id: CrateFunSharkPlushieBulk
- id: CrateCandles
- id: CrateFunArtSupplies
- id: CrateFunFoamGuns
weight: 0.01
- type: entityTable
id: LowValueMaterialCrateTable
table: !type:GroupSelector
children:
- id: CrateMaterialGlass
- id: CrateMaterialSteel
- id: CrateMaterialPlastic
- id: CrateMaterialWood
- id: CrateMaterialPlasteel
- id: CrateMaterialBasicResource
- id: CrateMaterialRandom
weight: 4
- type: entityTable
id: LowValueEmergencyCrateTable
table: !type:GroupSelector
children:
- id: CrateEmergencyFire
- id: CrateEmergencyInternals
- id: CrateEmergencyInflatablewall
weight: 0.5
- type: entityTable
id: LowValueServiceCrateTable
table: !type:GroupSelector
children:
- id: CrateServiceColorfulLights
- id: CrateServiceReplacementLights
- id: CrateServiceBureaucracy
- id: PetCarrier
- id: CrateHydroponicsTools
- id: CrateHydroponicsSeeds
- id: CrateHydroponicsSeedsExotic
weight: 0.5
- id: CrateHydroponicsSeedsMedicinal
weight: 0.5
- id: CrateServiceJanitorialSupplies
- id: JanitorialTrolley
weight: 0.2
- type: entityTable
id: LowValueEngineeringCrateTable
table: !type:GroupSelector
children:
- id: CrateEngineeringCableLV
- id: CrateEngineeringCableMV
- id: CrateEngineeringCableHV
- id: CrateEngineeringCableBulk
- id: CrateTechBoardRandom
- id: CrateEngineeringSpaceHeater
- id: StorageCanister
weight: 0.5
- type: entityTable
id: LowValueMedicalCrateTable
table: !type:GroupSelector
children:
- id: CrateEmergencyBurnKit
- id: CrateEmergencyToxinKit
- id: CrateEmergencyBruteKit
- id: CrateEmergencyO2Kit
- id: CrateEmergencyRadiationKit
- id: CrateBodyBags
- id: CrateChemistrySupplies
- id: CrateChemistryP
weight: 0.5
- id: CrateChemistryS
weight: 0.5
- id: CrateChemistryD
weight: 0.5
- type: entityTable
id: LowValueScienceCrateTable
table: !type:GroupSelector
children:
- id: CrateArtifactContainer
- id: HandheldArtifactContainer
weight: 0.2
- id: CrateMaterialPlasma
- type: entityTable
id: LowValueCrateTable
table: !type:GroupSelector
children:
- !type:NestedSelector
tableId: LowValueFunCrateTable
- !type:NestedSelector
tableId: LowValueInstrumentCrateTable
weight: 0.2
- !type:NestedSelector
tableId: LowValueMaterialCrateTable
weight: 2
- !type:NestedSelector
tableId: LowValueEmergencyCrateTable
- !type:NestedSelector
tableId: LowValueServiceCrateTable
- !type:NestedSelector
tableId: LowValueEngineeringCrateTable
- !type:NestedSelector
tableId: LowValueMedicalCrateTable
weight: 0.2
- !type:NestedSelector
tableId: LowValueScienceCrateTable
weight: 0.2
- type: entity
name: Filled Crate Spawner
id: CrateFilledSpawner
@@ -35,34 +167,10 @@
- state: red
- sprite: Structures/Storage/Crates/o2.rsi
state: icon
- type: RandomSpawner
prototypes:
- CrateServiceReplacementLights
- CrateServiceBureaucracy
- CrateChemistrySupplies
- CrateMaterialGlass
- CrateMaterialSteel
- CrateMaterialPlastic
- CrateMaterialWood
- CrateMaterialPlasteel
- CrateMaterialRandom
- CrateFunArtSupplies
- CrateEngineeringCableLV
- CrateEngineeringCableMV
- CrateEngineeringCableHV
- CrateEngineeringCableBulk
- CrateTechBoardRandom
- CrateEmergencyFire
- CrateEmergencyInternals
- CrateEmergencyInflatablewall
- CrateHydroponicsTools
- CrateHydroponicsSeeds
- PetCarrier
chance: 0.7
rarePrototypes:
- CrateMaterialPlasma
- CrateHydroponicsSeedsExotic
rareChance: 0.1
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: LowValueCrateTable
prob: 0.8
offset: 0.0
- type: entity
@@ -139,3 +247,30 @@
- CrateSecurityBiosuit
chance: 0.9
offset: 0.0
- type: entityTable
id: LockboxTable
table: !type:GroupSelector
children:
- id: CrateLockBoxEngineering
- id: CrateLockBoxMedical
- id: CrateLockBoxSecurity
- id: CrateLockBoxScience
- id: CrateLockBoxService
- type: entity
name: random lockbox spawner
id: LootSpawnerRandomLockbox
parent: MarkerBase
suffix: 90%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: LockboxTable
prob: 0.9
offset: 0.0

2
Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
View File

@@ -8,7 +8,7 @@
- type: Transform
anchored: false
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
sprite: Objects/Misc/folders.rsi
layers:
- state: folder-base
- state: folder-colormap

2
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
View File

@@ -152,8 +152,10 @@
- id: ClothingNeckLesbianPin
- id: ClothingNeckNonBinaryPin
- id: ClothingNeckPansexualPin
- id: ClothingNeckPluralPin
- id: ClothingNeckOmnisexualPin
- id: ClothingNeckGenderqueerPin
- id: ClothingNeckGenderfluidPin
- id: ClothingNeckTransPin
- id: ClothingNeckAutismPin
- id: ClothingNeckGoldAutismPin

1
Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
View File

@@ -147,7 +147,6 @@
- PosterLegitJustAWeekAway
- PosterLegitSecWatch
- PosterLegitVacation
- PosterLegitPeriodicTable
- PosterLegitRenault
- PosterLegitNTTGC
- PosterLegitSafetyMothDelam

3
Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
View File

@@ -1,5 +1,6 @@
- type: entity
id: ShadowKudzuLootSpawner
name: shadow kudzu loot spawner
parent: MarkerBase
components:
- type: Sprite
@@ -23,4 +24,4 @@
rareChance: 0.05
rarePrototypes:
- MobCatShadow
- ArtifactFragment
- ArtifactFragment1

22
Resources/Prototypes/Entities/Markers/warp_point.yml
View File

@@ -16,6 +16,22 @@
- type: WarpPoint
location: beacon
# Use for areas like CC
- type: entity
id: GhostWarpPoint
parent: MarkerBase
name: ghost only warp point
components:
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
blacklist:
tags:
- GhostOnlyWarp
- type: Sprite
state: pink
- type: entity
parent: WarpPoint
id: WarpPointBombing
@@ -23,8 +39,14 @@
suffix: ninja bombing target
components:
- type: BombingTarget
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
location: bombing target
blacklist:
tags:
- GhostOnlyWarp
- type: Sprite
layers:
- state: pink

27
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
View File

@@ -173,6 +173,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger
- type: marking
id: LizardTailAquatic
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_aquatic
- type: marking
id: LizardSnoutRound
bodyPart: Snout
@@ -339,6 +348,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: body_backspikes
- type: marking
id: LizardChestFin
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: body_fin
# Animated
- type: marking
id: LizardTailSmoothAnimated
@@ -377,3 +395,12 @@
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger_wagging
- type: marking
id: LizardTailAquaticAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_aquatic_wagging

28
Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
View File

@@ -137,3 +137,31 @@
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_l
- type: marking
id: TattooEyeMothRight
bodyPart: Eyes
markingCategory: Overlay
speciesRestriction: [Moth]
coloring:
default:
type:
!type:EyeColoring
negative: true
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_moth_r
- type: marking
id: TattooEyeMothLeft
bodyPart: Eyes
markingCategory: Overlay
speciesRestriction: [Moth]
coloring:
default:
type:
!type:EyeColoring
negative: true
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_moth_l

7
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
View File

@@ -2,6 +2,7 @@
id: VoxFacialHairBeard
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -11,6 +12,7 @@
id: VoxFacialHairColonel
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -20,6 +22,7 @@
id: VoxFacialHairFu
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -29,6 +32,7 @@
id: VoxFacialHairMane
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -38,6 +42,7 @@
id: VoxFacialHairManeSmall
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -47,6 +52,7 @@
id: VoxFacialHairNeck
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -56,6 +62,7 @@
id: VoxFacialHairTufts
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi

24
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
View File

@@ -2,6 +2,7 @@
id: VoxHairAfro
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -11,6 +12,7 @@
id: VoxHairBraids
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -20,6 +22,7 @@
id: VoxHairCrestedQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -29,6 +32,7 @@
id: VoxHairEmperorQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -38,6 +42,7 @@
id: VoxHairFlowing
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -47,6 +52,7 @@
id: VoxHairHawk
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -56,6 +62,7 @@
id: VoxHairHorns
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -65,6 +72,7 @@
id: VoxHairKeelQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -74,6 +82,7 @@
id: VoxHairKeetQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -83,6 +92,7 @@
id: VoxHairKingly
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -92,6 +102,7 @@
id: VoxHairLongBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -101,6 +112,7 @@
id: VoxHairMange
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -110,6 +122,7 @@
id: VoxHairMohawk
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -119,6 +132,7 @@
id: VoxHairNights
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -128,6 +142,7 @@
id: VoxHairPony
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -137,6 +152,7 @@
id: VoxHairRazorClipped
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -146,6 +162,7 @@
id: VoxHairRazor
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -155,6 +172,7 @@
id: VoxHairSortBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -164,6 +182,7 @@
id: VoxHairShortQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -173,6 +192,7 @@
id: VoxHairSpotty
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -182,6 +202,7 @@
id: VoxHairSurf
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -191,6 +212,7 @@
id: VoxHairTielQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -200,6 +222,7 @@
id: VoxHairWiseBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -209,6 +232,7 @@
id: VoxHairYasu
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi

2
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
View File

@@ -113,6 +113,7 @@
- BorgChassis
- RoboticsConsole
- type: WiresPanel
openingTool: Prying
- type: ActivatableUIRequiresPanel
- type: NameIdentifier
group: Silicon
@@ -236,6 +237,7 @@
- DoorBumpOpener
- FootstepSound
- CanPilot
- SiliconEmotes
- Unimplantable
- type: Emoting
- type: GuideHelp

5
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -332,6 +332,7 @@
- type: Item
size: Tiny
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics
@@ -1681,6 +1682,7 @@
factions:
- Mouse
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics
@@ -2967,6 +2969,9 @@
- type: Tag
tags:
- VimPilot
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 4
- type: entity
name: calico cat

1
Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
View File

@@ -70,6 +70,7 @@
factions:
- SimpleHostile
- type: HTN
constantlyReplan: false
rootTask:
task: GoliathCompound
blackboard:

8
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
View File

@@ -106,6 +106,7 @@
parent: MobOreCrab
id: MobQuartzCrab
description: An ore crab made from Quartz.
suffix: Quartz
components:
- type: Sprite
state: quartz_crab
@@ -130,6 +131,7 @@
parent: MobOreCrab
id: MobIronCrab
description: An ore crab made from iron.
suffix: Iron
components:
- type: Sprite
state: iron_crab
@@ -161,6 +163,7 @@
parent: MobOreCrab
id: MobCoalCrab
description: An ore crab made from coal.
suffix: Coal
components:
- type: Sprite
state: coal_crab
@@ -192,6 +195,7 @@
parent: MobOreCrab
id: MobUraniumCrab
description: An ore crab made from uranium.
suffix: Uranium
components:
- type: FactionException
- type: NPCRetaliation
@@ -226,8 +230,8 @@
- type: entity
parent: MobOreCrab
id: MobSilverCrab
name: ore crab
description: An ore crab made from silver.
suffix: Silver
components:
- type: Sprite
state: silver_crab
@@ -255,8 +259,8 @@
- type: entity
parent: MobOreCrab
id: MobGoldCrab
name: ore crab
description: An ore crab made from gold.
suffix: Gold
components:
- type: Sprite
state: gold_crab

41
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
View File

@@ -1,33 +1,17 @@
- type: entity
save: false
abstract: true
parent: BaseMob
id: MobSiliconBase
components:
- type: LagCompensation
- type: Reactive
groups:
Acidic: [Touch]
- type: Clickable
- type: Damageable
damageContainer: Inorganic
- type: InteractionOutline
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 50
mask:
- MobMask
layer:
- MobLayer
- type: MovementSpeedModifier
baseWalkSpeed : 3
baseSprintSpeed : 4
- type: Sprite
noRot: true
drawdepth: Mobs
- type: NpcFactionMember
factions:
- SimpleNeutral
@@ -57,7 +41,7 @@
- Stutter
- Electrocution
- type: NameIdentifier
group: GenericNumber
group: Silicon
- type: Repairable
doAfterDelay: 8
fuelCost: 15
@@ -65,6 +49,7 @@
- type: Tag
tags:
- DoorBumpOpener
- SiliconEmotes
- Bot
- Unimplantable
- type: MobState
@@ -93,10 +78,6 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Input
context: "human"
- type: InputMover
- type: MobMover
- type: Body
prototype: Bot
- type: GuideHelp
@@ -107,6 +88,10 @@
speechSounds: Pai #couldn't decide if this should be borg or pai sounds so I flipped a coin.
- type: TypingIndicator
proto: robot
- type: Vocal
sounds:
Unsexed: UnisexSilicon
- type: Emoting
- type: ZombieImmune
- type: ProtectedFromStepTriggers
- type: NoSlip
@@ -179,7 +164,8 @@
rootTask:
task: HonkbotCompound
- type: Slippery
launchForwardsMultiplier: 2
slipData:
launchForwardsMultiplier: 2
- type: Speech
speechVerb: Cluwne
- type: StepTrigger
@@ -366,10 +352,8 @@
description: Why not give the mimebot a friendly wave?
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: mimebot
sprite: Mobs/Silicon/Bots/mimebot.rsi
sprite: Mobs/Silicon/Bots/mimebot.rsi
state: mimebot
- type: MimePowers
- type: Construction
graph: MimeBot
@@ -399,7 +383,7 @@
- type: Sprite
sprite: Mobs/Silicon/Bots/supplybot.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base", "movement"]
- map: ["movement"]
state: supplybot
- type: SpriteMovement
movementLayers:
@@ -451,6 +435,7 @@
tags:
- DoorBumpOpener
- FootstepSound
- SiliconEmotes
- Bot
- Unimplantable
- type: ActiveRadio

1
Resources/Prototypes/Entities/Mobs/NPCs/space.yml
View File

@@ -405,6 +405,7 @@
factions:
- Mouse
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics

2
Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
View File

@@ -24,6 +24,7 @@
- type: Hands
- type: ComplexInteraction
- type: Puller
needsHands: false
- type: CombatMode
- type: Physics
ignorePaused: true
@@ -77,7 +78,6 @@
#- type: RadarConsole
# followEntity: true
#- type: CargoOrderConsole
#- type: BankClient
#- type: CrewMonitoringConsole
#- type: GeneralStationRecordConsole
# canDeleteEntries: true

11
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
View File

@@ -154,6 +154,17 @@
- DoorBumpOpener
- type: Puller
needsHands: false
- type: RandomMetadata
nameSegments:
- NamesDragon
- NamesDragonTitle
nameFormat: name-format-dragon
- type: Prying
pryPowered: true
force: true
speedModifier: 2.5 # fast because dragon strong
useSound:
path: /Audio/Items/crowbar.ogg
- type: entity
parent: BaseMobDragon

Some files were not shown because too many files have changed in this diff Show More