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

Revert "Cleanup ExecutionSystem (#24382)" (#25555)

Browse Source 
* Revert "Cleanup ExecutionSystem (#24382)"

This reverts commit bcbe2ec1af.

* Revert "Executions (#24150)"

This reverts commit 2e83f5a0ec.

# Conflicts:
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
This commit is contained in:
metalgearsloth
2024-02-25 22:36:17 +11:00
committed by GitHub
parent bcbe2ec1af
commit bb0776c496
27 changed files with 71 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
View File

@@ -6,8 +6,6 @@
description: A small piece of crystal.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
layers:
- sprite: Objects/Materials/Shards/crystal.rsi

2
Resources/Prototypes/Entities/Objects/Materials/shards.yml
View File

@@ -5,8 +5,6 @@
description: It's a shard of some unknown material.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
layers:
- sprite: Objects/Materials/Shards/shard.rsi

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

@@ -5,8 +5,6 @@
description: In Space Glasgow this is called a conversation starter.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: MeleeWeapon
attackRate: 1.5
damage:

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
View File

@@ -19,7 +19,6 @@
path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
- type: StaticPrice
price: 500
- type: Execution
# No chamber because HMG may want its own
- type: entity

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View File

@@ -60,7 +60,6 @@
price: 500
- type: UseDelay
delay: 1
- type: Execution
- type: entity
name: L6 SAW

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
View File

@@ -19,7 +19,6 @@
containers:
ballistic-ammo: !type:Container
ents: []
- type: Execution
- type: entity
name: china lake

3
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View File

@@ -65,7 +65,6 @@
- type: Appearance
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: viper
@@ -200,7 +199,7 @@
name: N1984
parent: BaseWeaponPistol
id: WeaponPistolN1984 # the spaces in description are for formatting.
description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber.
description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/N1984.rsi

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -49,7 +49,6 @@
gun_chamber: !type:ContainerSlot
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: AKMS

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -54,7 +54,6 @@
gun_chamber: !type:ContainerSlot
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: Atreides

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View File

@@ -42,7 +42,6 @@
ents: []
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: Bulldog
@@ -99,7 +98,6 @@
- type: Appearance
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: double-barreled shotgun

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

@@ -36,7 +36,6 @@
ents: []
- type: StaticPrice
price: 500
- type: Execution
- type: entity
name: Kardashev-Mosin

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
View File

@@ -36,4 +36,3 @@
quickEquip: false
slots:
- Belt
- type: Execution

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
View File

@@ -107,7 +107,6 @@
containers:
storagebase: !type:Container
ents: []
- type: Execution
# shoots bullets instead of throwing them, no other changes
- type: entity

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
View File

@@ -5,8 +5,6 @@
description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
sprite: Objects/Weapons/Melee/armblade.rsi
state: icon

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
View File

@@ -8,8 +8,6 @@
tags:
- FireAxe
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
sprite: Objects/Weapons/Melee/fireaxe.rsi
state: icon

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
View File

@@ -7,8 +7,6 @@
tags:
- Knife
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Utensil
types:
- Knife

36
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View File

@@ -1,21 +1,10 @@
- type: entity
name: Sword
parent: BaseItem
id: BaseSword
description: A sharp sword.
abstract: true
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: DisarmMalus
- type: entity
name: captain's sabre
parent: BaseSword
parent: BaseItem
id: CaptainSabre
description: A ceremonial weapon belonging to the captain of the station.
components:
- type: Sharp
- type: Sprite
sprite: Objects/Weapons/Melee/captain_sabre.rsi
state: icon
@@ -37,13 +26,15 @@
- type: Tag
tags:
- CaptainSabre
- type: DisarmMalus
- type: entity
name: katana
parent: BaseSword
parent: BaseItem
id: Katana
description: Ancient craftwork made with not so ancient plasteel.
components:
- type: Sharp
- type: Tag
tags:
- Katana
@@ -60,6 +51,7 @@
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/katana.rsi
- type: DisarmMalus
- type: entity
name: energy katana
@@ -94,10 +86,11 @@
- type: entity
name: machete
parent: BaseSword
parent: BaseItem
id: Machete
description: A large, vicious looking blade.
components:
- type: Sharp
- type: Tag
tags:
- Machete
@@ -114,13 +107,15 @@
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/machete.rsi
- type: DisarmMalus
- type: entity
name: claymore
parent: BaseSword
parent: BaseItem
id: Claymore
description: An ancient war blade.
components:
- type: Sharp
- type: Sprite
sprite: Objects/Weapons/Melee/claymore.rsi
state: icon
@@ -138,13 +133,15 @@
sprite: Objects/Weapons/Melee/claymore.rsi
slots:
- back
- type: DisarmMalus
- type: entity
name: cutlass
parent: BaseSword
parent: BaseItem
id: Cutlass
description: A wickedly curved blade, often seen in the hands of space pirates.
components:
- type: Sharp
- type: Tag
tags:
- Machete
@@ -161,13 +158,15 @@
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/cutlass.rsi
- type: DisarmMalus
- type: entity
name: The Throngler
parent: BaseSword
parent: BaseItem
id: Throngler
description: Why would you make this?
components:
- type: Sharp
- type: Sprite
sprite: Objects/Weapons/Melee/Throngler2.rsi
state: icon
@@ -191,3 +190,4 @@
- type: Item
size: Ginormous
sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
- type: DisarmMalus