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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3399,7 +3399,7 @@
types:
Slash: 6
Piercing: 6
Structural: 15
Structural: 6 # Secondary breaching

- type: entity
name: space cat
Expand Down
5 changes: 0 additions & 5 deletions Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@
types:
Blunt: 5
Slash: 10
Structural: 5

- type: entity
parent: [BaseMobArgocyte, BaseSlicingRefinable]
Expand Down Expand Up @@ -341,7 +340,6 @@
types:
Blunt: 15
Slash: 5
Structural: 5
- type: MovementSpeedModifier
baseSprintSpeed : 6.5
baseWalkSpeed: 5
Expand Down Expand Up @@ -374,7 +372,6 @@
types:
Blunt: 10
Slash: 15
Structural: 10
- type: MovementSpeedModifier
baseSprintSpeed : 3.5
baseWalkSpeed: 3
Expand Down Expand Up @@ -419,7 +416,6 @@
damage:
types:
Blunt: 25
Structural: 25
- type: MovementSpeedModifier
baseSprintSpeed : 3
baseWalkSpeed: 3
Expand Down Expand Up @@ -464,4 +460,3 @@
damage:
types:
Blunt: 75
Structural: 50
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
damage:
types:
Blunt: 150
Structural: 70
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepThud
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
damage:
types:
Blunt: 6
Structural: 4
Caustic: 4
- type: InteractionPopup
successChance: 0.5
Expand Down Expand Up @@ -186,7 +185,6 @@
damage:
types:
Blunt: 6
Structural: 4
Caustic: 1
Poison: 4

Expand Down Expand Up @@ -226,7 +224,6 @@
damage:
types:
Blunt: 6
Structural: 4
Caustic: 4

- type: entity
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Player/guardian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
damage:
types:
Blunt: 20
Structural: 20
Structural: 5 # Activate Star Platinum's signature move: Digging a hole
- type: MeleeSpeech
- type: UserInterface
interfaces:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
damage:
types:
Blunt: 6
Structural: 2
animation: WeaponArcPunch
- type: Item
size: Small
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
damage:
types:
Blunt: 25 #thwack
Structural: 20
Structural: 10
soundHit:
collection: MetalThud
- type: Puller
Expand Down Expand Up @@ -225,7 +225,6 @@
damage:
types:
Blunt: 10 #thwack
Structural: 2
- type: MovementSpeedModifier
baseWalkSpeed: 2.4
baseSprintSpeed: 3.7
Expand Down Expand Up @@ -288,7 +287,6 @@
damage:
types:
Blunt: 10 #thwack
Structural: 2
- type: MovementSpeedModifier
baseWalkSpeed: 2.25
baseSprintSpeed: 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
damage:
types:
Blunt: 10
Structural: 15
Structural: 10

- type: entity
id: PKAUpgradeRange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
name: bullet (.60 anti-materiel)
components:
- type: Projectile
damage:
damage: # Just enough to destroy a solid wall
types:
Piercing: 75
Structural: 226
Structural: 260
penetrationThreshold: 360
penetrationDamageTypeRequirement:
- Structural
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
damage:
types:
Piercing: 40
Structural: 15

Structural: 20

- type: entity
parent: BaseBullet
Expand Down Expand Up @@ -41,7 +40,6 @@
damage:
types:
Piercing: 10
Structural: 15

- type: entity
parent: PelletShotgun
Expand Down Expand Up @@ -224,7 +222,6 @@
damage:
types:
Piercing: 25
Structural: 5

- type: entity
parent: PelletGrapeshot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@
types:
Piercing: 20
Cold: 20
Structural: 50

- type: entity
parent: ProjectilePolyboltBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
damage:
types:
Blunt: 15
Structural: 30
Structural: 15
# Short lifespan
- type: TimedDespawn
lifetime: 0.22 # roughly 5.5 tiles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
types:
Slash: 11
Piercing: 11
Structural: 20
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/armblade.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
damage:
types:
Blunt: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 5
Structural: 10
- type: Item
size: Normal
shape:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
types:
Slash: 2
Blunt: 2
Structural: 4
soundHit:
path: /Audio/Weapons/chainsaw_rev.ogg
params:
Expand All @@ -32,7 +31,6 @@
damage:
types:
Slash: 4
Structural: 4
- type: Item
size: Large
shape:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
types:
Blunt: 10
Slash: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
Expand All @@ -82,7 +81,6 @@
types:
Blunt: 5
Slash: 5
Structural: 10
- type: Item
size: Ginormous
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
types:
Slash: 15
Heat: 15
Structural: 20
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 1
Expand Down Expand Up @@ -312,7 +311,6 @@
types:
Slash: 12
Heat: 12
Structural: 15
- type: ItemToggleActiveSound
activeSound:
path: /Audio/Weapons/ebladehum.ogg
Expand Down Expand Up @@ -377,7 +375,6 @@
types:
Slash: 20
Heat: 20
Structural: 20
- type: MeleeRequiresWield
- type: HeldSpeedModifier #slowdown is what balances this compared to a dsword
walkModifier: 0.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
# axes are kinda like sharp hammers, you know?
Blunt: 5
Slash: 10
Structural: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Slash: 10
Structural: 40
Structural: 20
- type: Item
size: Ginormous
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
damage:
types:
Blunt: 10
Structural: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
Expand Down Expand Up @@ -58,12 +58,12 @@
damage:
types:
Blunt: 20
Structural: 25
Structural: 55 # The mighty muscle wizard shatters windows in a single blow
- type: DamageOtherOnHit
damage:
types:
Blunt: 15
Structural: 15
Structural: 40
- type: Item
size: Ginormous

Expand Down Expand Up @@ -95,7 +95,6 @@
damage:
types:
Blunt: 5
Structural: 5
soundHit:
path: /Audio/Effects/radpulse5.ogg
params:
Expand All @@ -104,6 +103,5 @@
damage:
types:
Blunt: 15
Structural: 15
- type: Item
size: Ginormous
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
damage:
types:
Piercing: 10
Structural: 30
Structural: 8
- type: Item
size: Normal
shape:
Expand Down Expand Up @@ -63,7 +63,7 @@
damage:
types:
Piercing: 3
Structural: 15
Structural: 5

- type: entity
name: diamond tipped mining drill
Expand All @@ -84,7 +84,7 @@
damage:
types:
Piercing: 6
Structural: 30
Structural: 10


- type: entity
Expand Down Expand Up @@ -162,7 +162,7 @@
types:
Blunt: 6
Slash: 2
Structural: 30
Structural: 10
- type: GunRequiresWield
- type: DisarmMalus
- type: Prying
Expand Down Expand Up @@ -258,4 +258,4 @@
types:
Blunt: 2
Slash: 6
Structural: 20
Structural: 10
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
attackRate: 10
damage:
types:
Structural: 150
Structural: 20
Slash: 20 #Horror
Blunt: 20
Heat: 20
Expand Down
Loading