Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
- Radio
- Sidearm
- MagazinePistol
+ - MagazineMagnum
components:
- Stunbaton
- FlashOnTrigger
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
- map: ["enum.GunVisualLayers.Mag"]
\ No newline at end of file
+ map: ["enum.GunVisualLayers.Mag"]
+ - state: uranium
\ No newline at end of file
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
- map: ["enum.GunVisualLayers.Mag"]
\ No newline at end of file
+ map: ["enum.GunVisualLayers.Mag"]
+ - state: uranium
+
+- type: entity
+ id: MagazineBoxMagnumAP
+ parent: BaseMagazineBoxMagnum
+ name: ammunition box (.45 magnum armor-piercing)
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumAP
+ - type: Sprite
+ layers:
+ - state: base
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
+ - state: piercing
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
-
+ - state: uranium
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+ - state: uranium
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+- type: entity
+ id: MagazineLightRifleUranium
+ name: "magazine (.30 rifle uranium)"
+ parent: BaseMagazineLightRifle
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeLightRifleUranium
+ - type: Sprite
+ layers:
+ - state: uranium
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
+
- type: entity
id: MagazineLightRifleMaxim
name: "pan magazine (.30 rifle)"
parent: BaseMagazineMagnum
components:
- type: BallisticAmmoProvider
- proto: CartridgeMagnum
+ proto: CartridgeMagnumPractice
- type: Sprite
layers:
- state: practice
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+- type: entity
+ id: MagazineMagnumUranium
+ name: pistol magazine (.45 magnum uranium)
+ parent: BaseMagazineMagnum
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumUranium
+ - type: Sprite
+ layers:
+ - state: uranium
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+ id: MagazineMagnumAP
+ name: pistol magazine (.45 magnum armor-piercing)
+ parent: BaseMagazineMagnum
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumAP
+ - type: Sprite
+ layers:
+ - state: piercing
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
+
- type: entity
id: MagazineMagnumSubMachineGun
name: "Vector magazine (.45 magnum)"
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+ id: MagazineMagnumSubMachineGunUranium
+ name: "Vector magazine (.45 magnum uranium)"
+ parent: BaseMagazineMagnumSubMachineGun
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumUranium
+ - type: Sprite
+ layers:
+ - state: uranium
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+ id: MagazineMagnumSubMachineGunPiercing
+ name: "Vector magazine (.45 magnum armor-piercing)"
+ parent: BaseMagazineMagnumSubMachineGun
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumAP
+ - type: Sprite
+ layers:
+ - state: piercing
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+ id: MagazinePistolSubMachineGunUranium
+ name: SMG magazine (.35 auto rubber)
+ parent: BaseMagazinePistolSubMachineGun
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgePistolUranium
+ - type: Sprite
+ layers:
+ - state: uranium
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+ id: MagazineRifleUranium
+ name: "magazine (.20 rifle uranium)"
+ parent: BaseMagazineRifle
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeRifleUranium
+ - type: Sprite
+ layers:
+ - state: uranium
+ map: ["enum.GunVisualLayers.Base"]
+ - state: mag-1
+ map: ["enum.GunVisualLayers.Mag"]
- type: entity
id: BulletLightRifleUranium
- parent: BaseBullet
+ parent: BaseBulletUranium
name: bullet (.20 rifle uranium)
noSpawn: true
components:
- type: entity
id: BulletMagnumUranium
name: bullet (.45 magnum uranium)
- parent: BaseBullet
+ parent: BaseBulletUranium
noSpawn: true
components:
- type: Projectile
- type: entity
id: BulletPistolUranium
- parent: BaseBullet
+ parent: BaseBulletUranium
name: bullet (.35 auto uranium)
noSpawn: true
components:
- type: entity
id: BulletRifleUranium
- parent: BaseBullet
+ parent: BaseBulletUranium
name: bullet (0.20 rifle uranium)
noSpawn: true
components:
layers:
- state: base
map: [ "enum.GunVisualLayers.Base" ]
- - state: base-6
+ - state: piercing-6
map: [ "enum.GunVisualLayers.Mag" ]
- type: MagazineVisuals
- magState: base
+ magState: piercing
+ steps: 7
+ zeroVisible: false
+ - type: Appearance
+
+- type: entity
+ id: SpeedLoaderMagnumUranium
+ name: "speed loader (.45 magnum uranium)"
+ parent: BaseSpeedLoaderMagnum
+ components:
+ - type: BallisticAmmoProvider
+ proto: CartridgeMagnumUranium
+ - type: Sprite
+ sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+ layers:
+ - state: base
+ map: [ "enum.GunVisualLayers.Base" ]
+ - state: uranium-6
+ map: [ "enum.GunVisualLayers.Mag" ]
+ - type: MagazineVisuals
+ magState: uranium
steps: 7
zeroVisible: false
- type: Appearance
parent: BaseBullet
noSpawn: true
components:
+ - type: Sprite
+ sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+ layers:
+ - state: piercing
- type: Projectile
damage:
types:
Piercing: 11 # 20% decrease
ignoreResistances: true
+- type: entity
+ id: BaseBulletUranium
+ name: base bullet uranium
+ parent: BaseBullet
+ noSpawn: true
+ components:
+ - type: Sprite
+ sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+ layers:
+ - state: uranium
+ - type: Projectile
+ damage:
+ types:
+ Radiation: 11
+
# Energy projectiles
- type: entity
name: taser bolt
},
{
"name": "rubber"
+ },
+ {
+ "name": "uranium"
}
]
}
},
{
"name": "rubber"
+ },
+ {
+ "name": "uranium"
+ },
+ {
+ "name": "piercing"
}
]
}
},
{
"name": "rubber"
+ },
+ {
+ "name": "uranium"
}
]
}
},
{
"name": "rubber"
+ },
+ {
+ "name": "uranium"
}
]
}
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
{
"name": "mag-1"
},
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
{
"name": "mag-1"
}
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
+ {
+ "name": "piercing"
+ },
{
"name": "mag-1"
}
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
+ {
+ "name": "piercing"
+ },
{
"name": "mag-1"
},
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
+ {
+ "name": "piercing"
+ },
{
"name": "mag-1"
},
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
{
"name": "mag-1"
},
{
"name": "rubber"
},
+ {
+ "name": "uranium"
+ },
{
"name": "mag-1"
}
},
{
"name": "rubber-6"
+ },
+ {
+ "name": "uranium-1"
+ },
+ {
+ "name": "uranium-2"
+ },
+ {
+ "name": "uranium-3"
+ },
+ {
+ "name": "uranium-4"
+ },
+ {
+ "name": "uranium-5"
+ },
+ {
+ "name": "uranium-6"
+ },
+ {
+ "name": "piercing-1"
+ },
+ {
+ "name": "piercing-2"
+ },
+ {
+ "name": "piercing-3"
+ },
+ {
+ "name": "piercing-4"
+ },
+ {
+ "name": "piercing-5"
+ },
+ {
+ "name": "piercing-6"
}
]
}
]
]
},
+ {
+ "name": "uranium",
+ "delays": [
+ [
+ 0.05,
+ 0.05
+ ]
+ ]
+ },
+ {
+ "name": "piercing",
+ "delays": [
+ [
+ 0.05,
+ 0.05
+ ]
+ ]
+ },
{
"name": "frag"
},
projects / space-station-14.git / commitdiff
