From aabec68c035f9616d73ef475a97db0428a191799 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Sun, 14 Apr 2024 04:34:11 -0500
Subject: [PATCH 1/8] no more lasers for you, borg.

---
 .../Specific/Robotics/borg_modules.yml        |  4 +--
 .../Objects/Weapons/Guns/Pistols/pistols.yml  | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index e14f29746dc7..9ca45fb21fb4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -506,8 +506,8 @@
     - state: icon-syndicate
   - type: ItemBorgModule
     items:
-    - WeaponAdvancedLaser
-    - Machete
+    - WeaponPistolRinkhal
+    - EnergySword
 
 - type: entity
   id: BorgModuleOperative
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 9507eada3bd7..daa31e99e8e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -149,6 +149,41 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
+- type: entity
+  name: rinkhal
+  parent: BaseItem
+  id: WeaponPistolRinkhal
+  description: A cobra for use by cyborgs. Creates .25 caseless ammo on the fly from an internal ammo fabricator, which slowly self-charges.
+  components:
+  - type: Gun
+    fireRate: 4
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
+      params:
+        volume: -14
+    availableModes:
+    - SemiAuto
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgeCaselessRifle
+    fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 25
+  - type: AmmoCounter
+
 - type: entity
   name: mk 58
   parent: BaseWeaponPistol

From 6b2dd9aa87e3cbec75e3ca5a1aa02f35da74c7c9 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Fri, 10 May 2024 03:37:33 -0500
Subject: [PATCH 2/8] downgrade

---
 .../Entities/Objects/Specific/Robotics/borg_modules.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 9ca45fb21fb4..d67bcb91b531 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -507,7 +507,7 @@
   - type: ItemBorgModule
     items:
     - WeaponPistolRinkhal
-    - EnergySword
+    - EnergyDagger
 
 - type: entity
   id: BorgModuleOperative

From 27f7d82131a02588d08b67ad3d3da06a4accafed Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Wed, 10 Jul 2024 10:32:30 -0500
Subject: [PATCH 3/8] echis

---
 .../Specific/Robotics/borg_modules.yml        |  2 +-
 .../Guns/Ammunition/Cartridges/pistol.yml     |  9 +++
 .../Objects/Weapons/Guns/Pistols/pistols.yml  | 70 +++++++++----------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index d67bcb91b531..18a9bc5e0ef0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -506,7 +506,7 @@
     - state: icon-syndicate
   - type: ItemBorgModule
     items:
-    - WeaponPistolRinkhal
+    - WeaponPistolEchis
     - EnergyDagger
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 69aa8664aa39..f748e5f946dc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -26,6 +26,15 @@
   - type: CartridgeAmmo
     proto: BulletPistol
 
+- type: entity
+  id: CartridgePistolCaseless
+  name: cartridge (.35 auto caseless)
+  parent: BaseCartridgePistol
+  components:
+  - type: CartridgeAmmo
+    deleteOnSpawn: true
+    proto: BulletPistol
+
 - type: entity
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index daa31e99e8e3..21c269ae6673 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -101,6 +101,41 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
+- type: entity
+  name: echis
+  parent: BaseItem
+  id: WeaponPistolEchis
+  description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
+  components:
+  - type: Gun
+    fireRate: 5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgePistolCaseless #So that borgs don't litter the ground with infinite bullet casings
+    fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 25
+  - type: AmmoCounter
+
 - type: entity
   name: cobra
   parent: BaseWeaponPistol
@@ -149,41 +184,6 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
-- type: entity
-  name: rinkhal
-  parent: BaseItem
-  id: WeaponPistolRinkhal
-  description: A cobra for use by cyborgs. Creates .25 caseless ammo on the fly from an internal ammo fabricator, which slowly self-charges.
-  components:
-  - type: Gun
-    fireRate: 4
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
-      params:
-        volume: -14
-    availableModes:
-    - SemiAuto
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-0
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-  - type: ProjectileBatteryAmmoProvider
-    proto: CartridgeCaselessRifle
-    fireCost: 100
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 25
-  - type: AmmoCounter
-
 - type: entity
   name: mk 58
   parent: BaseWeaponPistol

