From 47a199eefecb95b731dd80fe25ceed5fa886266b Mon Sep 17 00:00:00 2001 From: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com> Date: Sun, 11 Feb 2024 19:02:52 -0800 Subject: [PATCH] Color Tipped Ammo (#25103) * Tipped .35 ammo * used layers instead of new sprites * remove the useless old sprites * changed the green slightly --- .../Ammunition/Cartridges/caseless_rifle.yml | 10 +++++++ .../Ammunition/Cartridges/light_rifle.yml | 21 ++++++++++++++- .../Guns/Ammunition/Cartridges/magnum.yml | 25 ++++++++++++++++++ .../Guns/Ammunition/Cartridges/pistol.yml | 20 ++++++++++++++ .../Guns/Ammunition/Cartridges/rifle.yml | 23 +++++++++++++++- .../Casings/ammo_casing.rsi/meta.json | 3 +++ .../Casings/ammo_casing.rsi/tip.png | Bin 0 -> 156 bytes 7 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index 4a8e64d9a1..6f0c4df18a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -36,6 +36,11 @@ components: - type: CartridgeAmmo proto: BulletCaselessRiflePractice + - type: Sprite + layers: + - state: base + - state: tip + color: "#dbdbdb" - type: entity id: CartridgeCaselessRifleRubber @@ -44,3 +49,8 @@ components: - type: CartridgeAmmo proto: BulletCaselessRifleRubber + - type: Sprite + layers: + - state: base + - state: tip + color: "#43c4f7" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 729b1e6fc0..b3da905f0d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -33,6 +33,11 @@ components: - type: CartridgeAmmo proto: BulletLightRiflePractice + - type: Sprite + layers: + - state: base + - state: tip + color: "#dbdbdb" - type: entity id: CartridgeLightRifleRubber @@ -41,6 +46,11 @@ components: - type: CartridgeAmmo proto: BulletLightRifleRubber + - type: Sprite + layers: + - state: base + - state: tip + color: "#43c4f7" - type: entity id: CartridgeLightRifleIncendiary @@ -49,6 +59,11 @@ components: - type: CartridgeAmmo proto: BulletLightRifleIncendiary + - type: Sprite + layers: + - state: base + - state: tip + color: "#ff6e52" - type: entity id: CartridgeLightRifleUranium @@ -57,4 +72,8 @@ components: - type: CartridgeAmmo proto: BulletLightRifleUranium - + - type: Sprite + layers: + - state: base + - state: tip + color: "#65fe08" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 950b9c7563..13f9aef2d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -33,6 +33,11 @@ components: - type: CartridgeAmmo proto: BulletMagnumPractice + - type: Sprite + layers: + - state: base + - state: tip + color: "#dbdbdb" - type: entity id: CartridgeMagnumRubber @@ -41,6 +46,11 @@ components: - type: CartridgeAmmo proto: BulletMagnumRubber + - type: Sprite + layers: + - state: base + - state: tip + color: "#43c4f7" - type: entity id: CartridgeMagnumIncendiary @@ -49,6 +59,11 @@ components: - type: CartridgeAmmo proto: BulletMagnumIncendiary + - type: Sprite + layers: + - state: base + - state: tip + color: "#ff6e52" - type: entity id: CartridgeMagnumAP @@ -57,6 +72,11 @@ components: - type: CartridgeAmmo proto: BulletMagnumAP + - type: Sprite + layers: + - state: base + - state: tip + color: "#0a0a0a" - type: entity id: CartridgeMagnumUranium @@ -65,3 +85,8 @@ components: - type: CartridgeAmmo proto: BulletMagnumUranium + - type: Sprite + layers: + - state: base + - state: tip + color: "#65fe08" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 50ca07cebc..47bf6b8933 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -33,6 +33,11 @@ components: - type: CartridgeAmmo proto: BulletPistolPractice + - type: Sprite + layers: + - state: base + - state: tip + color: "#dbdbdb" - type: entity id: CartridgePistolRubber @@ -41,6 +46,11 @@ components: - type: CartridgeAmmo proto: BulletPistolRubber + - type: Sprite + layers: + - state: base + - state: tip + color: "#43c4f7" - type: entity id: CartridgePistolIncendiary @@ -49,6 +59,11 @@ components: - type: CartridgeAmmo proto: BulletPistolIncendiary + - type: Sprite + layers: + - state: base + - state: tip + color: "#ff6e52" - type: entity id: CartridgePistolUranium @@ -57,3 +72,8 @@ components: - type: CartridgeAmmo proto: BulletPistolUranium + - type: Sprite + layers: + - state: base + - state: tip + color: "#65fe08" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 98443d890d..76abd1bd81 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -33,6 +33,12 @@ components: - type: CartridgeAmmo proto: BulletRiflePractice + - type: Sprite + layers: + - state: base + - state: tip + color: "#dbdbdb" + - type: entity id: CartridgeRifleRubber @@ -41,6 +47,11 @@ components: - type: CartridgeAmmo proto: BulletRifleRubber + - type: Sprite + layers: + - state: base + - state: tip + color: "#43c4f7" - type: entity id: CartridgeRifleIncendiary @@ -49,6 +60,11 @@ components: - type: CartridgeAmmo proto: BulletRifleIncendiary + - type: Sprite + layers: + - state: base + - state: tip + color: "#ff6e52" - type: entity id: CartridgeRifleUranium @@ -56,4 +72,9 @@ parent: BaseCartridgeRifle components: - type: CartridgeAmmo - proto: BulletRifleUranium \ No newline at end of file + proto: BulletRifleUranium + - type: Sprite + layers: + - state: base + - state: tip + color: "#65fe08" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json index 023731bcb3..eb50004240 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "base" }, + { + "name": "tip" + }, { "name": "base-spent" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png new file mode 100644 index 0000000000000000000000000000000000000000..78ff6a8dc1894728c98a5eaeb21c3c82cc07e9a9 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prNOWV@QPi+v5j085DR}4kp~xw9?h+;_c8+ xWt;YxiQ$J++P9ng+;82}4&BPcASYtTu