From 12e11874348bfb49abefbe183a7bd9a39baf84c5 Mon Sep 17 00:00:00 2001
From: Radezolid <snappednexus@gmail.com>
Date: Sun, 22 Dec 2024 13:14:07 -0300
Subject: [PATCH 1/2] Sneaky foam dart grenade explosive (#2486)

* Add the grenade

* Uplink
---
 .../Locale/en-US/deltav/store/uplink-catalog.ftl    |  3 +++
 .../Prototypes/DeltaV/Catalog/uplink_catalog.yml    | 13 +++++++++++++
 .../Entities/Objects/Weapons/Throwable/grenades.yml | 10 ++++++++++
 3 files changed, 26 insertions(+)

diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
index 4cf03df5f92..259cdfd9aec 100644
--- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
@@ -23,3 +23,6 @@ uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball
 
 uplink-foam-sabre-name = Sharp Foam Sabre
 uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assassins that pretend playing around.
+
+uplink-explosive-foam-grenade-name = Explosive Foam Grenade
+uplink-explosive-foam-grenade-desc = An explosive grenade disguised as a regular foam toy grenade.
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index f03c88af6b5..2e0cb9d15e6 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -117,3 +117,16 @@
     Telecrystal: 6
   categories:
   - UplinkWeaponry
+
+- type: listing
+  id: UplinkExGrenadeFoam
+  name: uplink-explosive-foam-grenade-name
+  description: uplink-explosive-foam-grenade-desc
+  productEntity: ExGrenadeFoam
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4 # 1 TC more expensive than regular due to disguise.
+  categories:
+  - UplinkExplosives
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml
index 418b1437082..27af0148e51 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -7,3 +7,13 @@
     totalIntensity: 1
     canCreateVacuum: false
     deleteAfterExplosion: false # prevent borg having an empty hand
+
+- type: entity
+  parent: ExGrenade
+  id: ExGrenadeFoam
+  name: foam dart grenade
+  suffix: Explosive
+  description: Releases a bothersome spray of foam darts that cause severe welching.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/foamdart.rsi

From 79c3fcc97dac499fc128952a9519a5862dc18de8 Mon Sep 17 00:00:00 2001
From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:14:26 +0100
Subject: [PATCH 2/2] Automatic changelog update

---
 Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index a388a4d2ca6..0d6a8fc1bf7 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Velcroboy
-  changes:
-  - message: Changed asteroids to have more ore...and some danger
-    type: Tweak
-  id: 309
-  time: '2024-04-11T18:25:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1079
 - author: deltanedas
   changes:
   - message: Fixed some doors being AA.
@@ -3827,3 +3820,11 @@
   id: 808
   time: '2024-12-22T08:52:18.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2469
+- author: Radezolid
+  changes:
+  - message: The syndicate R&D team managed to disguise regular grenades into foam
+      dart grenades, get them at your local illegal arms dealer/uplink.
+    type: Add
+  id: 809
+  time: '2024-12-22T16:14:07.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2486