From dfd9ea9cf935649a3e1621d236c6eb9ef7dd64b0 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Fri, 12 Jul 2024 08:34:44 -0500
Subject: [PATCH 4/8] echis

---
 .../Specific/Robotics/borg_modules.yml        |   2 +-
 .../Objects/Weapons/Melee/e_sword.yml         |  74 +++++++++++++++++
 .../Melee/e_dagger_loud.rsi/e_sword.png       | Bin 0 -> 215 bytes
 .../Melee/e_dagger_loud.rsi/e_sword_blade.png | Bin 0 -> 385 bytes
 .../Weapons/Melee/e_dagger_loud.rsi/icon.png  | Bin 0 -> 324 bytes
 .../e_dagger_loud.rsi/inhand-left-blade.png   | Bin 0 -> 301 bytes
 .../Melee/e_dagger_loud.rsi/inhand-left.png   | Bin 0 -> 167 bytes
 .../e_dagger_loud.rsi/inhand-right-blade.png  | Bin 0 -> 6862 bytes
 .../Melee/e_dagger_loud.rsi/inhand-right.png  | Bin 0 -> 166 bytes
 .../Weapons/Melee/e_dagger_loud.rsi/meta.json |  78 ++++++++++++++++++
 10 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 7d93a34f03d5..93b2e4157211 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -506,7 +506,7 @@
   - type: ItemBorgModule
     items:
     - WeaponPistolEchis
-    - EnergyDagger
+    - EnergyDaggerLoud
 
 - type: entity
   id: BorgModuleOperative
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index fbf8b1003c35..0fd44b277a5f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -177,6 +177,80 @@
     sound:
       path: /Audio/Effects/unwrap.ogg
 
