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

Magazine rsi Cleanup + Magazine Type Recolor (#37709)

Browse Source
This commit is contained in:
Seam_Less
2025-06-11 13:03:14 -07:00
committed by GitHub
parent 36c048ba65
commit f046d8a1f6
52 changed files with 166 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
View File

@@ -107,7 +107,7 @@
capacity: 10
- type: Sprite
slayers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -122,6 +122,7 @@
- state: inhand-left-mag
right:
- state: inhand-right-mag
- state: inhand-right-stripe
- type: entity
id: MagazinePistolCaselessRiflePractice
@@ -134,10 +135,12 @@
capacity: 10
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: MagazineVisuals
magState: mag
steps: 6
@@ -148,11 +151,11 @@
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineCaselessRifle
@@ -163,7 +166,7 @@
proto: CartridgeCaselessRifle
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -171,12 +174,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineCaselessRiflePractice
@@ -187,20 +186,22 @@
proto: CartridgeCaselessRiflePractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineCaselessRifleShort
@@ -212,7 +213,7 @@
capacity: 20
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -220,12 +221,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineCaselessRifleShortPractice
@@ -237,17 +234,19 @@
capacity: 20
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"

36
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View File

@@ -65,7 +65,7 @@
proto: CartridgeLightRifle
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -73,12 +73,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineLightRifleEmpty
@@ -112,20 +108,22 @@
proto: CartridgeLightRiflePractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineLightRifleUranium
@@ -137,10 +135,12 @@
proto: CartridgeLightRifleUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left:
@@ -160,6 +160,24 @@
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleIncendiary
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#ff6e52"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ff6e52"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ff6e52"
- type: entity
id: MagazineLightRifleMaxim

44
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
View File

@@ -79,7 +79,7 @@
proto: CartridgeMagnum
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -87,12 +87,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineMagnumPractice
@@ -104,20 +100,22 @@
proto: CartridgeMagnumPractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineMagnumUranium
@@ -129,10 +127,12 @@
proto: CartridgeMagnumUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left:
@@ -154,10 +154,12 @@
proto: CartridgeMagnumAP
- type: Sprite
layers:
- state: piercing
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#540000"
- type: Item
inhandVisuals:
left:
@@ -199,7 +201,7 @@
proto: CartridgeMagnum
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -207,12 +209,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineMagnumSubMachineGunPractice
@@ -223,20 +221,22 @@
proto: CartridgeMagnumPractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineMagnumSubMachineGunUranium
@@ -247,10 +247,12 @@
proto: CartridgeMagnumUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left:
@@ -271,10 +273,12 @@
proto: CartridgeMagnumAP
- type: Sprite
layers:
- state: piercing
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#540000"
- type: Item
inhandVisuals:
left:

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

@@ -148,7 +148,7 @@
proto: CartridgePistol
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -156,12 +156,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazinePistolEmpty
@@ -193,6 +189,24 @@
components:
- type: BallisticAmmoProvider
proto: CartridgePistolIncendiary
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#ff6e52"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ff6e52"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ff6e52"
- type: entity
id: MagazinePistolPractice
@@ -204,20 +218,22 @@
proto: CartridgePistolPractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazinePistolUranium
@@ -229,10 +245,12 @@
proto: CartridgePistolUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left:
@@ -274,7 +292,7 @@
proto: CartridgePistol
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -282,12 +300,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazinePistolHighCapacityPractice
@@ -298,20 +312,22 @@
proto: CartridgePistol
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazinePistolSubMachineGun
@@ -328,7 +344,7 @@
path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -336,12 +352,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazinePistolSubMachineGunEmpty
@@ -375,20 +387,22 @@
proto: CartridgePistolPractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazinePistolSubMachineGunUranium
@@ -400,10 +414,12 @@
proto: CartridgePistolUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left:
@@ -423,10 +439,22 @@
components:
- type: BallisticAmmoProvider
proto: CartridgePistolIncendiary
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#ff6e52"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ff6e52"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ff6e52"

38
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
View File

@@ -1,4 +1,3 @@
# Empty mags
- type: entity
id: BaseMagazineRifle
name: "magazine (.20 rifle)"
@@ -32,7 +31,6 @@
zeroVisible: false
- type: Appearance
# Magazines
- type: entity
id: MagazineRifle
name: "magazine (.20 rifle)"
@@ -42,7 +40,7 @@
proto: CartridgeRifle
- type: Sprite
layers:
- state: red
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
@@ -50,12 +48,8 @@
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#9b0000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#9b0000"
- type: entity
id: MagazineRifleEmpty
@@ -85,6 +79,24 @@
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleIncendiary
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#ff6e52"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ff6e52"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ff6e52"
- type: entity
id: MagazineRiflePractice
@@ -95,20 +107,22 @@
proto: CartridgeRiflePractice
- type: Sprite
layers:
- state: practice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#dbdbdb"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#ea5800"
color: "#dbdbdb"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#ea5800"
color: "#dbdbdb"
- type: entity
id: MagazineRifleUranium
@@ -119,10 +133,12 @@
proto: CartridgeRifleUranium
- type: Sprite
layers:
- state: uranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#00cd42"
- type: Item
inhandVisuals:
left: