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

Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-07-17 23:25:31 +03:00
parent 8cbd26ae2f 6f5077803b
commit 02275a0237
157 changed files with 554 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,6 @@
components:
- type: Clickable
- type: Slippery
launchForwardsMultiplier: 2.0
- type: Transform
noRot: true
anchored: true

1
Resources/Prototypes/Entities/Mobs/Species/slime.yml
View File

@@ -53,7 +53,6 @@
- type: Damageable
damageContainer: Biological
damageModifierSet: Slime
- type: Geras
- type: PassiveDamage # Around 8 damage a minute healed
allowedStates:
- Alive

48
Resources/Prototypes/Entities/Mobs/Species/vox.yml
View File

@@ -26,6 +26,30 @@
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
eyes:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: eyes
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
gloves:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: hand
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
back:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: back
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
- type: Speech
speechVerb: Vox
speechSounds: Vox
@@ -124,4 +148,28 @@
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
eyes:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: eyes
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
gloves:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: hand
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV
back:
layer:
sprite: Mobs/Species/Vox/displacement.rsi
state: back
copyToShaderParameters:
layerKey: dummy
parameterTexture: displacementMap
parameterUV: displacementUV

2
Resources/Prototypes/Entities/Mobs/base.yml
View File

@@ -99,6 +99,8 @@
- Piercing
- Heat
- Shock
- Cold
- Caustic
- type: DamageOnHighSpeedImpact
damage:
types:

4
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -311,7 +311,6 @@
sprite: Objects/Specific/Hydroponics/banana.rsi
heldPrefix: peel
- type: Slippery
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
@@ -388,7 +387,6 @@
path: /Audio/Effects/slip.ogg
params:
volume: -100
launchForwardsMultiplier: 1.6
- type: entity
name: bananium peel
@@ -402,8 +400,6 @@
sprite: Objects/Materials/materials.rsi
heldPrefix: peel
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 2
- type: entity
name: carrot

2
Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
View File

@@ -160,3 +160,5 @@
- AllAccess
tags:
- CentralCommand
- NuclearOperative
- SyndicateAgent

4
Resources/Prototypes/Entities/Objects/Devices/pda.yml
View File

@@ -257,9 +257,7 @@
borderColor: "#C18199"
- type: Icon
state: pda-clown
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 1.5
- type: Slippery # secretly made of bananium
- type: StepTrigger
- type: CollisionWake
enabled: false

2
Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
View File

@@ -2,7 +2,7 @@
id: Wristwatch
parent: BaseItem
name: wristwatch
description: A cheap watch for telling time. How much did you waste working on this shift?
description: A cheap watch for telling time. How much did you waste playing Space Station 14?
components:
- type: Sprite
sprite: Objects/Devices/wristwatch.rsi

2
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
View File

@@ -162,8 +162,6 @@
sound:
path: /Audio/Items/bikehorn.ogg
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 1.5
- type: StepTrigger
- type: CollisionWake
enabled: false

7
Resources/Prototypes/Entities/Objects/Fun/error.yml
View File

@@ -16,7 +16,8 @@
- ReagentId: Nutriment
Quantity: 5
- type: Slippery
launchForwardsMultiplier: 5
paralyzeTime: 3
launchForwardsMultiplier: 3
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
@@ -28,14 +29,14 @@
slips:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
bounds: "-0.4,-0.3,0.4,0.3"
hard: false
layer:
- SlipLayer
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
bounds: "-0.4,-0.3,0.4,0.3"
density: 30
mask:
- ItemMask

2
Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
View File

@@ -108,8 +108,6 @@
- type: Transform
anchored: true
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: Physics

15
Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
View File

@@ -21,8 +21,6 @@
sprite: Objects/Specific/Janitorial/soap.rsi
storedRotation: -90
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
@@ -129,8 +127,8 @@
- type: SolutionContainerVisuals
fillBaseName: syndie-
- type: Slippery
paralyzeTime: 5
launchForwardsMultiplier: 2.5
paralyzeTime: 3
launchForwardsMultiplier: 3
- type: Item
heldPrefix: syndie
- type: FlavorProfile
@@ -154,8 +152,8 @@
layers:
- state: syndie-soaplet
- type: Slippery
paralyzeTime: 5
launchForwardsMultiplier: 2.5
paralyzeTime: 1.5 # these things are tiny
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.04
- type: Item
@@ -196,7 +194,6 @@
- type: SolutionContainerVisuals
fillBaseName: gibs-
- type: Slippery
paralyzeTime: 2
- type: StepTrigger
- type: Item
heldPrefix: gibs
@@ -221,8 +218,8 @@
- type: SolutionContainerVisuals
fillBaseName: omega-
- type: Slippery
paralyzeTime: 7
launchForwardsMultiplier: 3
paralyzeTime: 5.0
launchForwardsMultiplier: 3.0
- type: Item
heldPrefix: omega
- type: SolutionContainerManager

