From e3890767af02e85a7945153444a051aa95ce5041 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Sat, 26 Aug 2023 22:01:38 +0300
Subject: [PATCH] Fixes (#331)

* Revert "extends shuttle timer to 20m green / 10m on blue (#17826)"

This reverts commit 54a7a4a9a15b30ee1464363570c11edab051320c.

* Fix desword craft

* Fix antispam message

* Less crossbow power usage

* Fix torch missing layers

* Esword fix

* Nerf crossbow damage
---
 .../Prototypes/AlertLevels/alert_levels.yml   |  6 ++----
 .../Objects/Weapons/Melee/e_sword.yml         | 19 ++++++++++++-------
 .../Objects/Weapons/Guns/crossbow.yml         |  5 +++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml
index 73f3452f6d..327ab29d85 100644
--- a/Resources/Prototypes/AlertLevels/alert_levels.yml
+++ b/Resources/Prototypes/AlertLevels/alert_levels.yml
@@ -5,12 +5,11 @@
     green:
       announcement: alert-level-green-announcement
       color: Green
-      shuttleTime: 1200
+      shuttleTime: 600
     blue:
       announcement: alert-level-blue-announcement
       sound: /Audio/Misc/bluealert.ogg
       color: DodgerBlue
-      shuttleTime: 600
     violet:
       announcement: alert-level-violet-announcement
       sound: /Audio/Misc/notice1.ogg
@@ -22,12 +21,11 @@
       sound: /Audio/Misc/notice1.ogg
       color: Yellow
       emergencyLightColor: Goldenrod
-      shuttleTime: 600
+      shuttleTime: 400
     red:
       announcement: alert-level-red-announcement
       sound: /Audio/Misc/redalert.ogg
       color: Red
-      shuttleTime: 600 #No reduction in time as we don't have swiping for red alert like in /tg/. Shuttle times are intended to create friction, so having a way to brainlessly bypass that would be dumb.
     gamma:
       announcement: alert-level-gamma-announcement
       selectable: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index c7df82e3bf..8b814db31b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -1,8 +1,9 @@
 - type: entity
   name: energy sword
   parent: BaseItem
-  id: EnergySword
+  id: EnergySwordBase
   description: A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter.
+  abstract: true
   components:
   - type: EnergySword
   - type: ItemToggle
@@ -78,9 +79,13 @@
     malus: 0
   - type: Reflect
     enabled: false
-  - type: Tag
-    tags:
-    - EnergySword
+
+- type: entity
+  name: energy sword
+  parent: EnergySwordBase
+  id: EnergySword
+  description: A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter.
+  components:
   - type: Construction
     deconstructionTarget: null
     graph: EnergyDoubleSwordGraph
@@ -88,7 +93,7 @@
 
 - type: entity
   name: pen
-  parent: EnergySword
+  parent: EnergySwordBase
   id: EnergyDagger
   suffix: E-Dagger
   description: 'A dark ink pen.'
@@ -184,7 +189,7 @@
 
 - type: entity
   name: energy cutlass
-  parent: EnergySword
+  parent: EnergySwordBase
   id: EnergyCutlass
   description: An exotic energy weapon.
   components:
@@ -221,7 +226,7 @@
 
 - type: entity
   name: double energy sword
-  parent: EnergySword
+  parent: EnergySwordBase
   id: EnergyDoubleSword
   description: A very dangerous doubled energy sword. Can be stored in pockets when turned off. Makes a lot of noise when used or turned on.
   components:
diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml
index 25d361c28e..1216e61609 100644
--- a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml
@@ -48,10 +48,11 @@
       types:
         Blunt: 15
   - type: Powered
-    charge: 360
+    charge: 180
     damage:
       types:
-        Blunt: 30
+        Blunt: 10
+        Heat: 10
   - type: Construction
     deconstructionTarget: null
     graph: WeaponPoweredCrossbowGraph