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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Slash: 0.5
Piercing: 0.7
Shock: 1.2
Structural: 1.0
flatReductions:
Blunt: 5
Heat: 5
Expand Down Expand Up @@ -69,6 +70,7 @@
Blunt: 2
Piercing: 0.2
Shock: 0.6
Structural: 2
flatReductions:
Piercing: 10

Expand All @@ -81,6 +83,7 @@
Piercing: 0.7
Shock: 2
Heat: 3
Structural: 1

# Like metallic, but without flat reduction so it can be damaged with fists.
- type: damageModifierSet
Expand All @@ -90,6 +93,7 @@
Slash: 0.5
Piercing: 0.7
Shock: 1.2
Structural: 1

# Like metallic but very strong to resist most all basic tools and weapons.
- type: damageModifierSet
Expand All @@ -99,6 +103,7 @@
Slash: 0.5
Piercing: 0.7
Shock: 1.2
Structural: 1
flatReductions:
Blunt: 10
Slash: 10
Expand All @@ -113,6 +118,7 @@
Piercing: 2.0
Heat: 0.5
Shock: 0
Structural: 1
flatReductions:
Blunt: 5

Expand All @@ -124,6 +130,7 @@
Piercing: 1.0
Heat: 0.8
Shock: 0 #glass is an insulator!
Structural: 1
flatReductions:
Slash: 5
Piercing: 5
Expand Down Expand Up @@ -153,6 +160,7 @@
Slash: 2.0
Piercing: 1.0
Heat: 2.0
Structural: 1
flatReductions:
Blunt: 5

Expand Down
28 changes: 27 additions & 1 deletion Resources/Prototypes/Entities/Debugging/debug_sweps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,30 @@
- type: MeleeWeapon
damage:
types:
Blunt: 200
Blunt: 200

- type: entity
name: Structura stick 200dmg
parent: MeleeDebugGib
id: StructuralDebug200
components:
- type: Tag
tags:
- Debug
- type: MeleeWeapon
damage:
types:
Structural: 200

- type: entity
name: Structura stick 2000dmg
parent: MeleeDebugGib
id: StructuralDebug2000
components:
- type: Tag
tags:
- Debug
- type: MeleeWeapon
damage:
types:
Structural: 2000
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- type: Anchorable
- type: Pullable
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
anchored: true
noRot: true
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: RCDDeconstructable
cost: 6
Expand All @@ -46,4 +46,4 @@
graph: Airlock
node: assembly
placement:
mode: SnapgridCenter
mode: SnapgridCenter
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- type: InteractionOutline
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StrongMetallic
damageModifierSet: Metallic
- type: RCDDeconstructable
cost: 4
delay: 6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
node: frame1
- type: InteractionOutline
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: RCDDeconstructable
cost: 4
delay: 6
fx: EffectRCDDeconstruct6
fx: EffectRCDDeconstruct6
- type: Destructible
thresholds:
- trigger:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
abstract: true
components:
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: PlaceableSurface
- type: Fixtures
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
layer:
- TableLayer
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: IconSmooth
key: state
Expand Down Expand Up @@ -79,7 +79,7 @@
layer:
- TableLayer
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Wood
- type: IconSmooth
key: state
Expand Down Expand Up @@ -122,7 +122,7 @@
sprite: Structures/Furniture/Tables/frame.rsi
state: full
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: IconSmooth
key: state
Expand Down Expand Up @@ -166,7 +166,7 @@
- type: Icon
sprite: Structures/Furniture/Tables/generic.rsi
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down Expand Up @@ -414,7 +414,7 @@
- type: Icon
sprite: Structures/Furniture/Tables/brass.rsi
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down Expand Up @@ -782,7 +782,7 @@
sprite: Structures/Furniture/Tables/counterwood.rsi
state: full
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Wood
- type: Destructible
thresholds:
Expand Down Expand Up @@ -825,7 +825,7 @@
sprite: Structures/Furniture/Tables/countermetal.rsi
state: full
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- type: Sprite
drawdepth: Objects
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Electronic
- type: Destructible
thresholds:
Expand Down Expand Up @@ -109,8 +109,8 @@
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
ScrapCircuit1:
min: 4
max: 6
- !type:DoActsBehavior
acts: [ "Destruction" ]
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
layer:
- MachineLayer
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Structures/Machines/frame.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
machine_board: !type:Container
machine_parts: !type:Container
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down Expand Up @@ -92,7 +92,7 @@
- machine_board
- machine_parts
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand Down Expand Up @@ -141,7 +141,7 @@
graph: Machine
node: destroyedMachineFrame
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand All @@ -151,9 +151,9 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 3
ScrapCircuit1:
min: 4
max: 6
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
layer:
- WallLayer
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand All @@ -45,9 +45,9 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
ScrapCircuit1:
min: 10
max: 20
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Transform
Expand Down Expand Up @@ -162,7 +162,7 @@
layer:
- WallLayer
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
Expand All @@ -172,9 +172,9 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 2
ScrapPlasma1:
min: 4
max: 6
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Transform
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Power/smes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
highVoltageNode: input
mediumVoltageNode: output
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: StrongMetallic
- type: BatterySensor
- type: DeviceNetwork
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
supplyRampTolerance: 5000
supplyRampRate: 1000
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: StrongMetallic
- type: PacifismDangerousAttack
- type: Destructible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
powerDrawMultiplier: 0.75
scaling: Exponential
- type: Damageable
damageContainer: Inorganic
damageContainer: StructuralInorganic
damageModifierSet: Electronic
- type: StaticPrice
price: 2000
Expand Down
13 changes: 12 additions & 1 deletion Resources/Prototypes/_Crescent/DogtagStore/catalog_SAW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,20 @@
categories:
- StoreCategorySAWGuns

- type: listing
id: StoreListing350cc
name: 350cc 'Breaker' Burst Laser
description: An optimized high energy weapon designed to destroy hull for medium ballistic hardpoints.
icon: { sprite: _Crescent/Objects/Turrets/Laser/absolution.rsi, state: absolution}
productEntity: BaseWeaponTurretBreakerFlatpack
cost:
ScrapSAW: 45
categories:
- StoreCategorySAWGuns

- type: listing
id: StoreListing90mmcannon
name: 90mm 'Resolute' tri-barreled repeater cannon flatpack (DO NOT WORK, SORRY)
name: 90mm 'Resolute' tri-barreled repeater cannon flatpack
description: A large machine gun for large hardpoints.
icon: { sprite: _Crescent/Objects/Turrets/Projectile/repeater.rsi, state: repeater }
productEntity: WeaponTurretLargeMachinegunFlatpack
Expand Down
Loading
Loading