18
Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
View File

@@ -173,12 +173,12 @@
sprite: Objects/Specific/Medical/Surgery/saw.rsi
state: saw
- type: Item
size: Normal
sprite: Objects/Specific/Medical/Surgery/saw.rsi
storedRotation: 90
- type: Tool
qualities:
- Sawing
speedModifier: 1.0
# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
- type: entity
@@ -190,6 +190,7 @@
- type: Sprite
state: improv
- type: Item
size: Small
heldPrefix: improv
- type: MeleeWeapon
damage:
@@ -198,8 +199,6 @@
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Tool
qualities:
- Sawing
speedModifier: 0.5
- type: entity
@@ -212,7 +211,6 @@
state: electric
- type: Item
heldPrefix: electric
storedRotation: 90
- type: MeleeWeapon
damage:
groups:
@@ -220,29 +218,19 @@
soundHit:
path: /Audio/Items/drill_hit.ogg
- type: Tool
qualities:
- Sawing
speedModifier: 1.5
- type: entity
name: advanced circular saw
id: SawAdvanced
parent: Saw
parent: SawElectric
description: You think you can cut anything with it.
components:
- type: Sprite
state: advanced
- type: Item
heldPrefix: advanced
storedRotation: 90
- type: MeleeWeapon
attackRate: 1.5
damage:
groups:
Brute: 15
soundHit:
path: /Audio/Items/drill_hit.ogg
- type: Tool
qualities:
- Sawing
speedModifier: 2.0

192
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
View File

