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

This reverts commit 3c9c149b81. # Conflicts: # Content.Server/Projectiles/ProjectileSystem.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared/Projectiles/SharedProjectileSystem.cs # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
2024-04-14 12:11:31 +07:00
parent 2b57a5c0e1
commit 8712256194
28 changed files with 54 additions and 1020 deletions
--- a/Resources/Locale/en-US/execution/execution.ftl
+++ b/Resources/Locale/en-US/execution/execution.ftl
@@ -1,20 +0,0 @@
-execution-verb-name = Execute
-execution-verb-message = Use your weapon to execute someone.
-
-# All the below localisation strings have access to the following variables
-# attacker (the person committing the execution)
-# victim (the person being executed)
-# weapon (the weapon used for the execution)
-
-execution-popup-gun-initial-internal = You ready the muzzle of {THE($weapon)} against {$victim}'s head.
-execution-popup-gun-initial-external = {$attacker} readies the muzzle of {THE($weapon)} against {$victim}'s head.
-execution-popup-gun-complete-internal = You blast {$victim} in the head!
-execution-popup-gun-complete-external = {$attacker} blasts {$victim} in the head!
-execution-popup-gun-clumsy-internal = You miss {$victim}'s head and shoot your foot instead!
-execution-popup-gun-clumsy-external = {$attacker} misses {$victim} and shoots {POSS-ADJ($attacker)} foot instead!
-execution-popup-gun-empty = {CAPITALIZE(THE($weapon))} clicks.
-
-execution-popup-melee-initial-internal = You ready {THE($weapon)} against {$victim}'s throat.
-execution-popup-melee-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against the throat of {$victim}.
-execution-popup-melee-complete-internal = You slit the throat of {$victim}!
-execution-popup-melee-complete-external = {$attacker} slits the throat of {$victim}!
--- a/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/butcherable-component.ftl
@@ -1,4 +1,4 @@
-butcherable-different-tool = You need a different tool to butcher { THE($target) }.
+butcherable-different-tool = You are going to need a different tool to butcher { THE($target) }.
 butcherable-knife-butchered-success = You butcher { THE($target) } with { THE($knife) }.
 butcherable-need-knife = Use a sharp object to butcher { THE($target) }.
 butcherable-not-in-container = { CAPITALIZE(THE($target)) } can't be in a container.
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -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
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -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
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -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:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -60,7 +60,6 @@
    price: 500
  - type: UseDelay
    delay: 1
-  - type: Execution

 - type: entity
  name: L6 SAW
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -19,7 +19,6 @@
    containers:
      ballistic-ammo: !type:Container
        ents: []
-  - type: Execution

 - type: entity
  name: china lake
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -66,7 +66,6 @@
  - type: AmmoCounter
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: viper
@@ -201,7 +200,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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -50,7 +50,6 @@
      gun_chamber: !type:ContainerSlot
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: AKMS
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -54,7 +54,6 @@
      gun_chamber: !type:ContainerSlot
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: Atreides
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -43,7 +43,6 @@
        ents: []
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: Bulldog
@@ -100,7 +99,6 @@
  - type: Appearance
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: double-barreled shotgun
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -38,7 +38,6 @@
        ents: []
  - type: StaticPrice
    price: 500
-  - type: Execution

 - type: entity
  name: Kardashev-Mosin
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -37,4 +37,3 @@
    slots:
    - Belt
    - suitStorage
-  - type: Execution
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -107,7 +107,6 @@
    containers:
      storagebase: !type:Container
        ents: []
-  - type: Execution

 # shoots bullets instead of throwing them, no other changes
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -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
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -8,8 +8,6 @@
    tags:
    - FireAxe
  - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
  - type: Sprite
    sprite: Objects/Weapons/Melee/fireaxe.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -7,8 +7,6 @@
    tags:
    - Knife
  - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
  - type: Utensil
    types:
      - Knife
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -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
@@ -38,13 +27,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
@@ -67,6 +58,7 @@
    - Back
    - Belt
    - SuitStorage
+  - type: DisarmMalus

 - type: entity
  name: energy katana
@@ -102,10 +94,11 @@

 - type: entity
  name: machete
-  parent: BaseSword
+  parent: BaseItem
  id: Machete
  description: A large, vicious looking blade.
  components:
+  - type: Sharp
  - type: Tag
    tags:
    - Machete
@@ -127,6 +120,7 @@
    slots:
    - Belt
    - SuitStorage
+  - type: DisarmMalus
  - type: Construction
    deconstructionTarget: null
    graph: SwordGraph
@@ -134,10 +128,11 @@

 - 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
@@ -157,6 +152,7 @@
    - back
    - belt
    - suitStorage
+  - type: DisarmMalus
  - type: Construction
    deconstructionTarget: null
    graph: SwordGraph
@@ -164,10 +160,11 @@

 - 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
@@ -184,13 +181,15 @@
  - type: Item
    size: Large
    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
@@ -214,3 +213,4 @@
    - type: Item
      size: Ginormous
      sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
+    - type: DisarmMalus