+- type: entity
+  name: energy dagger
+  parent: EnergySword # I don't just parent it to energy dagger because then it would be able to write on paper.
+  id: EnergyDaggerLoud
+  description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
+  components:
+  - type: EnergySword
+  - type: ItemToggle
+    soundActivate:
+      path: /Audio/Weapons/ebladeon.ogg
+      params:
+        volume: -3
+    soundDeactivate:
+      path: /Audio/Weapons/ebladeoff.ogg
+      params:
+        volume: -3
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnSwing:
+      path: /Audio/Weapons/eblademiss.ogg
+      params:
+        volume: -3
+        variation: 0.250
+    activatedDamage:
+        types:
+            Slash: 10
+            Heat: 10
+    deactivatedSecret: true
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+      params:
+        volume: -3
+  - type: ItemToggleDisarmMalus
+    activatedDisarmMalus: 0.4
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
+    layers:
+      - state: e_sword
+      - state: e_sword_blade
+        color: "#FFFFFF"
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
+  - type: MeleeWeapon
+    wideAnimationRotation: 145
+    attackRate: 1
+    hidden: true
+    damage:
+      types:
+        Blunt: 1
+  - type: Item
+    size: Tiny
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
+  - type: UseDelay
+    delay: 1.0
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    energy: 1.5
+    color: white
+    netsync: false
+  - type: Appearance
+  - type: ToggleableLightVisuals
+    spriteLayer: blade
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+      right:
+      - state: inhand-right-blade
+        shader: unshaded
+  - type: DisarmMalus
+    malus: 0
+
 - type: entity
   name: energy cutlass
   parent: EnergySword
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png
new file mode 100644
index 0000000000000000000000000000000000000000..109a3230b984fc3824ed5770c1f177ba58b6d1b8
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^FvruyF(ktM?WKdf2NXD11Kx1lIZ`V#tF|L~
zi{ixU&`EN??z8&;`aBV+l)-Q7wRe?&{90b@)o<VV%qA%<b$jO&hL1ZsbhZaP^Lgl)
zwf4xFC9BrI^UGBDp><5c+johXK-nyh=Za<aY7BokFETeQmE-mQd%qlHn5V0s%Q~lo
FCIDkgO6>pu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b8c9f45a743a99dbd97db6f4f4b996e87dc2a77
GIT binary patch
literal 385
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0WWg+Z8+Vb&Z8pawBd7srqc=eN@w`I-y_TvvOWui4vn{e!@U
zhaou+1mX^7??`)mOHyK1TgdH8QA~fP`$YMCD34<cVFVg@{He<7soQe%H<?xjehm%X
zd;E0nW90`{ahVYgW}GE$yK~qzJ}cf<nUh+2Q0Q6cg@<}uo;f@}*LviUc0=ZpYm*jy
z4))>@TySdBlT=gAv^p)$cvg?#%b(AMmd8$yZL;}%?T?61jJ{*uss%=~bAJfbNGw`r
zr26;mQH`@vpOfQy>{$(}r#}!m@FucpIz!rep*^eydYmG1Uuq3+sOX&J-}i8K%bc_R
zGlZr+WB<#apwV%B*YZn`_ql!MdCF%$(eP(?zKMDx-v=4HI|>Jd4Gd?uJXV?v^b-(l
aYYmeBSiU{^sCIrbi0|p@=d#Wzp$Pyl6PD!w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4111eebaab4fe23f3486a1568522aaed3db71e7a
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^@TRAWV@QPi+shkyn+*h7A1VuRUy$6yBeLX#
zjL%UiPiMyJ3(EbD71wq;I{oNbSv3Dig2o5^#}k5Hy-%&N-E!^g?B#xDzVY+aK0bIY
z`S`fqi&YmGUR0{|PGAw}Rj!-tHfJ8=gQFiftHdvwRNTou9A_)+$XF2WQowLWP?4+Q
zir^y#4@t$};s$X?@)j3&D<^eVKK;oq+_{3`hP%!4o3_)t_!#6LitC@AbZcAeUEc*O
zj0={mT6I;z*){Nj0gvPReOs8TPj5=O7Io22<u0Rsn))PX7Pk9ZORq34lDFO*ovtII
Rq7U>WgQu&X%Q~loCIGE6cyIs!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d50f98ef41f9ede1c4d6087e69dc3ea493363a
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE(}r(Vhn-{IZo#QMK}vQ
zB8wRqxP?KOkzv*x383IvPZ!6Kid%2*80H-|;9<QW<FUGb+3yd_&P-y`wPNXHn{}jm
zw~qG|+mEk50#yTn#fI<aI!>H9v#R_@+P^brI!^2@@4NA*<HV`6|4aVee|$@9VU?iz
z(fx-XT5h|hW$S4Fd4Ao&?6v#$D{{qLpDO%(eVjPN93W|OZI||srP*c=&mUOl`eKf+
zL}1Ign=SSHuWrcSx1D`Jw)92+{8_$m<qZ#4tuLEDA>P7h+27r(1sOXuU00mp-*JEb
g?+df}fvWa=XPL{Rk#U`Aiy=slr>mdKI;Vst0H51+&Hw-a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..639da1c18431e4ed27c39724b7061fae946c9603
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}r(Vhn-{IZo#QMK}vQ
zB8wRq_>O=u<5X=vX`rCHr;B4q#jUrucJeYP@Gu`(Gtp2m>7N0M(4(ENCm++3Wdy2W
zSd&$I<>dbzOF8{j=Fi;vnGYn!!0;f`jAhdQ3A~I92bwsAWdz@+e82AvlJIo(b6Mw<
G&;$T58ZT%7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae7c25221e3ddf345adc93c12e3cf87a4962f36a
GIT binary patch
literal 6862
zcmeHMc|4SB`yVZoT}h=djTF_Gea$G0EG4oOqC7M641-zBj3s4hA=R-aN+_p=h>Bwu
zEe<J#vbU#jkR^L{oc9@8Kfm|)zMnpybKbw2`8+fCbKTeVy|3$gU)Oy<%MqKcW(u<E
zvM?A-!NQzw3;nxEj(O71@2ivkWEf1QF3{dlYzz3q1wuZX;|;>adjudH4B)U~uz>cr
zCqsm<ixk5C>e3U=iG|O9LH_7;Vp-qN@V2M@8hZ^+kJfHqW5LaGj@Kj1c_pP3t=L-_
z(m$wVSW_16(wNy2I8>8LBk1=9?rRT<+EHFNo^Hq=8ZVt3EQvk2VAGzDoVsO0T*GpC
zgYYVc$*P#huE?pW@UHZr4{qI)2#ThTe&?f@4GI>4Pa>>mXVVg2U3{*ecBPv9d^;nW
zPhQ>dc<kPt>WaJt*PTwr$0yK>$;Zwgo-HibGw--Xt`;2@mALl=MOj<VyW{Q?7_>Zk
z%!d&2zJ9&^t{p?elY=VR$*IwI4#QhoCjQtL@kV6dUmr5u>0OsK5}bOCX7FD5&*7(g
z+sj*O*Er`KDluF<S`h!?XczSg`AR{k*Qjmz+=YQ!4}dcF(Dt&bCd#Iflc8SK%iX<w
zs(qui6<umMVdq`W<KvzjUzKDKdGO?GQDus~%c?u8mXi9M9^Oj~sA#^T(qFigpBigs
zSJ`T@AEos&YeVaYc;jCZuQS4S>!rALR2lUr?~$j!3YN})A{D&eFjz5X)`2(l$@qwc
ztyAcR%^y?dzm|3mxQaHstJAYj9ZoMRd9g)R8J4fB(;UFDRM*~*hj|vIu1r^)buAw6
zg9T${i3ty~CXZBoXs}=KX#bu&@+)OWFSvC)gstr|p7J0HGZyI;$J-uLTf58oM3UE~
zd{5f>R(re*(%GS@G5?ff0i&t0_DRy}#pZbdzP_UI<^cEG!j6_m8Ry<ho9nJ0+Ewb;
z`|L41Xp<(`n07lnn)oPwen>6Vw|%5-yUY29ce5^+h}+&Z5ib?!^p)Mq*;&Ya{x+<A
zVe>!~>a5zCj0?*y4WBKyVQwG2Pd5<TDzae-#!>JbnOO^{8nybzDCq~E-0XWtcZff9
z{EZv2!$^M4@X<?s6XCArN^~V*#i5<`9~BEn^6rGqe!4jJgJxl!&FRAfRgtadWUXyb
zY43|FF6(%uw*`^HwVqD&Ol)9z9LJuLMu+C1B6j-U6J=j4?OC<ntt<a1*VT)jxnT^^
zu<3+rMiM29rJRgG4tlzo=<ir2K4(Nal8~G2%Q4~Gr(hBvwNSzek0~)vWty~?`{fsJ
zmE8@-Y;i5tbe3@<+YP6BmiuWfh@lu(hgmm_Avi(jW^ErSf9qVF)zVl~P4p^ucHj0a
zD8gD@%j)o%nx1DKF+16%%!BchM~3K!OcfcwSrG3UOLHtOZB6fAuR0+r#GY<^>g<w)
zjWbWlyq=hHPt<lT1sq3TPdekfSEDpF_efB4vZMci>a!a0$GVchrNn3tYHTI@wC5b7
zI9~hOT<Jv@@(%bkG<csWc-$PHlP90l=TMrm)k<XtBh@^V+;VoeyK(TT(R<G2w~8Lt
z_vdzb9yHzm9#Lig5!M%n-9&m9ZF!IEzTs}oU{d$O%yweIvu&k!E(A~hIyIiuINCa^
z<J7owwK$IR!SMvlAXpQwszWYKrv;sx?5R39Y;T49a}qnhg{0q<N;1suXejsgpO<qY
z>4R-bcJ$oC4>Hc4?Jl_XLR;9wdcG!YozCSPFYjZnVy+q~CWl3GaLcdui^#Fl%P||F
zzh2Y-u-@7oUUjOZF?3mOu%Xs&=7huSkY(@rB>dV&sl%i=<oG6BI@d1B9FWu0)@XYw
zADfKw2)>t)rH~%FSZCj2L9^<>tc!kkrp%-UR+Xf^j9M2T)2lbH<(bR|Z#i{AbVjwf
zGxpYI9b4Jcammi=bE5hxI-hjj<pJB$9pqEqnk8x~G=21Npc|_BI_T-284K&mz}@EN
zJMF$Sx&&){Gul-xW=%@Xn4ABL(qu#X_r|d=ta=s+!z1!u_Nr@-ZWg8-@l>;H9r9?j
z2ytT6g=JmNjZ{BVuTU#WXl--b=-_fcsA8ig>PBK`-bn21+MMo0TX)y_Da`P)lE=Vp
z)zjgt_vSpDQf@WzPEVipAk>vW4a8^&c-D?9cD-92$y1WjDLLk~<>1z~EA!Wz=|%{`
z+fNOYHFn1w+;*Y%HyH)Pi#_vJMK|rRCkJQm0<8HNRp&4KLR-Dy_%2QVv#XVN75NWt
zx|(k|9=7jnq(f2mxyRer3i22Ks=Dz0x|;sTf>9p#<rUrN3WYz<EL~6}r)cuAVQj^<
zMd_RWh|nBpP~${sa#RqfO#&Jj8`WLrsTPNeWz%lheN5FbaYe2so2@x;VAfE=qT<9g
zjYW|O>)yq9#5`_PU&)Z-;A1`C)X)9%c|%e6W-Zl#=A#)dQTWHFQxaJ0woui#K6}%*
z?p)i~eXBp_DEX-W=)T{5Pv~Tn90+tweBpThou%OktD2WQBjx4?Q9TilUgadNc}Ij}
zbhR=f?r+`jm%)(s{fEf=gKi2(G%S788m@#%Yi`fl!aSUJEY~M6jy(}?nx$EI*>joM
zN;CTNb)2SHM?*8CGI7Sy`x!%1{o9<>a}`781XcRMA80!&-0jsBi#<>0nW)}7JJs$N
zHoSE+x)gpPt#W~r*e@o!h{edg|FCb*Rh1_c6W_|k7i+yuR;hVdoxic7(|2sS*_*)0
zAdQ#R+*j67HqY%>M_*MK9iXa+Rf?s{m5|*rtOcf0cl`!l&!3G?|G-%LVZM7vT<fK)
zDjS=6lYG(`FNI?kh(SNow5es7_g)<#H|h-)=9vD4x?Oki^6@31T`-u`A&!ZOjfIKH
z=dB&u(368=Y38>#F8_VE-33!;dLR5%Od8cmxkAvmMm5biW0A8jx_Cq`3BMAlA9cX%
z=FRBeGY=li%TdfZ0H2V0)&2T>H$rC$rT1IJ(2F9ifqq*5Gb!V9wfHPA`TCK}Q<jy#
zZ}D@GFGED2-@mAiuU*I78W%UXeE0a^(5QY@URm9rlv|z;7@^iHQ^9a2ooDdWXP4EJ
z$B$@V*3GKysyw&KHD)5V_vk%-vYeuv0giFeZn#o~ajpKQrA*$hmsG45m^oOb?_1H4
zdw0*VyzM#HnrV}ACX^uXR4@K;%nd{W-008&bxYlIN0($%_0(*C(;6RCq6QyvkuA1#
zd+oS!t~#q)X-cM|H2>Yg4xX*9qPU`UtQxJ{IycGp@swe~+s^qfLZov>3MwAL*oGEY
z3iG>F>Pr<|TnY)GQqdDB=~Vf)c#RrsyE|R`$8qm3uB#7`8@XJ3J%7ySJ?#9Ytk((x
z!MtBob@x8)czW}}vnkr6o&g!BUSUddB~}UsQ`X=>ms*ZiTc}JvS07;U8K8auR{&j#
z!C(d(0t5il3lzf{pgV_0LkyHwAmAJp4Y7k@g|-ryfF2z4Kp|)sxYeE+=*6V45E~3-
z4FaeT02dSk@BpqiPecu%A*OMuP+KBKA>h+0VlNuP(aHvH!WV*YygptZjWiA5_+b%-
zvTy?-i%qqqZ~6oQozV~;VzGdVLizjq>-*#M`9gOThC-pB&{z}}i-a_gqCGq@5P;-~
zv?UNT7<5p?6mkS&4xa~?U;+%jub75FK>hH~{&59XR$t(GqE9S9e4qjV0Scp!Msc~Q
zZ!JV(Q$GmglSBX3LSzqJv7&525#LwH1Wo-wo>==^2p02;y}(!KJsl2<i2}VrE~F}g
zM#X$Lq?v`4%@+#^1@0WKVA={I`#ViBhy9hT?|hT=Oo#KWBarzQ-0!qM$3CqLX<1oO
z>3pWI#61f-4Ivqy%HlIQEb4TVfMep=WB`pM0~ipA2T3d>gN4N*F*pDuurNdhn}PiX
z%7P~n13V@ufr7yGIS>wuOhjWD1U!<#BvO!gsEH(FF>EB0h$b)rfXQZ%zJ;(Ba-ggP
zyubBI0>y%$01}0SL9<9mB9Vea;z>jt62LRiNFs^E!U1eDi-cxOd&6Q<H}QpB0Gdt?
z7jOqr0-pPHhlFsdk&Oinfz?NUmDqR#Vm4$zLu}#jd;`9A*mJm`ofwd?i6Iivcnlgx
z#E`LQ0vYpFX*(zsL76DQ#Gv(YGto$<g$e}&5erE26atvGfMTJV2th#17uxgr-ZX^7
zCAh@$OSctNPAotS&;c<BfugZkDw<5i;OsF_gGfbVkZ1xG{f$1K#bNLHZ`zXLfg8+B
zxj9D!jlXAFG*eM_pwG<N%&9kLx|HDX>7t+l%$X2GfFH=3_7lRI>0){SJa-UUJwB!D
zXF2EJqyhy;U^4(VfMnzG1SFn9fbt4tLoF-`WRVy|28lF7(ie0QpDp$WgrJc-#3RHN
zl%CUE!F6|Vcr3oZNbh@Z{5?R)JV2Bo(O4t~V~>G|BT;b#1nQp;k4*tVs6;>{5d$)j
zcmke`1Q=)*<OT&#0VrfV10a6y?*AX&bRPbP;K)!3+G8+O0*Q(xe#(dcL5L&<1JA%R
z@JJjMhmp)18%bf4aY!~3#ABIc5}Sl3{JkMUDUYF|3IDqgnHVAyLx7e%A`Z<);-OUq
z3E)T!BoQPL&>#kn$1q5Ldx+mu^`}`hKuI>X&t++V`agv`qwvj62qpN84BBC#4IA}k
z$NrT0P*MGppHB<MKRE;({&SEY;`b+AKk51*27XBSXLkLh>xUTlA?2Uh^|#R_`}Lk5
z<UyC}{?HwLX5Jrd(9-~E#%41*>@Ugp?Dh2HkYv8V+(`t3$t{!|Qm~}tC6G`?Y++?8
z(>YH;MOx~e=NU01s<xmT*+Z{wp01a@jh2VmXx+(*?))%uu}4)m%y@W3X2-anww`Pa
z;-%zW5DXRyn$my4{5r0AYREk#>iYN+CY|1w1+I^8Iy63E9WYVaOZIhKn6u|d;i^Vw
z?YxNEi5;)cj4ti+%+7bDOg(xxXBtHUWTBB1z2T2Rm#NpjAy%&*sEE#u)>t^|Pnvi3
zpUiJ=9L+?QpQ+2t?d*7q`fLNc5&r}kQ#;|0l~WFBoZ~OIQI9<gJtqm>T?X6Vp~Glb
RYFRJQwJ_aE&oOp8@Gn^jo=^Y)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..00d8e890aaac531928d8d4c8ad21742e79335e27
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}r(Vhn-{IZo#QMK}vQ
zB8wRq_>O=u<5X=vX`rB+r;B4q#jUqDH}Wzl@Gx)KchOkzQQZxR3WmTp+(D+%N<cLX
z4Z*LIPrd#;|LOTNLZ+*V*g;|p3<ZsUWqohFdC$PmALX1V`2NaS0gy`=JYD@<);T3K
F0RS91Fe?B6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
new file mode 100644
index 000000000000..3b12fda33eef
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by alzore_(Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "e_sword"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "e_sword_blade",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

From fba3e8c96ecd0e202b07ec934b9602e9493ee3f7 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Fri, 12 Jul 2024 09:05:33 -0500
Subject: [PATCH 5/8] itemtoggleupdate

---
 .../Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 509779e20319..6fda95335664 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -184,7 +184,6 @@
   id: EnergyDaggerLoud
   description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
   components:
-  - type: EnergySword
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
@@ -210,8 +209,11 @@
       path: /Audio/Weapons/ebladehum.ogg
       params:
         volume: -3
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.4
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.4
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     layers:

From 5c1cfb02eda2f3d49f442e0c155753760e1dd802 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Fri, 12 Jul 2024 09:34:12 -0500
Subject: [PATCH 6/8] daggerparenting

---
 .../Objects/Weapons/Melee/e_sword.yml         | 121 ++++++------------
 1 file changed, 39 insertions(+), 82 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 6fda95335664..ee4095981aaa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -81,26 +81,25 @@
     temperature: 700
 
 - type: entity
-  name: pen
+  name: energy dagger
   parent: EnergySword
-  id: EnergyDagger
-  suffix: E-Dagger
-  description: 'A dark ink pen.'
+  id: EnergyDaggerLoud
+  description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
   components:
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
-        volume: -6
+        volume: -3
     soundDeactivate:
       path: /Audio/Weapons/ebladeoff.ogg
       params:
-        volume: -6
+        volume: -3
   - type: ItemToggleMeleeWeapon
     activatedSoundOnSwing:
       path: /Audio/Weapons/eblademiss.ogg
       params:
-        volume: -6
+        volume: -3
         variation: 0.250
     activatedDamage:
         types:
@@ -111,14 +110,14 @@
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
       params:
-        volume: -6
+        volume: -3
   - type: ComponentToggler
     components:
     - type: Sharp
     - type: DisarmMalus
       malus: 0.4
   - type: Sprite
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     layers:
       - state: e_sword
       - state: e_sword_blade
@@ -135,7 +134,7 @@
         Blunt: 1
   - type: Item
     size: Tiny
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
   - type: UseDelay
     delay: 1.0
   - type: PointLight
@@ -154,68 +153,32 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
-  - type: Tag
-    tags:
-    - Write
   - type: DisarmMalus
     malus: 0
 
 - type: entity
-  parent: BaseItem
-  id: EnergyDaggerBox
-  name: e-dagger box
+  name: pen
+  parent: EnergyDaggerLoud
+  id: EnergyDagger
   suffix: E-Dagger
-  description: A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind.
-  components:
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: Objects/Storage/penbox.rsi
-    state: e_dagger
-  - type: SpawnItemsOnUse
-    items:
-    - id: EnergyDagger
-    sound:
-      path: /Audio/Effects/unwrap.ogg
-
-- type: entity
-  name: energy dagger
-  parent: EnergySword # I don't just parent it to energy dagger because then it would be able to write on paper.
-  id: EnergyDaggerLoud
-  description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
+  description: 'A dark ink pen.'
   components:
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
-        volume: -3
+        volume: -6
     soundDeactivate:
       path: /Audio/Weapons/ebladeoff.ogg
       params:
-        volume: -3
-  - type: ItemToggleMeleeWeapon
-    activatedSoundOnSwing:
-      path: /Audio/Weapons/eblademiss.ogg
-      params:
-        volume: -3
-        variation: 0.250
-    activatedDamage:
-        types:
-            Slash: 10
-            Heat: 10
-    deactivatedSecret: true
+        volume: -6
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
       params:
-        volume: -3
-  - type: ComponentToggler
-    components:
-    - type: Sharp
-    - type: DisarmMalus
-      malus: 0.4
+        volume: -6
   - type: Sprite
-    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
     layers:
       - state: e_sword
       - state: e_sword_blade
@@ -223,36 +186,30 @@
         visible: false
         shader: unshaded
         map: [ "blade" ]
-  - type: MeleeWeapon
-    wideAnimationRotation: 145
-    attackRate: 1
-    hidden: true
-    damage:
-      types:
-        Blunt: 1
   - type: Item
     size: Tiny
-    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
-  - type: UseDelay
-    delay: 1.0
-  - type: PointLight
-    enabled: false
-    radius: 1.5
-    energy: 1.5
-    color: white
-    netsync: false
-  - type: Appearance
-  - type: ToggleableLightVisuals
-    spriteLayer: blade
-    inhandVisuals:
-      left:
-      - state: inhand-left-blade
-        shader: unshaded
-      right:
-      - state: inhand-right-blade
-        shader: unshaded
-  - type: DisarmMalus
-    malus: 0
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
+  - type: Tag
+    tags:
+    - Write
+
+- type: entity
+  parent: BaseItem
+  id: EnergyDaggerBox
+  name: e-dagger box
+  suffix: E-Dagger
+  description: A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind.
+  components:
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: Objects/Storage/penbox.rsi
+    state: e_dagger
+  - type: SpawnItemsOnUse
+    items:
+    - id: EnergyDaggerPen
+    sound:
+      path: /Audio/Effects/unwrap.ogg
 
 - type: entity
   name: energy cutlass

From 96517ac0135e1a5c50d3e8d01caee9d5b00eb99a Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Fri, 12 Jul 2024 09:41:39 -0500
Subject: [PATCH 7/8] fixtypo

---
 Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index ee4095981aaa..1e0aaf61e580 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -207,7 +207,7 @@
     state: e_dagger
   - type: SpawnItemsOnUse
     items:
-    - id: EnergyDaggerPen
+    - id: EnergyDagger
     sound:
       path: /Audio/Effects/unwrap.ogg
 

From f5a06c61159592ccb7c5f437345581cc39c66108 Mon Sep 17 00:00:00 2001
From: Alzore <blackern5000@gmail.com>
Date: Sun, 21 Jul 2024 01:50:19 -0500
Subject: [PATCH 8/8] more bullet per bullet

---
 .../Weapons/Guns/Ammunition/Cartridges/pistol.yml        | 9 ---------
 .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index af4e53c3ba2c..c097d7746e36 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -26,15 +26,6 @@
   - type: CartridgeAmmo
     proto: BulletPistol
 
-- type: entity
-  id: CartridgePistolCaseless
-  name: cartridge (.35 auto caseless)
-  parent: BaseCartridgePistol
-  components:
-  - type: CartridgeAmmo
-    deleteOnSpawn: true
-    proto: BulletPistol
-
 - type: entity
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 87cf6162ada5..8f469f87a9bc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -127,7 +127,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: ProjectileBatteryAmmoProvider
-    proto: CartridgePistolCaseless #So that borgs don't litter the ground with infinite bullet casings
+    proto: BulletPistol
     fireCost: 100
   - type: Battery
     maxCharge: 1000