juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cabinetification (#34293)

Browse Source 
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes
This commit is contained in:
Ps3Moira
2025-02-03 23:52:10 -08:00
committed by GitHub
parent df56b67ba8
commit b2a6d5c1b0
438 changed files with 197 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Catalog/Cargo/cargo_service.yml
View File

@@ -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

2
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
View File

@@ -188,7 +188,7 @@
- id: FoodCondimentPacketKetchup
- type: Sprite
layers:
- state: box_olive
- state: box
- state: writing
- type: entity

3
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
View File

@@ -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

18
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
View File

@@ -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

20
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
View File

@@ -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

40
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
View File

@@ -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

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
View File

@@ -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

7
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
View File

@@ -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

38
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
View File

@@ -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

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
View File

@@ -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

14
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
View File

@@ -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)