Missing box icons (#14891)

* boxes

* holo box

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 6b30184d17913d44739ed0246af164deaf893f86..571abe50e0851bb639c1e704d10c1fe938d1fc7b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -1,8 +1,19 @@
 # As opposed to MagazineBox these are boxes of magazines so BoxMagazine
 # CaselessRifle
 - type: entity
-  name: box of .25 caseless magazines
+  name: box of magazines
   parent: BoxCardboard
+  id: BoxMagazine
+  description: A box full of magazines.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_security
+      - state: magazine
+
+- type: entity
+  name: box of .25 caseless magazines
+  parent: BoxMagazine
   id: BoxMagazinePistolCaselessRifle
   description: A box full of .25 caseless magazines.
   components:
@@ -13,7 +24,7 @@
 
 - type: entity
   name: box of .25 caseless (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolCaselessRifleHighVelocity
   description: A box full of .25 caseless high-velocity magazines.
   components:
@@ -24,7 +35,7 @@
 
 - type: entity
   name: box of .25 caseless (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolCaselessRiflePractice
   description: A box full of .25 caseless practice magazines.
   components:
@@ -35,7 +46,7 @@
 
 - type: entity
   name: box of .25 caseless (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineCaselessRifleRubber
   description: A box full of
   components:
@@ -47,7 +58,7 @@
 # LightRifle
 - type: entity
   name: box of .30 rifle magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineLightRifle
   description: A box full of .30 rifle magazines.
   components:
@@ -58,7 +69,7 @@
 
 - type: entity
   name: box of .30 rifle (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineLightRifleHighVelocity
   description: A box full of .30 rifle (high-velocity) magazines.
   components:
@@ -69,7 +80,7 @@
 
 - type: entity
   name: box of .30 rifle (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineLightRiflePractice
   description: A box full of .30 rifle (practice) magazines.
   components:
@@ -80,7 +91,7 @@
 
 - type: entity
   name: box of .30 rifle (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineLightRifleRubber
   description: A box full of .30 rifle (practice) magazines.
   components:
@@ -91,7 +102,7 @@
 
 - type: entity
   name: box of Vector magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGun
   description: A box full of Vector magazines.
   components:
@@ -102,7 +113,7 @@
 
 - type: entity
   name: box of Vector (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGunHighVelocity
   description: A box full of Vector (high-velocity) magazines.
   components:
@@ -113,7 +124,7 @@
 
 - type: entity
   name: box of Vector (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGunPractice
   description: A box full of Vector (practice) magazines.
   components:
@@ -124,7 +135,7 @@
 
 - type: entity
   name: box of Vector (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineMagnumSubMachineGunRubber
   description: A box full of Vector (rubber) magazines.
   components:
@@ -136,7 +147,7 @@
 # Pistol
 - type: entity
   name: box of WT550 .35 auto magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunTopMounted
   description: A box full of WT550 .35 auto magazines.
   components:
@@ -147,7 +158,7 @@
 
 - type: entity
   name: box of pistol .35 auto magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistol
   description: A box full of pistol .35 auto magazines.
   components:
@@ -158,7 +169,7 @@
 
 - type: entity
   name: box of pistol .35 auto (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolHighVelocity
   description: A box full of pistol .35 auto (high-velocity) magazines.
   components:
@@ -169,7 +180,7 @@
 
 - type: entity
   name: box of pistol .35 auto (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolPractice
   description: A box full of  magazines.
   components:
@@ -180,7 +191,7 @@
 
 - type: entity
   name: box of pistol .35 auto (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolRubber
   description: A box full of pistol .35 auto (rubber) magazines.
   components:
@@ -191,7 +202,7 @@
 
 - type: entity
   name: box of machine pistol .35 auto magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolHighCapacity
   description: A box full of machine pistol .35 auto magazines.
   components:
@@ -202,7 +213,7 @@
 
 - type: entity
   name: box of machine pistol .35 auto (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolHighCapacityHighVelocity
   description: A box full of machine pistol .35 auto (high-velocity) magazines.
   components:
@@ -213,7 +224,7 @@
 
 - type: entity
   name: box of machine pistol .35 auto (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolHighCapacityPractice
   description: A box full of machine pistol .35 auto (practice) magazines.
   components:
@@ -224,7 +235,7 @@
 
 - type: entity
   name: box of machine pistol .35 auto (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolHighCapacityRubber
   description: A box full of machine pistol .35 auto (rubber) magazines.
   components:
@@ -236,7 +247,7 @@
 
 - type: entity
   name: box of SMG .35 auto magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGun
   description: A box full of SMG .35 auto magazines.
   components:
@@ -247,7 +258,7 @@
 
 - type: entity
   name: box of SMG .35 auto (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunHighVelocity
   description: A box full of SMG .35 auto (high-velocity) magazines.
   components:
@@ -258,7 +269,7 @@
 
 - type: entity
   name: box of SMG .35 auto (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunPractice
   description: A box full of SMG .35 auto (practice) magazines.
   components:
@@ -269,7 +280,7 @@
 
 - type: entity
   name: box of SMG .35 auto (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazinePistolSubMachineGunRubber
   description: A box full of SMG .35 auto (rubber) magazines.
   components:
@@ -281,7 +292,7 @@
 # Shotgun
 - type: entity
   name: box of (.50 pellet) ammo drums
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineShotgun
   description: A box full of (.50 pellet) ammo drums.
   components:
@@ -292,7 +303,7 @@
 
 - type: entity
   name: box of (.50 beanbag) ammo drums
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineShotgunBeanbag
   description: A box full of (.50 beanbag) ammo drums.
   components:
@@ -303,7 +314,7 @@
 
 - type: entity
   name: box of (.50 slug) ammo drums
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineShotgunSlug
   description: A box full of (.50 slug) ammo drums.
   components:
@@ -314,7 +325,7 @@
 
 - type: entity
   name: box of (.50 incendiary) ammo drums
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineShotgunIncendiary
   description: A box full of (.50 incendiary) ammo drums.
   components:
@@ -325,7 +336,7 @@
 
 # base BallisticAmmoProvider boxes
 - type: entity
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxAmmoProvider
   abstract: true
   components:
@@ -438,7 +449,7 @@
 # Rifle
 - type: entity
   name: box of .20 rifle magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineRifle
   description: A box full of .20 rifle magazines.
   components:
@@ -449,7 +460,7 @@
 
 - type: entity
   name: box of .20 rifle (high-velocity) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineRifleHighVelocity
   description: A box full of .20 rifle (high-velocity) magazines.
   components:
@@ -460,7 +471,7 @@
 
 - type: entity
   name: box of .20 rifle (practice) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineRiflePractice
   description: A box full of .20 rifle (practice) magazines.
   components:
@@ -471,7 +482,7 @@
 
 - type: entity
   name: box of .20 rifle (rubber) magazines
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxMagazineRifleRubber
   description: A box full of .20 rifle (rubber) magazines.
   components:

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index a1c30d9d2e195ef248b2d89072da353624eaf0b3..a8645dd05067ac08ef385b0d2158f3265c0cef5f 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -220,7 +220,7 @@
   - type: Sprite
     layers:
       - state: box
-      - state: writing
+      - state: inflatable
   - type: Tag
     tags:
       - DroneUsable
@@ -252,7 +252,7 @@
   - type: Sprite
     layers:
       - state: box
-      - state: writing
+      - state: flare
 
 - type: entity
   name: trashbag box
@@ -272,7 +272,7 @@
   - type: Sprite
     layers:
       - state: box
-      - state: writing
+      - state: trashbag
   - type: Tag
     tags:
       - DroneUsable

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index ddf3e907d0e0a3bb6b3903a7391dc324027b30f1..4a352b49903a8bf610422e3e92d28510000e48b6 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -97,6 +97,10 @@
     contents:
       - id: DiseaseSwab
         amount: 30
+  - type: Sprite
+    layers:
+      - state: box
+      - state: swab
 
 - type: entity
   name: body bag box

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 2fb402acaeade32123350e35ef8ad93105274d21..1c35b125016e4c6e82e9e42b739c582145eeafec 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -70,4 +70,5 @@
         amount: 10
   - type: Sprite
     layers:
-      - state: box_security
\ No newline at end of file
+      - state: box_security
+      - state: forensic
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
index 6a8ceb04f5b690634af16354ac87b778c2249566..f052743b46ff165c44078cf13fc76c41dac12499 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
@@ -38,3 +38,4 @@
   - type: Sprite
     layers:
       - state: box
+      - state: holo

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
index 762352b17382e2a6300fe20d71c7ac9356040a88..64f29a6eee867c92b2c70767d4ecd5b221fda627 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -18,7 +18,7 @@
 - type: entity
   parent: BoxDonkSoftBase
   id: BoxDonkSoftBox
-  name: foam dart box
+  name: box of foam darts
   components:
   - type: BallisticAmmoProvider
     whitelist:
@@ -27,20 +27,24 @@
     capacity: 40
     proto: BulletFoam
   - type: Sprite
-    sprite: Objects/Fun/toys.rsi
-    state: foambox
+    sprite: Objects/storage/boxes.rsi
+    layers:
+      - state: boxwidetoy
+      - state: shelltoy
 
 - type: entity
-  parent: BoxDonkSoftBase
+  parent: BaseMagazineBoxMagnum
   id: BoxCartridgeCap
   name: cap gun cartridge box
   components:
   - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - CartridgeCap
-    capacity: 20
     proto: CartridgeCap
+    capacity: 20
   - type: Sprite
-    sprite: Objects/Storage/boxes.rsi
-    state: box
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
+    layers:
+      - state: capbase
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-1
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: cap

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
index eb5120f8123e7f2a716fb80b672c06dd12779fdc..e66b288c347a25792dc840cba5d9005d276eb461 100644 (file)
Binary files a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png and b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png differ

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

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

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

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

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

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

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 9f2187d57d3f06330cbdd30610e2c68aaff30e63..a20436fcf386571cd8001638bac4aae9f2db2388 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 tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, 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",
   "size": {
     "x": 32,
     "y": 32
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-          "name": "bottle"
+                       "name": "bottle"
         },
         {
             "name": "box"
@@ -43,6 +43,9 @@
         {
             "name": "boxwide"
         },
+        {
+            "name": "boxwidetoy"
+        },
         {
             "name": "box_hug"
         },
@@ -70,15 +73,27 @@
         {
             "name": "flashbang"
         },
+        {
+            "name": "flare"
+        },
+        {
+            "name": "forensic"
+        },
         {
             "name": "glasses"
         },
         {
             "name": "handcuff"
         },
+        {
+            "name": "holo"
+        },
         {
             "name": "implant"
         },
+        {
+            "name": "inflatable"
+        },
         {
             "name": "latex"
         },
@@ -91,6 +106,9 @@
         {
             "name": "lighttube"
         },
+        {
+            "name": "magazine"
+        },
         {
             "name": "mousetraps"
         },
@@ -109,9 +127,15 @@
         {
             "name": "sterile"
         },
+        {
+            "name": "swab"
+        },
         {
             "name": "syringe"
         },
+        {
+            "name": "trashbag"
+        },
         {
             "name": "writing"
         },
@@ -161,6 +185,9 @@
         {
             "name": "shellslug"
         },
+        {
+            "name": "shelltoy"
+        },
         {
             "name": "ziptie"
         }

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

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

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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png
new file mode 100644 (file)
index 0000000..20465f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/cap.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png
new file mode 100644 (file)
index 0000000..9022346
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
index a85b6144c4c922df7d70e0f2ed2b984ea8a68790..547322299583547f7735fee21268884a12296155 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi. capbase and cap modified from base and rubber by potato1234x (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,15 @@
     {
       "name": "base"
     },
+    {
+      "name": "capbase"
+    },
     {
       "name": "mag-1"
     },
+    {
+      "name": "cap"
+    },
     {
       "name": "hv"
     },