space-wizards · Emisse · Feb 4, 2025 · Jan 8, 2025 · Jan 8, 2025 · Jan 8, 2025
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -52,7 +52,7 @@
   id: ServiceSmokeables
   icon:
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    state: closed
+    state: icon
   product: CrateServiceSmokeables
   cost: 1500
   category: cargoproduct-category-name-service
@@ -62,7 +62,7 @@
   id: ServiceCustomSmokable
   icon:
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    state: closed
+    state: icon
   product: CrateServiceCustomSmokable
   cost: 1000
   category: cargoproduct-category-name-service

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -188,7 +188,7 @@
       - id: FoodCondimentPacketKetchup
   - type: Sprite
     layers:
-      - state: box_olive
+      - state: box
       - state: writing
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -493,9 +493,6 @@
     state: box
     layers:
     - state: box
-      map: ["closeLayer"]
-    - state: box-open
-      map: ["openLayer"]
   - type: Item
     sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -6,11 +6,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    layers:
-      - state: closed
-        map: ["closeLayer"]
-      - state: open
-        map: ["openLayer"]
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
     size: Normal
@@ -37,8 +33,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
   - type: StorageFill
@@ -54,8 +49,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
   - type: StorageFill
@@ -71,8 +65,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
   - type: StorageFill
@@ -88,8 +81,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
-    layers:
-      - state: closed
+    state: icon
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
   - type: StorageFill

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -25,26 +25,6 @@
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxAntiMateriel
-  id: MagazineBoxAntiMaterielBig
-  name: ammunition box (.60 anti-materiel)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 30
-    proto: CartridgeAntiMateriel
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -25,46 +25,6 @@
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifle10x24
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-10x24
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag10-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag10
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleBig
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifle

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -29,21 +29,17 @@
   parent: BaseMagazineBoxLightRifle
   id: MagazineBoxLightRifleBig
   name: ammunition box (.30 rifle)
+  suffix: Big
   components:
   - type: BallisticAmmoProvider
     capacity: 200
     proto: CartridgeLightRifle
   - type: Sprite
     layers:
-    - state: base-b
+    - state: base
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
+    - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
 
 - type: entity
   parent: BaseMagazineBoxLightRifle

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -28,18 +28,19 @@
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRifleBig
   name: ammunition box (.20 rifle)
+  suffix: Big
   components:
   - type: BallisticAmmoProvider
     capacity: 200
     proto: CartridgeRifle
   - type: Sprite
     layers:
-    - state: base-b
+    - state: base-big
       map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
+    - state: mag-big-1
       map: ["enum.GunVisualLayers.Mag"]
   - type: MagazineVisuals
-    magState: magb
+    magState: mag-big
     steps: 4
     zeroVisible: false
   - type: Appearance

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -38,11 +38,15 @@
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
+    - type: MagazineVisuals
+      magState: mag-beanbag
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-beanbag-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: beanbag
 
@@ -69,14 +73,14 @@
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
     - type: MagazineVisuals
-      magState: mag-alt
+      magState: mag-slug
       steps: 5
       zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-alt-1
+      - state: mag-slug-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: slug
 
@@ -87,11 +91,15 @@
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
+    - type: MagazineVisuals
+      magState: mag-flare
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-flare-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: flare
 
@@ -102,11 +110,15 @@
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
+    - type: MagazineVisuals
+      magState: mag-incend
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-incend-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: incendiary
 
@@ -118,14 +130,14 @@
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
     - type: MagazineVisuals
-      magState: mag-alt
+      magState: mag-uranium
       steps: 5
       zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-alt-1
+      - state: mag-uranium-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: uranium
 
@@ -136,11 +148,15 @@
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
+    - type: MagazineVisuals
+      magState: mag-practice
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-practice-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: practice
 
@@ -151,10 +167,14 @@
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
+    - type: MagazineVisuals
+      magState: mag-tranq
+      steps: 5
+      zeroVisible: false
     - type: Sprite
       layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-tranq-1
         map: ["enum.GunVisualLayers.Mag"]
       - state: tranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -39,11 +39,15 @@
   - type: BallisticAmmoProvider
     proto: CartridgeCap
     capacity: 20
+  - type: MagazineVisuals
+    magState: mag-cap
+    steps: 4
+    zeroVisible: false
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
     layers:
-      - state: capbase
+      - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-1
+      - state: mag-cap-1
         map: ["enum.GunVisualLayers.Mag"]
-      - state: cap
+      - state: capbase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -241,20 +241,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolHighCapacityRubber
-  name: machine pistol magazine (.35 auto rubber)
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistol
-  - type: Sprite
-    layers:
-    - state: rubber
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolSubMachineGun
   name: SMG magazine (.35 auto)

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/banana-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/berry-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.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/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub), modified by ps3moira (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/pizza-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/spicy-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/stonk-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/teriyaki-box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box-open.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box1.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box2.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box3.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box4.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box5.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/box6.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, further modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box1.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box2.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box3.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box4.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box5.png
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/pink-box6.png
diff --git a/.../Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png b/.../Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png
diff --git a/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png b/...es/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/icon.png
diff --git a/...ures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png b/...ures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png
diff --git a/...res/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png b/...res/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png