@@ -243,6 +243,15 @@
- type: Sprite
state: ai
- type: entity
parent: BaseSign
id: SignAiUpload
name: ai upload sign
description: A sign, indicating an AI is present.
components:
- type: Sprite
state: ai_upload
- type: entity
parent: BaseSign
id: SignArcade
@@ -273,11 +282,11 @@
- type: entity
parent: BaseSign
id: SignAnomaly
name: xenoarchaeology lab sign
name: xenoarcheology lab sign
description: A sign indicating the xenoarchaeology lab.
components:
- type: Sprite
state: anomaly
state: xenoarch
- type: entity
parent: BaseSign
@@ -286,7 +295,7 @@
description: A sign indicating the anomalous research lab.
components:
- type: Sprite
state: anomaly2
state: anomaly
- type: entity
parent: BaseSign
@@ -297,15 +306,6 @@
- type: Sprite
state: atmos
- type: entity
parent: BaseSign
id: SignAtmosMinsky
name: atmospherics sign
description: A sign indicating the atmospherics area.
components:
- type: Sprite
state: atmominsky
- type: entity
parent: BaseSign
id: SignBar
@@ -315,6 +315,32 @@
- type: Sprite
state: bar
- type: entity
parent: BaseSign
id: SignKitchen
name: kitchen sign
description: The heart of the home. And disease.
components:
- type: Sprite
state: kitchen
- type: entity
parent: BaseSign
id: SignTheater
name: theater sign
description: Would it even be Space Station without drama?
components:
- type: Sprite
layers:
- state: drama1
map: [ "base" ]
- type: RandomSprite
available:
- base:
drama1: null
drama2: null
drama3: null
- type: entity
parent: BaseSign
id: SignBarbershop
@@ -396,24 +422,6 @@
- type: Sprite
state: chem
- type: entity
parent: BaseSign
id: SignChemistry1
name: chemistry sign
description: A sign indicating the chemistry lab.
components:
- type: Sprite
state: chemistry1
- type: entity
parent: BaseSign
id: SignChemistry2
name: chemistry sign
description: A sign indicating the chemistry lab.
components:
- type: Sprite
state: chemistry2
- type: entity
parent: BaseSign
id: SignCloning
@@ -427,19 +435,20 @@
parent: BaseSign
id: SignConference
name: conference room sign
description: A sign indicating the conference room.
description: Where work happens.
components:
- type: Sprite
state: conference_room
- type: entity
parent: BaseSign
id: SignCourt
name: court sign
description: A sign labelling the courtroom.
id: SignCryo
name: cryosleep sign
description: Just like that? You're gonna chicken out?
components:
- type: Sprite
state: court
state: cryo
- type: entity
parent: BaseSign
@@ -461,18 +470,27 @@
- type: entity
parent: BaseSign
id: SignDrones
name: drones sign
description: A sign indicating drones.
id: SignRestroom
name: restroom sign
description: A sign indicating where you go to... What do you do here again?
components:
- type: Sprite
state: drones
state: restroom
- type: entity
parent: BaseSign
id: SignMaterials
name: materials sign
description: An omen to the juicy vault of steel, glass, and plastic that lays before you.
components:
- type: Sprite
state: mats
- type: entity
parent: BaseSign
id: SignEngine
name: engine sign
description: A sign indicating the engine room.
name: power sign
description: Where the powa happens.
components:
- type: Sprite
state: engine
@@ -544,7 +562,7 @@
parent: BaseSign
id: SignHead
name: head sign
description: A sign with a hat on it.
description: An official sign indicating the dwellings of a Nanotrasen-certified head of department.
components:
- type: Sprite
state: commander
@@ -556,25 +574,7 @@
description: A sign indicating a hydroponics area.
components:
- type: Sprite
state: hydro1
- type: entity
parent: BaseSign
id: SignHydro2
name: hydro sign
description: A sign indicating a hydroponics area.
components:
- type: Sprite
state: hydro2
- type: entity
parent: BaseSign
id: SignHydro3
name: hydro sign
description: A sign indicating a hydroponics area.
components:
- type: Sprite
state: hydro3
state: hydro
- type: entity
parent: BaseSign
@@ -606,8 +606,8 @@
- type: entity
parent: BaseSign
id: SignLawyer
name: lawyer sign
description: A sign labelling an area where the Lawyers work.
name: law sign
description: A sign indicating the presence of the (typically absent) rule of law.
components:
- type: Sprite
state: law
@@ -639,15 +639,6 @@
- type: Sprite
state: medbay
- type: entity
parent: BaseSign
id: SignMinerDock
name: miner dock sign
description: A sign indicating the miner dock.
components:
- type: Sprite
state: miner_dock
- type: entity
parent: BaseSign
id: SignMorgue
@@ -740,36 +731,27 @@
- type: entity
parent: BaseSign
id: SignScience1
name: science sign
description: A sign indicating the science area.
id: SignServer
name: server sign
description: Ever heard of Big Data? This is it, chump. The biggest.
components:
- type: Sprite
state: science1
state: data
- type: entity
parent: BaseSign
id: SignScience2
name: science sign
description: A sign indicating the science area.
id: SignCans
name: canisters sign
description: A sign indicating the auspicious presence of gas canisters.
components:
- type: Sprite
state: science2
- type: entity
parent: BaseSign
id: SignShield
name: shield sign
description: A sign with a shield.
components:
- type: Sprite
state: shield
state: cans
- type: entity
parent: BaseSign
id: SignShipDock
name: docking sign
description: A sign indicating the ship docking area.
name: evac sign
description: A sign indicating the where the evac shuttle will (likely) arrive.
components:
- type: Sprite
state: dock
@@ -812,12 +794,12 @@
- type: entity
parent: BaseSign
id: SignToxins2
name: toxins sign
description: A sign indicating the toxin lab.
id: SignVault
name: vault sign
description: A sign indicating the vault. Who knows what secrets lie inside?
components:
- type: Sprite
state: toxins2
state: vault
- type: entity
parent: BaseSign
@@ -964,29 +946,11 @@
- type: Sprite
state: xenobio
- type: entity
parent: BaseSign
id: SignXenobio2
name: xenobio sign
description: A sign indicating the xenobiology lab.
components:
- type: Sprite
state: xenobio2
- type: entity
parent: BaseSign
id: SignXenolab
name: xenolab sign
description: A sign indicating the xenobiology lab.
components:
- type: Sprite
state: xenolab
- type: entity
parent: BaseSign
id: SignZomlab
name: zombie lab sign
description: A sign indicating the zombie lab.
description: The final remains of a shut-down Nanotrasen research project that aimed to harness the powers of Romerol. I wonder how that went...
components:
- type: Sprite
state: zomlab

2
Resources/Prototypes/Entities/Tiles/bananium.yml
View File

@@ -44,8 +44,6 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: Physics