апстрим 19042024

Resources/Changelog/Changelog.yml

@@ -4067,3 +4067,15 @@ Entries:
       message: Added a full suite of clothing for the station representative.
   id: 4916
   time: '2024-04-17T22:04:59.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Nerfed bluespace bags to only 4 additional bag columns.
+  id: 4917
+  time: '2024-04-18T20:49:44.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Add
+      message: NFSD now has access to breaching charges.
+  id: 4918
+  time: '2024-04-18T21:59:45.0000000+00:00'

Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

@@ -114,7 +114,7 @@ uplink-security-shotslug-name = Lethal Shotgun Slug Shells
 uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells.
 uplink-security-cash1000-name = 1000 Spesos
 uplink-security-cash1000-desc = Cold, hard cash.
-uplink-security-empgrenade-box-name = EMP Grenades
+uplink-security-empgrenade-box-name = EMP Grenade Box
 uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades.
 uplink-security-explosivegrenade-box-name = Explosive Grenade Box
 uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades.
@@ -130,3 +130,5 @@ uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box
 uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades.
 uplink-security-stingergrenade-box-name = Stinger Grenade Box
 uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades.
+uplink-security-breachingcharge-box-name = Breaching Charge Box
+uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml

@@ -0,0 +1,28 @@
+- type: entity
+  name: breaching charge
+  description: A breaching explosive for security officers to break through walls.
+  parent: SeismicCharge
+  id: BreachingCharge
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Bombs/breaching.rsi
+    state: icon
+    layers:
+    - state: icon
+      map: ["base"]
+  - type: OnUseTimerTrigger
+    delay: 10
+    delayOptions: [10, 15, 20, 25]
+    initialBeepDelay: 0
+    beepSound:
+      path: /Audio/Effects/Cargo/buzz_two.ogg
+      params:
+        volume: -6
+    startOnStick: true
+    canToggleStartOnStick: true
+  - type: Explosive
+    explosionType: DemolitionCharge
+    totalIntensity: 10
+    intensitySlope: 10
+    maxIntensity: 10
+    canCreateVacuum: false

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -270,7 +270,7 @@
   - type: Storage
     maxItemSize: Huge
     grid:
-    - 0,0,19,9
+    - 0,0,11,4
 
 - type: entity
   parent: ClothingBackpackClown

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -236,7 +236,7 @@
   - type: Storage
     maxItemSize: Huge
     grid:
-    - 0,0,19,9
+    - 0,0,11,4
   - type: ClothingSpeedModifier
     sprintModifier: 1 # makes its stats identical to other variants of bag of holding
   - type: HeldSpeedModifier

Resources/Prototypes/Entities/Clothing/Back/satchel.yml

@@ -177,4 +177,4 @@
   - type: Storage
     maxItemSize: Huge
     grid:
-    - 0,0,19,9
+    - 0,0,11,4

Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml

@@ -2,7 +2,7 @@
 - type: entity
   name: box of nfsd items
   parent: BoxCardboard
-  id: BoxBundleNFSD
+  id: BoxBundleNfsd
   description: A box full of nfsd items.
   components:
   - type: Sprite
@@ -11,7 +11,7 @@
 
 - type: entity
   name: box of explosive grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxExplosiveGrenades
   description: A box full of explosive grenades.
   components:
@@ -22,7 +22,7 @@
 
 - type: entity
   name: box of incendiary grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxIncendiaryGrenades
   description: A box full of incendiary grenades.
   components:
@@ -33,7 +33,7 @@
 
 - type: entity
   name: box of shrapnel grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxShrapnelGrenades
   description: A box full of shrapnel grenades.
   components:
@@ -44,7 +44,7 @@
 
 - type: entity
   name: box of smoke grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxSmokeGrenades
   description: A box full of smoke grenades.
   components:
@@ -55,7 +55,7 @@
 
 - type: entity
   name: box of tear gas grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxTeargasGrenades
   description: A box full of tear gas grenades.
   components:
@@ -65,8 +65,7 @@
         amount: 4
 
 - type: entity
-  name: box of EMP grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxEMPGrenades
   description: A box full of EMP grenades.
   components:
@@ -77,7 +76,7 @@
 
 - type: entity
   name: box of flashbang grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxFlashBangGrenades
   description: A box full of flashbang grenades.
   components:
@@ -88,11 +87,23 @@
 
 - type: entity
   name: box of stinger grenades
-  parent: BoxBundleNFSD
+  parent: BoxBundleNfsd
   id: BoxStingerGrenades
   description: A box full of stinger grenades.
   components:
   - type: StorageFill
     contents:
       - id: GrenadeStinger
         amount: 4
+
+## plastic explosives
+- type: entity
+  name: box of breaching charges grenades
+  parent: BoxBundleNfsd
+  id: BoxBreachingCharges
+  description: A box full of breaching charges.
+  components:
+  - type: StorageFill
+    contents:
+      - id: BreachingCharge
+        amount: 4