New security box fills, renamed and replaced sechud box icon (#35057)

* secglasses and sechud icons, new box fills

* sunglasses box

* fixes indentation

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index c43118eff6fe2dccbfab0f0dc4cdc66672785878..818810d0cc16d4be8e1d25807dddc0abdda5670c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -6,12 +6,27 @@
   components:
   - type: StorageFill
     contents:
-      - id: Handcuffs
-        amount: 4
+    - id: Handcuffs
+      amount: 4
   - type: Sprite
     layers:
-      - state: box_security
-      - state: handcuff
+    - state: box_security
+    - state: handcuff
+
+- type: entity
+  name: ziptie box
+  parent: BoxCardboard
+  id: BoxZiptie
+  description: A box full of zipties.
+  components:
+  - type: StorageFill
+    contents:
+    - id: Zipties
+      amount: 9
+  - type: Sprite
+    layers:
+    - state: box_security
+    - state: ziptie
 
 - type: entity
   name: flashbang box
@@ -21,48 +36,87 @@
   components:
   - type: StorageFill
     contents:
-      - id: GrenadeFlashBang
-        amount: 4
+    - id: GrenadeFlashBang
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box_security
+    - state: flashbang
+
+- type: entity
+  name: stinger grenade box
+  parent: BoxCardboard
+  id: BoxStinger
+  description: A box full of stinger grenades. Disperse!
+  components:
+  - type: StorageFill
+    contents:
+    - id: GrenadeStinger
+      amount: 4
   - type: Sprite
     layers:
-      - state: box_security
-      - state: flashbang
+    - state: box_security
+    - state: flashbang
+
+- type: entity
+  name: tear gas grenade box
+  parent: BoxCardboard
+  id: BoxTearGas
+  description: A box full of tear gas grenades. Hold your breath.
+  components:
+  - type: StorageFill
+    contents:
+    - id: TearGasGrenade
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box_security
+    - state: flashbang
 
 - type: entity
   name: sechud box
   parent: BoxCardboard
   id: BoxSechud
+  description: A box of sechuds.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingEyesHudSecurity
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box_security
+    - state: sechud
+
+- type: entity
+  name: secglasses box
+  parent: BoxCardboard
+  id: BoxSecglasses
   description: A box of security glasses.
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
-        amount: 4
+    - id: ClothingEyesGlassesSecurity
+      amount: 4
   - type: Sprite
     layers:
-      - state: box_security
-      - state: sechud
+    - state: box_security
+    - state: secglasses
 
 - type: entity
-  name: ziptie box
+  name: sunglasses box
   parent: BoxCardboard
-  id: BoxZiptie
-  description: A box full of zipties.
+  id: BoxSunglasses
+  description: A box of cool flash-proof sunglasses.
   components:
-  - type: Storage
-    grid:
-    - 0,0,4,3
-    whitelist:
-      components:
-      - Handcuff
   - type: StorageFill
     contents:
-      - id: Zipties
-        amount: 10
+    - id: ClothingEyesGlassesSunglasses
+      amount: 4
   - type: Sprite
     layers:
-      - state: box_security
-      - state: ziptie
+    - state: box_security
+    - state: sunglasses
 
 - type: entity
   name: forensic pad box
@@ -79,5 +133,5 @@
       amount: 9
   - type: Sprite
     layers:
-      - state: box_security
-      - state: forensic
+    - state: box_security
+    - state: forensic

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 20f3c057af0a4448d20a68c26528f264b9bb609b..dbe80371d48f5b2a3361eda0497f3ec9e0ee96a8 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github)",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -34,6 +34,12 @@
         {
             "name": "meson"
         },
+        {
+            "name": "sunglasses"
+        },
+        {
+            "name": "secglasses"
+        },
         {
             "name": "sechud"
         },

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png
new file mode 100644 (file)
index 0000000..d92a5ea
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png differ

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
index d92a5ea120413a63ded588e351a7738856107cec..6a5c29d8900cf7e005b358dd0607eae9c8e5287d 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png differ

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png
new file mode 100644 (file)
index 0000000..110fc9f
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png differ

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
index 25e914234da46c9b4795cf09b1ce7e3f67520a3b..19bce95e27128b7b9f45e05f49ab289b88729c5e 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github).",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -16,6 +16,12 @@
     {
       "name": "meson"
     },
+    {
+      "name": "sunglasses"
+    },
+    {
+      "name": "secglasses"
+    },
     {
       "name": "sechud"
     },

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png b/Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png
new file mode 100644 (file)
index 0000000..5d81fff
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png differ

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png
index 5d81fffb218bfe774dd90a7f23086f682c1bc4e6..06c9c01f42b47d083335280004cd4f0713310241 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png and b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png differ

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sunglasses.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sunglasses.png
new file mode 100644 (file)
index 0000000..fa8e093
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/sunglasses.png differ