Merge branch 'DeltaV-Station:master' into Morty-Plushie

DeltaV-Station · Dec 22, 2024 · d39d48d · d39d48d
2 parents 9bd2d95 + 79c3fcc
commit d39d48d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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