From e8218dc71b163673269dfc8067d0572f71b538aa Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 16 Feb 2024 20:22:00 +0100 Subject: [PATCH 01/17] Fix weird firerates The .45 magnum firerate is around 2 to 3 so it was extremely funny how the .38 would be slower than a .45 and even the snubbed version. --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- .../Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 23824c6812f..6f4d5b52301 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -81,7 +81,7 @@ - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi - type: Gun - fireRate: 4 + fireRate: 3.5 availableModes: - SemiAuto soundGunshot: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index da93ff5a5e1..0f87187210d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -34,7 +34,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 2.5 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -59,7 +59,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 2 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -84,7 +84,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 2.5 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -111,7 +111,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1 + fireRate: 1.75 availableModes: - SemiAuto - type: RevolverAmmoProvider From 180d31cac84eb0f525e0c6b05405f12f9ee9432b Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 16 Feb 2024 20:28:32 +0100 Subject: [PATCH 02/17] change ejection port placement on psibreaker --- .../Guns/Pistols/psibreaker.rsi/base.png | Bin 559 -> 558 bytes .../Guns/Pistols/psibreaker.rsi/bolt-open.png | Bin 560 -> 562 bytes .../Guns/Pistols/psibreaker.rsi/icon.png | Bin 566 -> 564 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png index 544812914b5313a74c6b2801e7f0163dcaa10011..4a6b468f32fb0225d38b474c0572f34ffb5308fa 100644 GIT binary patch delta 394 zcmV;50d@Yb1g->-R17F6CL0?WQBhAVEGv;<6@Q?hpxf2WVq#w%8yYh*FLGs8l!kR| zUr^@Y*n@+En3$M?f`Fx$hVJO#l7)6?TTE$bXCEIP8X6fbEi3i(@-Q$i-Pg|`ARbah zHYg`0nv8qb(aAeHH>8+}!L_C&Bq7nu!}#**Tu(sBy{>wCc_bqsZEbCJXj!$XniCTe zff#gUCnhE6;@a)!-)31#ucMUz|No=1Yvq#+0Zo6vNkl(qRkn;mxjN&Fn}d3F6~(R^J8n?PN_UU8j8JjmCmAy~+YG-)opf)y(rMX+s!twH on{bck<8a-!&BOm!xAGET0D5oO(fnHA#{d8T07*qoM6N<$f|xM0`v3p{ delta 395 zcmV;60d)SZ1g`{;R16y%87L?wEi5ZhQBRRz6@MKY8la${+ttltVqY^dFOr3JEiEg9 zgM)&CfNWn-n3$NQmxh#vb>`sMXj@F~=-_E-XL4m$8X6fNA0ElQu4Y+E_4M-H*Uy1; zWh5gYnv8qb(aCyxd39)6ucMUF%fk~B61AzCARrzvFfLqAKs!1&=;GSJwWcH_A#H7K z_!#o)q?m~)CnfFY-%>?3CnhET|NmG;?ADVE0Zo6wNklBxb8mnrYrzh2!K+I8KYpWivrkgldGyq zYc<=ZY7-R%;<^ea3}bAeybHrcLCGNk^oAg>ARO!Ugmac~EI3WQ(j&FuK#xO>EVB#+ z(2-Y+Y3hr(rHM1?NOLgvkzu6bVk8Z!eRiT%ssRKKd6K@aU%L12QMday$7odS!gMC{ puuACphjD9LwawZ8S6A{9U;wYM*v>Cx?)(4%002ovPDHLkV1ffrx3K^K diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png index 013665c7e062f4550845f42480a09155532cf94c..20ee4218b09c13e0bf1f2d084d6c28454765438e 100644 GIT binary patch delta 418 zcmV;T0bTyE1hNE>QGX~XCPzm`8yguC5fU028JL)uQBhA97ZxonD`H|_TU%FYX=mi# z)>KD0y|JPl8yefy&2VE>a%EPMg?241D{Nm-A0Hm(;MjtIfbQtvrI&`3hIN91fM{Dx zfpleNSxO)v9xyO2nv8q3shVwVZFOi_`10x`Bq8YH+Io6u?dRYB|Nn7`mok$K0Zo6z zNkl3`H}8lqrBTm16I`cm4n0a=?Wsh(F+6<>cH&@)EfJ0RF<8a6P|z zoveUR84w~R0TFfkQ$SOyFyDU)lq#SIQi4RO#v~QvG7y3}$Dj&Qf+mn+AVC8;=3~fF zz0Mg^Im0pi$uYC0(VXc)WJoJn1`k?Qb8@itOAs2#Ox4_=>~YOBow%{gO|mhxYCXq5 z$UEdm?dtk=e)=ADV{^02O2I8`YrTt#gqFMShKr(e5B^_W$U}eu05Fc$R(2?JLI3~& M07*qoM6N<$f_|dEZvX%Q delta 416 zcmV;R0bl;I1h52t|) zUvOho+ttm2fPftv8fj@~y|JR^;MkIdb}cO{?&#p9mxgj>R+NTyA0HlUUr=aUOoD=d zGcqqICnX>t9xyO2Tu(sJ%fqCYiDp?!ucMU7y{^~M$$ENu-8|RNBqSl|;@bG~>Leo| zfpldP6B2c3S(=P{QbjiH=il}8^1-#HCnhDJprAWCH*IZgwW*r_|No)fR;ZH<0Zo6x zNkls4YZhqAepAhB!v*-0;R+wpu{8uHAdpV6BT4mYROrn z;W4IojBu`#=GQZg)l@G>hP0MtC}CJt(81Ds<%;p#sVWR*&5OPt^1)JAvc9m3x6nW= zoy4gFUGI-}zf;!_d)u#N+`_WQ!zfD_1jlWqn|1C@{;M;22rvL5^VU|xd`pr50000< KMNUMnLSTY+-@c*% diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png index 61b92bc3172d071eed5749af4576225a50b6ed03..e87b6328ac223845e826b8b74a054500431d4483 100644 GIT binary patch delta 416 zcmV;R0bl;M1hfQ@RDUQaCL0?WQBhAVEGt`ER~Hu+Cnfdt^7!)VwW*qIZEexZ!)94ZCnhC3IyZG_StKJMdU|>P|No6*GS8C_0ZxCy zNklg$ubcH7nB67>paCAgc2YmzXX;AJ_i?o4;c6*q31X; zrCdy5!RhH&9w}}{EK5W@NK;@St7ceCjh!=7EY8@f%|V;ksu~oHM{Q8iL9vg4h>&ru zPcmezKixJ*9qs3e+HKi|rmUAqn{WwdLvzu#&3h;3|En8$3ormdN!zwi#oS*20000< KMNUMnLSTaX^14+3 delta 418 zcmV;T0bTyI1hxc_RDT;A87L?wEi5ZhQBM~a7F%0af`EWjM>sb(Hss#cy|JQjV^kd* z8la${+ttltVqfOq*fTOOgM)*Tg?4OTQ10m9f`Wjhmxh>_m}zNea%EPOhIJnw9%x%k zEiEe=8W~bWHY6k=C?_SFjCkY4D$_j> Date: Fri, 16 Feb 2024 21:33:58 +0100 Subject: [PATCH 03/17] Rubber nerf + new ammo + fix recipe costs Everyone gets incendiary and uranium bullets so why not. --- .../Weapons/Guns/Ammunition/Boxes/special.yml | 30 +++++++++++++ .../Guns/Ammunition/Cartridges/special.yml | 16 +++++++ .../Guns/Ammunition/Projectiles/special.yml | 26 ++++++++++- .../DeltaV/Recipes/Lathes/security.yml | 42 ++++++++++++++++-- .../Entities/Structures/Machines/lathe.yml | 12 ++++- Resources/Prototypes/Research/arsenal.yml | 10 +++-- .../Boxes/special.rsi/incendiary.png | Bin 0 -> 193 bytes .../Ammunition/Boxes/special.rsi/meta.json | 6 +++ .../Ammunition/Boxes/special.rsi/uranium.png | Bin 0 -> 189 bytes .../Pistol/pistol_special_mag.rsi/meta.json | 3 ++ .../Pistol/pistol_special_mag.rsi/uranium.png | Bin 0 -> 242 bytes 11 files changed, 136 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml index 6f643fc0991..be21a1a1081 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml @@ -67,3 +67,33 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialIncendiary + name: ammunition box (.38 special incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: incendiary + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialUranium + name: ammunition box (.38 special uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialUranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: uranium diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml index 2e60b8b7a55..931ed98c546 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml @@ -44,6 +44,22 @@ - type: CartridgeAmmo proto: BulletSpecialRubber +- type: entity + id: CartridgeSpecialIncendiary + name: cartridge (.38 special incendiary) + parent: BaseCartridgeSpecial + components: + - type: CartridgeAmmo + proto: BulletSpecialIncendiary + +- type: entity + id: CartridgeSpecialUranium + name: cartridge (.38 special uranium) + parent: BaseCartridgeSpecial + components: + - type: CartridgeAmmo + proto: BulletSpecialUranium + - type: entity id: CartridgeSpecialHoly name: cartridge (.38 special holy) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 76d285668e6..538710083d4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -31,7 +31,31 @@ types: Blunt: 3 - type: StaminaDamageOnCollide - damage: 35 # 3 hits to stun cuz revolver + damage: 30 + +- type: entity + id: BulletSpecialIncendiary + name: bullet (.38 special incendiary) + parent: BaseBulletIncendiary + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + Heat: 27 + +- type: entity + id: BulletSpecialUranium + name: bullet (.38 special uranium) + parent: BulletUranium + noSpawn: true + components: + - type: Projectile + damage: + types: + Radiation: 12 + Piercing: 18 - type: entity id: BulletSpecialHoly diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 4bae83432bd..1667a0d8402 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -31,13 +31,30 @@ Plastic: 5 Steel: 5 +- type: latheRecipe + id: CartridgeSpecialIncendiary + result: CartridgeSpecialIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: CartridgeSpecialUranium + result: CartridgeSpecialUranium + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Uranium: 10 + - type: latheRecipe id: CartridgeSpecialHoly result: CartridgeSpecialHoly category: Ammo completetime: 2 materials: - Plastic: 5 + Plastic: 15 Steel: 5 Silver: 5 @@ -47,7 +64,7 @@ category: Ammo completetime: 2 materials: - Plastic: 5 + Plastic: 15 Steel: 5 Bluespace: 5 @@ -57,7 +74,24 @@ category: Ammo completetime: 5 materials: - Steel: 1000 + Steel: 1250 + +- type: latheRecipe + id: MagazineBoxSpecialIncendiary + result: MagazineBoxSpecialIncendiary + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + +- type: latheRecipe + id: MagazineBoxSpecialUranium + result: MagazineBoxSpecialUranium + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + Uranium: 125 - type: latheRecipe id: MagazineBoxSpecialPractice @@ -65,7 +99,7 @@ category: Ammo completetime: 5 materials: - Plastic: 950 + Plastic: 1200 - type: latheRecipe id: MagazineBoxSpecialRubber diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 30cad0ea0a9..bfbe8280db6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -166,6 +166,7 @@ - CartridgeLightRifle - CartridgeRifle - MagazineBoxPistol + - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle @@ -178,24 +179,29 @@ - CartridgeRifleRubber - CartridgeLightRifleRubber - MagazineBoxPistolRubber + - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber - ShellShotgunIncendiary - CartridgePistolIncendiary + - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgeMagnumIncendiary - CartridgeLightRifleIncendiary - CartridgeRifleIncendiary - MagazineBoxPistolIncendiary + - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary - ShellShotgunUranium - CartridgePistolUranium + - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgeMagnumUranium - CartridgeLightRifleUranium - CartridgeRifleUranium - MagazineBoxPistolUranium + - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium @@ -685,7 +691,6 @@ - MagazineLightRifle - MagazineBoxPistol - MagazineBoxSpecial # DeltaV - .38 Special revolver - - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle @@ -698,6 +703,7 @@ - TargetClown - MagazineBoxLightRiflePractice - MagazineBoxMagnumPractice + - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver - MagazineBoxPistolPractice - MagazineBoxRiflePractice - ShellShotgunPractice @@ -709,10 +715,12 @@ - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - CartridgeLightRifleIncendiary - CartridgeMagnumIncendiary + - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgePistolIncendiary - CartridgeRifleIncendiary - CartridgeLightRifleUranium - CartridgeMagnumUranium + - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgePistolUranium - CartridgeRifleUranium - CartridgeLightRifleRubber @@ -725,10 +733,12 @@ - HoloprojectorSecurity - MagazineBoxLightRifleIncendiary - MagazineBoxMagnumIncendiary + - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxPistolIncendiary - MagazineBoxRifleIncendiary - MagazineBoxLightRifleUranium - MagazineBoxMagnumUranium + - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxPistolUranium - MagazineBoxRifleUranium - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 8cbca4f7e10..51c5175134d 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -26,10 +26,12 @@ recipeUnlocks: - ShellShotgunIncendiary - CartridgePistolIncendiary + - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgeMagnumIncendiary - CartridgeLightRifleIncendiary - CartridgeRifleIncendiary - MagazineBoxPistolIncendiary + - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary @@ -99,10 +101,12 @@ recipeUnlocks: - ShellShotgunUranium - CartridgePistolUranium + - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgeMagnumUranium - CartridgeLightRifleUranium - CartridgeRifleUranium - MagazineBoxPistolUranium + - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium @@ -152,7 +156,7 @@ - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament - icon: + icon: sprite: Structures/Power/cage_recharger.rsi state: full discipline: Arsenal @@ -195,11 +199,11 @@ cost: 15000 recipeUnlocks: - WeaponLaserSvalinn - + - type: technology id: AdvancedShuttleWeapon name: research-technology-advanced-shuttle-weapon - icon: + icon: sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png new file mode 100644 index 0000000000000000000000000000000000000000..63e1affa46c5dce339e44b819882b29936372099 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X_yc@GT=$QKpMqAC%#K>Oe$Ha0dlroNOV%}i=c jTr=D*AAS(RAdtY|c!Ga*)82A#pb-q7u6{1-oD!MRC~n&Ec& f@PiNrfdmG_cJ70(YJa5wjbQL}^>bP0l+XkKnUgtb literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json index 5624759d9b7..d3bfc00981c 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json @@ -25,6 +25,9 @@ { "name": "rubber" }, + { + "name": "uranium" + }, { "name": "mag-1" }, diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..69374a121582b5e62b326efd1d1278d6ffe83cbf GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XF!Z!T>VJ)pqj>?r7*^etY(T;!mOl)|5D z-$Nv0TjHD4A1z?WpVDA`NFYJ3Mc-h;d(Ih5HHpRXjhY9<%f7SDU`kqeFZ{}@?}y&( dsm Date: Fri, 16 Feb 2024 22:28:25 +0100 Subject: [PATCH 04/17] Make lucky available in salvage Alongside the other revolvers --- Resources/Prototypes/Catalog/Fills/Crates/salvage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 1a544a81945..55fed9eef69 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -74,6 +74,8 @@ prob: 0.001 - id: WeaponRevolverInspector prob: 0.001 + - id: WeaponRevolverLucky # DeltaV - .38 special revolver + prob: 0.001 - id: ClothingShoesBootsMagBlinding prob: 0.001 # - Skub From 6c296d8b4015966b165e79cdcd4db208afc67332 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 17 Feb 2024 00:22:19 +0100 Subject: [PATCH 05/17] Update look of speedloader So it matches the other revolver speedloader. Slightly smaller just because. --- .../special_speed_loader.rsi/base-1.png | Bin 220 -> 192 bytes .../special_speed_loader.rsi/base-2.png | Bin 230 -> 235 bytes .../special_speed_loader.rsi/base-3.png | Bin 252 -> 245 bytes .../special_speed_loader.rsi/base-4.png | Bin 264 -> 247 bytes .../special_speed_loader.rsi/base-5.png | Bin 261 -> 257 bytes .../special_speed_loader.rsi/base-6.png | Bin 261 -> 253 bytes .../Special/special_speed_loader.rsi/base.png | Bin 228 -> 252 bytes .../high-velocity-1.png | Bin 220 -> 0 bytes .../high-velocity-2.png | Bin 230 -> 0 bytes .../high-velocity-3.png | Bin 253 -> 0 bytes .../high-velocity-4.png | Bin 264 -> 0 bytes .../high-velocity-5.png | Bin 261 -> 0 bytes .../high-velocity-6.png | Bin 261 -> 0 bytes .../special_speed_loader.rsi/holy-1.png | Bin 0 -> 190 bytes .../special_speed_loader.rsi/holy-2.png | Bin 0 -> 232 bytes .../special_speed_loader.rsi/holy-3.png | Bin 0 -> 241 bytes .../special_speed_loader.rsi/holy-4.png | Bin 0 -> 243 bytes .../special_speed_loader.rsi/holy-5.png | Bin 0 -> 255 bytes .../special_speed_loader.rsi/holy-6.png | Bin 0 -> 249 bytes .../Special/special_speed_loader.rsi/icon.png | Bin 0 -> 308 bytes .../special_speed_loader.rsi/meta.json | 77 +++++++++++++----- .../mindbreaker-1.png | Bin 0 -> 190 bytes .../mindbreaker-2.png | Bin 0 -> 232 bytes .../mindbreaker-3.png | Bin 0 -> 241 bytes .../mindbreaker-4.png | Bin 0 -> 243 bytes .../mindbreaker-5.png | Bin 0 -> 255 bytes .../mindbreaker-6.png | Bin 0 -> 249 bytes .../special_speed_loader.rsi/practice-1.png | Bin 220 -> 190 bytes .../special_speed_loader.rsi/practice-2.png | Bin 230 -> 232 bytes .../special_speed_loader.rsi/practice-3.png | Bin 253 -> 241 bytes .../special_speed_loader.rsi/practice-4.png | Bin 264 -> 243 bytes .../special_speed_loader.rsi/practice-5.png | Bin 261 -> 255 bytes .../special_speed_loader.rsi/practice-6.png | Bin 261 -> 249 bytes .../special_speed_loader.rsi/rubber-1.png | Bin 220 -> 190 bytes .../special_speed_loader.rsi/rubber-2.png | Bin 230 -> 232 bytes .../special_speed_loader.rsi/rubber-3.png | Bin 252 -> 241 bytes .../special_speed_loader.rsi/rubber-4.png | Bin 264 -> 243 bytes .../special_speed_loader.rsi/rubber-5.png | Bin 261 -> 255 bytes .../special_speed_loader.rsi/rubber-6.png | Bin 261 -> 249 bytes .../special_speed_loader.rsi/uranium-1.png | Bin 0 -> 190 bytes .../special_speed_loader.rsi/uranium-2.png | Bin 0 -> 232 bytes .../special_speed_loader.rsi/uranium-3.png | Bin 0 -> 241 bytes .../special_speed_loader.rsi/uranium-4.png | Bin 0 -> 243 bytes .../special_speed_loader.rsi/uranium-5.png | Bin 0 -> 255 bytes .../special_speed_loader.rsi/uranium-6.png | Bin 0 -> 249 bytes 45 files changed, 58 insertions(+), 19 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png index 67c3ddd4b8fa10326167ac8f851c8bd4f30866cd..f10ef5c0f6314ba6ae213777466bd0b5f1e15f33 100644 GIT binary patch delta 121 zcmcb^cz|(&U(vRHzU%iBvK{nh#yO^Vvlm(D{{R0!Os9V*0|NtlNswPKkP8G1Qr^sN zKp{O(7srr_TS*DZ3=(dl7kn7GnVFe|h4WZ>dK?a%In#2VC2ZNn2{NG$%B&2GYz!;3 W#8*^5t>pyjWbkzLb6Mw<&;$S~oGR1+ delta 150 zcmX@Wc!zO;WMX6c!zB?hQ}Tl*!zts#XAdlDn8>QqAI+%DEiCLL7tH7} zZ=&FQWyeoF6?;3C`mc)jD68&r7oD(})Uq3dDB8l<7{ z|NnoH8jGh43=F&_L4LtNE*vn}zEEldN;rDDIEGZ*N_wEkAmJu@!H1EZnVDHzJCBve z$Kk-SV_o-I{KDMa?&KvTvN4sFx!vh|lBArN_%KbTcTFH`1cO5ZBZIx7-qqhzzHI=S O#^CAd=d#Wzp$P!^yh82( delta 165 zcmaFO_>6IaXT4~EPl#)ThEjnM!>VM49v{6s3#3n`IsX6u|KH4`b_@&*>?J{d!9Xq$ zFi3eby8(qlJY5_^DsDZQWX*R#f#>L-A9w$s;FT3{uDI(R79A$i`qA)D1cUwsZ9k5< zaAm^;5GaeB53rbnMARhRx0vM&9SzQr>U)cvw!g^!VXB>NZR~3tV+F z|Ns9l&kc+i7#Mg(7*oSG2yaRP3Wng4u Y_zopr01xLyod5s; delta 187 zcmey$_=j!Kx`K?*dv*ygQ&DC#rl?RonP^r!zO#9G9M%Wk=qfsh{!P bK|F!MNKbc(;dTF5pverLu6{1-oD!MCOV_0wac#X^tNkyZpG3uqv71|NsB~6Z#t%7#KK9 zg8YJkTrgk=_OB2E3g&sbIEGZ*dNawJ>wp1=i@UGY-v6De11>oTamS_xZhx=%nEknT zVld+*ZVgwXgOl?y-Ss7>tgQu&X%Q~loCIH<0O`QM$ delta 196 zcmZoSuY*n6XF`7p;TbR@Z(0p$Hgvp7D%5=b6l0o(Bq@`|Ns9xt?cy-3=Etl zL4LtNE*LNb`&S471+zU}978H@y_w|A*Py_|8vpZ4<$vMmo+i$1YU?6Sl&Pg;9Q;UvoOw?1iq^?@Oz~zfve3b{3=9lBB|(0{KrRe02;Dz-4k#Y(>EaktaqG<_L%s$B9%k9;Q$+s#kJr+gQ7|K6 z)$`5%T}^*gXB<*inEa=WKsy*bUHx3vIVCg!0I6kCPyhe` delta 196 zcmey%*vd4)vtByDC&abKM{iX!LxhIXj~fYh7DyKuF??L?ax%^F|NsBb6wYm9U|`@Z z3GxdDa>0Nh*uO#uD46Z(;uunK>&+xbt^*1@EZ47Q{Qv*xSVM@xvI~>jtL7$NaEZ}p zZ|8E*SrF#d^vTRrOfhxK&c@c~NxZ+Do?m0wsVS0e+pzfI9Y^WTy&EfA%_dDbxYx3y wD3@jOo0vnfCk~sRp7h!NjDC$^9wQqA<8wLLa~$hpf%Yi_@$6SdoPfTHXrL4LtNE)XzC zc{96#6neTihE&{ob19IoL4k+)!l9^l^(pLGM_#BLjGy-5>hT8FDUOMak_*BN1vVuF zuzb7ojw$@Jl9O9<72~O-(`P?l;g&gTyZ*rU$(_t53H|}E7@rI7`%>!}{Kcng`Yq>& m3uY~N=Dzpe6aEdH1`Idq#P*(=n6&|DErX}4pUXO@geCygUr=uV delta 163 zcmV;U09^n40ptOYNq-MeOjJc5A18&0lvY+|G&nu~|NrY{PT>Fm00neXPE-H?|Nj8{ zwhmJO003G^L_t(|+U(Ln3cw%?MA69~?|}1B`7mUv~6T!WBbD;5iwKpgC@f%?9Y==rM1i;CyArPdycTJC*vciuWk1?s6BMu#Q3D07GxExKqI4BO8FGGI+ZB KxvX}PnPkm(K!NAzpC5PspWu}haIU!P9TpuX()!WxPXvSh z1#Lf$xNv2`D^2U!IQ3JrCw$yqD0J+}MTX7J7DnFZ+EU(c_;^^g^!VXB>NZR~3f%0Gy1heiT0R#o?GbHi4oeoZwP?SWduBg}-!?P(XAM%x sCsmr2@46lrKYi#Q`)BU>mf!|P25%*?{SDtWLEd8UboFyt=akR{068vP!TTMEQ;q{#1nNz{6&rzxO6n9*#+*#ZsIp?zjx0Rn@ z%vN5bo6ZG6lYEVumTce9uHTpX+y0Dxji4SQ8$-kcIS=tzkI6ur89ZJ6T-G@yGywpy C)m}LO diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png deleted file mode 100644 index 1138054fd00f1d9a6663c92226f0e321e493a440..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xqyv0HT)7Px3XB+9=J@@%k#J{$bV#wms$>Qof6o8^|Es@G zNdqe5ED7=p26DlGA=tk{2q>8C>EaktaqG<_Z@vZv9@hAuUn>6#NB1;wZc|$qaiUBu zCF9_?q75q?jxhy0sYtAE(a%UzW%R!=r@QbQ-|ZIkA;bQ+-`OBmRfd8zvrx_CC3_QcedJ0Ig;4boFyt=akR{0NyTT AyZ`_I diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 89bfca7f6dda3c33e5687bcf332968ee11939b64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xqyv0HTy^|8S0yuW8!-I1k#J{$bb%2=%N)OuVuSzx|63ce zJ^?D@ED7=p26DlGA=tk{2q>8C>EaktaqG<_N3H`3JS^9*X8iyE=vYID!LkdJ+pFd# zUT}%gXK&|n&{+`X*7V8DR7^2-%g)Bu=SjT3oSt7}*r_R!-LUxK9Y^WTy&EfA%_dDb zxYx3yD3@jOo0vnfCk~sRp7h!NjDC$^9wQqA<8wLLa~$hpfz~p3y85}Sb4q9e0G={q AkpKVy diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png new file mode 100644 index 0000000000000000000000000000000000000000..017ec47b45ea0c51e3d46c445824b2ea72e6b57f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XL<4+6T(|Y}UB933^@Q)~I<6FN_CIe{|NsAA=#uYFpaS-i zAirQB7YG=nyqVpALOPxSOS9^>bP0l+XkKoLfC* literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png new file mode 100644 index 0000000000000000000000000000000000000000..2853d0985803f22d20632c6c5a2eed331fca62b7 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}UB90&d!g&<9<%0juCFJ2`y$v+*KwtIvwN7a zZdh9W=gsQ>|NqA+i&O)(@RkJm1p~Qoz+n4AsSPM$=jq}YQgJKkfg*#1o9G1}Ms{Xq zW^3&{R-PV*1Ee%iL Q2Aag+>FVdQ&MBb@0Eih=^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png new file mode 100644 index 0000000000000000000000000000000000000000..330ab025bae5f6855259640fded7c9abd1037e10 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T$|ImW-oMI-D9?`pD)Fm{p$(e>-Q7-BG^yYacx*y z?qSCI=gsQ>|NralWa$KI;VlXB3kGuGfWh{KQX5dh-P6S}q~cc614RZ2H_;0|jNHb? z#_Za8tY>l@4xBpcb%Lc#?M_}o0t=IxpW2;%p6uhWh6JFI44$rjF6*2UngGPVS5g1~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee02ef31ea0a95b7f907d9e882640eed0b73542 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}UB90&d!g&<9<%0juCFJ2Q@q(v*Kzelu>X0p zdc)Fk4>Q*P|Nk2;%WDT};VlXB3kGuGfWh{KQX5dh)6>NX0p zdc)Fk4>Q*P|NpOETz?0sg|{TgFBr&$0|wg{N^L-iP)`@fkcwML4-^?B+(a+mdKI;Vst0AQzG^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png new file mode 100644 index 0000000000000000000000000000000000000000..47caeb743b61acfa603439e1b5b83a8e810c2eef GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR04cLT)&?1-PX_7oX$0Sq3h}%v(t54*Y78!c(eCKu>X0p zdc)H4|NsB*?KPPVRL@fq-Oi@i28J9inY!QV4FF*-kd5|R$3GC8vPoN;Kl&!wiOR@3J)qfvdq jfwUeqiC@|b90m*yD>S_)-R7zV8qeVA>gTe~DWM4fDf?Qd literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0ee451aa5c2ec59c272ccca76d04325bdb84e16e GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X3<7*YT>hBl{j&0gp_GtSXhPx1QwgcNV~ zJQw{U3*D@&tRM{qRaMph|NnO;YDNI{3X}x-1p~RrfZ>61tRzsb&eO#)q~g|_NsfFC z3Op>k16&*8sT pUdW&7cvDgN>c4*-Lm49*!^#k|i9eFIPX)S!!PC{xWt~$(69944cwhhk literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json index dbecaae60b9..7fd72075d6c 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json @@ -5,11 +5,14 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi and edited by Floofers", "states": [ { "name": "base" }, + { + "name": "icon" + }, { "name": "base-1" }, @@ -28,24 +31,6 @@ { "name": "base-6" }, - { - "name": "high-velocity-1" - }, - { - "name": "high-velocity-2" - }, - { - "name": "high-velocity-3" - }, - { - "name": "high-velocity-4" - }, - { - "name": "high-velocity-5" - }, - { - "name": "high-velocity-6" - }, { "name": "practice-1" }, @@ -81,6 +66,60 @@ }, { "name": "rubber-6" + }, + { + "name": "uranium-1" + }, + { + "name": "uranium-2" + }, + { + "name": "uranium-3" + }, + { + "name": "uranium-4" + }, + { + "name": "uranium-5" + }, + { + "name": "uranium-6" + }, + { + "name": "mindbreaker-1" + }, + { + "name": "mindbreaker-2" + }, + { + "name": "mindbreaker-3" + }, + { + "name": "mindbreaker-4" + }, + { + "name": "mindbreaker-5" + }, + { + "name": "mindbreaker-6" + }, + { + "name": "holy-1" + }, + { + "name": "holy-2" + }, + { + "name": "holy-3" + }, + { + "name": "holy-4" + }, + { + "name": "holy-5" + }, + { + "name": "holy-6" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7a71e8faff23aba54c0a8eac62753eab66297c15 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XL<4+6T(|Y}1#-n)zn@^rZk^)IUMtZ1|Nnni^Qc!q1?(k3 ze!)O45HLu2GrIwWbUa-gLn>}1B`7mUxQSlyVdQ3JW;RyNW99L2IB?>W$3D)*j<%~B elvo)U*%(&L6kl=f=&^F3J_b)$KbLh*2~7YZQ#zsm literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png new file mode 100644 index 0000000000000000000000000000000000000000..cef078e363d1c82994b40f0c3cda46b355dbbd9b GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}1#-nSr*mDupD=r&t0lWbiZ{C{yR|B-W;l0} zhZ$?FK=1$m{})!CTLRR=TN30K4CKNAgY65YHlT!^r;B4q#jT_ViVPBNq8EG^rJ0$T zt(EgwdCoW-IC0kF1Pfo-oxFr3My4>ouseNEl9G}Rr60;j=}ll|U}R&k%h9{a5d3#B P&?E*=S3j3^P6EaktaqG>boxBVRJj`<)ete%V zF2=E}k?XqpZza}d7Wo})Dh!b|42iC@Hnb(}Yd$8r`k8lG=v~tu7Y4I~D*osH@PC$@ b!NkL0>Y}?uT)3AJXefiHtDnm{r-UW|*E&=t literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png new file mode 100644 index 0000000000000000000000000000000000000000..ad1a0a990c84ead813268aa1d875eeac2886cc44 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}1#-nSr*q9-=z9Hrf+f3yDZ6!wH@hmUX01SP zICqkV8SDT5|C5wO9DrJQOM?7@fm}FXuzjJ_29yZ(ba4!+xRvxkkwL;u^nwqgH8V4_ zv~nIRkB-BE6DK`Ru<(W5$xBFLV+zv?yVLh1Eh*_xCesn7J6s8VM{-$@u+;RiSPSkq nZ}dAN9K7BG0a`njxgN@xNAmgiON literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png new file mode 100644 index 0000000000000000000000000000000000000000..c872c84ba5dc0e4d28626558045a4dfde4966db8 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR04cLTm!jcw)OKhr*q9-=xWMtZOQI%{eD7uPUo% zICs+j|NkSNJhlg_=P3#D3kGswfI;Z~xpP4AU{4pvkcwML57ZbW+(a+X|5G`;O?Fa81=&*16m=d#Wzp$P!aBURS` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png index 7cea456b83a8b4efe02a66ddf9d85a0640f33db1..ba96ef9b7dfaa79e18011ed8136749a5c5d42e1c 100644 GIT binary patch delta 119 zcmcb^xQ}syU%|G1zU%iBUPUmZc(d;}VEEt4{r~@ex7TSs3=9nHB|(0{KrRq4NO?26 z0flrtT^vIyZY3osGf23JUhrWwW@cvQ7S3bk>2Wx4FVdQ&MBb@06Hft9{>OV delta 150 zcmdnTc!zOs$_-|P1QRKqz}5-{r~@eWz+^^1_lQ9k|4ieAQuQ2q`aBk zfI?oLE{-7;w~`W+86?^^GO@A!;gX1$DfvN@;gs>=vj-M6Ok`E*k7iWn78Z7r3ug3~ zH&JlDvg4n$x*vFLb?rKOx1Ny;X@}zX5}X8SAE4j{mLP z|NsBrRQDm3fq{XyB*-rq$b|z2+ZRf0KnXif7srr_TS*TT86@09FZeJ@Gcz-@3+J)& ztZ_JS6IaXT4~EPl#)@j!JVM45>3@R3#1Ra*!}pmfXT5rWPl#)CI@e-bhS>{UxApU-c(b=EFC z|Ns9FnAT>^z`(#;666;QI&OPJf8yo3ZMCO1E~JAF@*5)w2Iq%-kzGqSd|T~{#y~R}JYD@<);T3K0RT{XL_q)m delta 188 zcmey!_?K~lXT4~EPl#)Q5yPrvh7wKHI}4-_y4XeQsQmx`->buNDFXuodr6RAFpvub z3{u|AZa|@IPZ!6Kid%0cIr1G);9x0t{Pka5+$XCyY}S`23**ucDK$KPni%Y;BfdoB zG|Tf#S7)$f6>OgB5Nb6&E#X__k?}3xnA~760>p_&>|dVB%pg XJ*T^5miAX(ps5U=u6{1-oD!M0waclE_N4E{eRp@Se4B1|NsA0%jV2yU|`@Z z3GxdDa>0Nh*uO#uD46Hz;uunK>&+x@t^)=fF7Ccod;fQ?4!GnX#2uR&xc$B2WA^9X ziNTDMxHVjj4qEP#Yj)t(+a$EY>p85+ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png index 6f294593ff61002cb4add9e8cea18c37d67def7d..e165f2cb45836fc8b7aede7b22a1f7d8f136fcad 100644 GIT binary patch delta 190 zcmZo=`p-DQvtB*GC&YDIKi{hehURpx*$Z74+cI3gpRnJ6A;p`$Rf*w$EBB^Y4i7Wd z|Ns9lV2*ELU|`@a3GxdDa^Zl%_JvX#P$JaR#WAGfR?-7S1_?LO3qFk2%*@Qv%6Y6j zYa9-oIO%bMg-`5GUP2NZlbD{^oxUe&NlE61GMSDr-Qh~`JCe(Kgr%mB#aeK`d86ME j@qopeU13}dOgs#I-*tT%%?&RCZD8bP0l+XkK%+^SD delta 196 zcmey**vd4)vtByDC&V>cN2S1s;m3`H3#tBh7Dyj-v0IhQP@<{&|Nnor!_zn!7#KK9 zg8YJkTrgk=_OB2E3TAt{IEGZ*dNawJuR(!_HU8(9%KyUAJx!e3)Ye6uC{s(xIQXq- z!wQFEOvP?066;&^Gm=yp{Vz=ED*VQGCgy6z`x$w*26|PmXGk6Sar5DxMIVFo{+YBN wTdO?d$wk3;PHg4VRA1N6i2tGVhKYxvbBWyA?bFxw0PSV)boFyt=akR{0GGE|lmGw# diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png index f3329b1114bd80ce19b0d4811f032daebede6e4f..1895ba06b2ad461809565380e2bf3a314f8e7b4d 100644 GIT binary patch delta 184 zcmZo=`pG!KvtA{@C&cwt1jDv|zUFkU*$Z9w8!#-kWw?GnA;p`$Rf*w$EBB^Yj{pDv zt9c6=GcYjllmz(&1GzB3AawuSIiPs3r;B4q#jT_VY77!?q8EG^t(BFPxta4=dvY8O z95~tF&FEs!&CIS{#%l2Q%$k@rKYS9B4y7^~IDrKYA<)8{gyQGLOIv>r8y eU)l^D1`G}zn%?1eCM^b<&*16m=d#Wzp$Pyo*+{j~fYh7D!)6^)E1DIOt;c|NsB9nTo{>3=Etl zL4LtNE*LNb`&S471+zU}978H@y_w|5bwGiK#eDU#fB%p6HicYRa$$0N)!f7jE;0J- z?OYBz3q;(SK3bWIISReHbKp?$JKlG#$Eul^1fSSz%h-498Q(R5ZEc^qvOAs~EH4gt we2qix=8m@A7uu~)U;1o+M!!ZdkCBbxmxP?`=NWT%1MOw-boFyt=akR{00)^^%>V!Z diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png index a55a20f4403c45c1fdaad3435b452ecd1747b6f1..c34c3f9ac154dfb12bf06038defa740287fe97f1 100644 GIT binary patch delta 119 zcmcb^xQ}syU%|G1K1rA5*Y77t*-lRJW>?62|NsC0fZyEx3=9nHB|(0{KrRq4NO?26 z0flrtT^vIyZY3osGf23JUhrY$W@ctKR?cJP@o_kC;*`fe&c%+ls~VJ885r3ZR?HM% Uaqj4`a-cp2Pgg&ebxsLQ00&YllK=n! delta 150 zcmdnTc!zOR>l=vj-M6Ok`E*k7iWn78Z7r3ug3~ zH&JlDvg4Li(^Q|t)vHv3=(dl7kn74nVFfTx${_g z);JtEbk^wv3t!ruyo4kcrZl~@JAF@5l9Ch-r60;j=}ll|U}R%(zNB~crO@F?K%*Eu MUHx3vIVCg!0IL5&mH+?% delta 165 zcmaFC_>6IaXT4~EPl&6Ae?@^2!>VKk`^qVI7D&raI`sel|GKwMj~N&k*h_-^f`MEh zV36`=b^{89c)B=-RNQ(p$(rwg0?*MuKkoiN!7D4^TyfVsEILf2^`qgR2nPKN+I}2y z;mU$nn%1*%>ZfK;__)1L=-88s44a)TjJ(garM%zp@vxj~>G8vN)NPn}7!JGpmfXT5rWPl#)CI@j!lu7did+xq#g-%k+IPEYY>mvmV!Wjk5Sce#fdt3uxU z|Ns9>|BPs5U|`@a3GxdDa^Zl%_JvX#P{Q5Q#WAGfR?-7S1_?LO3qFj}#>U3%)_JUF zbQ}(xJL`9XB~0y3UP1y3lbWB}oxUeY2??49(wX?B8ChG_Dx@6BsFGO2#lXbF@b|8s VtU=$te?T)CJYD@<);T3K0RSeuMNR+! delta 187 zcmey!_=j?J{d!9Xq$ zFi3eby8(r=JY5_^DsH`*K2 nZul`Ja?AgNe-4R16iHxkixu1d{;<~^ptTI1u6{1-oD!MX#<8rC z>$>`HCDvvZ`5kO33^!{S3Xjg(*tTe2bBn0<+E?CXf;UZjTo}v_s`#J(!~a=s1``j1 YX@%|*R;`^)KvNk!UHx3vIVCg!07Cjme*gdg delta 199 zcmey&*ugZxvtByDC&bkvrCZ4=0Nh*uO#uD46Hz;uunK>&+x@t^)=fF7Ccod;fQ?4!GnX#2uR&xc$B2WA^9X ziNTDMxHVjj4qEP#Yj)t(+a$EY>p8Qe#$ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png index 53183ac02345b45c5e35324ca4e4eded8934abd7..ee6311ff17ffeb5488b8af81d0df5bd4c0639d4a 100644 GIT binary patch delta 190 zcmZo=`p-DQvtB*GC&YDIKcA$_^5%4|*$Z6-^-HhcPmr>moZ`(cq@Avi_g>6*xrZ6+ z|NsBjywRP;z`(#;666;QLi?!f>^G3fT j;sJ{_yTZ5_n0OfazU%rjnj2mO+Q8uH>gTe~DWM4f+iys_ delta 196 zcmey**vd4)vtByDC&X3BD&x)q=^r-|nhxD4Fk+CObZAvFgGEaB|NsB0Nh*uO#uD46Z(;uunK>&+xbz6J#z7IBT(|NoP^0}T#dJ0i@!^IQv$?u|G; zG0_td37Q=&kEecMJ-bHb0q3k@qjUEfXReldFMFBS_LytFY;d!Lz4e@MlX;hp&VP1c wM=8r>8>>UHCmx*Jl=7GVGk1JTYy%@h%PhII2bRsP0NTso>FVdQ&MBb@04SMPsQ>@~ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png index 3bd88af36b4f6978787573bff3cc00f8d2cdc30d..bcd579fc23d9acf05d8b46e0f23e1bd15e914d8a 100644 GIT binary patch delta 184 zcmZo=`pG!KvtA{@C&X3KW%;&#zUFkU*$Z8--%k+KFO{;LoZ`){koR6lJ6+6o`Tzg_ zC#ZNYXJBC9DGBlm26AD5LFoRub3pN6PZ!6Kid#t!)EFe(L@)R-S}Q9nOEc%O_UJeq zIB>ARo6*Hynps`DjMd=pnKdzMe)uFL9ZF>~bY%58d5pG`$0a^)3L-XYh3Ob6Mw<&;$TK2S&#L delta 196 zcmey#*vd4)vtByDC&bkvrF&H}gOXLoj~fYh7DyKuF*F^zAwTKR|NsAAU9vvIz`(#+ z666;Q64kMm}2UdosF%}lX!nQJ-^1VQ&S|{wqfzZJC4$wdpB0LnoXK=aIa-Y wQ7+5mH!+7|PaHNsJ?XRk8T}f;JVrJK#^-Xf=Q!5I0_|n+boFyt=akR{03?f8a{vGU diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4db777e10039cc356df92051fd39370c89525971 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XL<4+6T(|Y}UB92;Qy-)iZIj~7&T!W0|Ns9!{AOo>3fN16 z{DOg8AYhR4W_AM#>3F(0hE&{2N>FBya1*`Y!^q9d%xo;2$I8>=aNx)(mwlXz9c@=N eD6ujyvN5da7GLoxTUi~bkHOQ`&t;ucLK6Tx@Hy20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png new file mode 100644 index 0000000000000000000000000000000000000000..f9622dac87f74b3ae3f9fb07f4de4441f9371818 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}UB92;Qy(;Yp{r@6Wpg^0tb=QTN30K4CKNAgY65YHlT!^r;B4q#jT_ViVPBNq8EG^t(lpb z*@g31d3qcU969Q8g2hbiPF_MP8O5})z4*}Q$iB}IRH+H literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png new file mode 100644 index 0000000000000000000000000000000000000000..48c2d57c431cb49a71951804e5396d27b53f3ecd GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T$|ImW-oL#jkMg>&zIuOF6*G>Qy+BwegZ?ko>sJt zhZ!rwS*QR1|4%Jm?grGtTN30K4CKNAgY65YHlT#Nr;B4q#jT_ViVPBNq8EG^xs8pD z)ur=T&%ALsaO|wx36?OmJ9!BSEKF*AYIpjcBqbyqNN3{bW@K$ytB`Uiqe@~87XuRy Y17o?K>>0*ZBcPECp00i_>zopr03bL}`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png new file mode 100644 index 0000000000000000000000000000000000000000..57ef1542fb84b6f339d23839f01d6464b3041a1c GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X)B}7%T(|Y}UB92;Qy(;Yp{r@6Wpg@LiZ{EggO*mb4Z~R{ zhJHN{GuHqA|9|_j*BhvXwUl`0;(d zxERN>My~7Xzm-^$)HsW7Li?!f> n^G3fT;sJ{_yTZ5_n0Od^ckBATerx{-XaR$#tDnm{r-UW|HECGC literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png new file mode 100644 index 0000000000000000000000000000000000000000..465a9d408f81cc7af8994327df7c590f9f083321 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XR04cLTz%?;w)OKhr*q9-=xQ2isTFN={eD7DrKYA<)8{gyQGLOI iv>r8yU)l^D1`G}>G`%O?=Bfo6&*16m=d#Wzp$PyIlvQj1 literal 0 HcmV?d00001 From 4eaa0a116e99391423da262e3ebe9ffffb845e09 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 17 Feb 2024 00:31:54 +0100 Subject: [PATCH 06/17] Fix mistakes :bread: --- .../Objects/Weapons/Guns/Ammunition/Projectiles/special.yml | 2 +- .../Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 538710083d4..6f2631124f8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -48,7 +48,7 @@ - type: entity id: BulletSpecialUranium name: bullet (.38 special uranium) - parent: BulletUranium + parent: BaseBulletUranium noSpawn: true components: - type: Projectile diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 0f87187210d..832910c12a4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -118,6 +118,7 @@ whitelist: tags: - CartridgeSpecial + - SpeedLoaderSpecial proto: CartridgeSpecialHoly capacity: 4 chambers: [ True, True, True, True ] From 74a469f59780b788268888a774ae664a2d9c593e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 17 Feb 2024 00:32:05 +0100 Subject: [PATCH 07/17] Add extra speedloaders --- .../Guns/Ammunition/SpeedLoaders/special.yml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml index 6bbf8e4aec9..b3e7dff0088 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml @@ -78,3 +78,63 @@ steps: 7 zeroVisible: false - type: Appearance + +- type: entity + id: SpeedLoaderSpecialUranium + name: "speed loader (.38 special uranium)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialuranium + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_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 + +- type: entity + id: SpeedLoaderSpecialMindbreaker + name: "speed loader (.38 special mindbreaker)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialMindbreaker + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mindbreaker-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: mindbreaker + steps: 7 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderSpecialHoly + name: "speed loader (.38 special holy)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialHoly + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: holy-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: holy + steps: 7 + zeroVisible: false + - type: Appearance From 977bce1c17c881db5da091a8e12c46ab47b998b0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 17 Feb 2024 20:46:42 +0100 Subject: [PATCH 08/17] mindbreaker ammo box --- .../Weapons/Guns/Ammunition/Boxes/special.yml | 15 ++++++++ .../DeltaV/Recipes/Lathes/security.yml | 34 +++++++++++------- .../Entities/Structures/Machines/lathe.yml | 5 ++- .../Ammunition/Boxes/special.rsi/meta.json | 3 ++ .../Boxes/special.rsi/mindbreaker.png | Bin 0 -> 189 bytes 5 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml index be21a1a1081..3bf47a80dec 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml @@ -97,3 +97,18 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: uranium + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialMindbreaker + name: ammunition box (.38 special mindbreaker) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialMindbreaker + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: mindbreaker diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 1667a0d8402..c31a8c37b09 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -76,6 +76,23 @@ materials: Steel: 1250 +- type: latheRecipe + id: MagazineBoxSpecialPractice + result: MagazineBoxSpecialPractice + category: Ammo + completetime: 5 + materials: + Plastic: 1200 + +- type: latheRecipe + id: MagazineBoxSpecialRubber + result: MagazineBoxSpecialRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 300 + - type: latheRecipe id: MagazineBoxSpecialIncendiary result: MagazineBoxSpecialIncendiary @@ -94,21 +111,14 @@ Uranium: 125 - type: latheRecipe - id: MagazineBoxSpecialPractice - result: MagazineBoxSpecialPractice + id: MagazineBoxSpecialMindbreaker + result: MagazineBoxSpecialMindbreaker category: Ammo completetime: 5 materials: - Plastic: 1200 - -- type: latheRecipe - id: MagazineBoxSpecialRubber - result: MagazineBoxSpecialRubber - category: Ammo - completetime: 5 - materials: - Steel: 350 - Plastic: 300 + Plastic: 1250 + Steel: 75 + Bluespace: 75 - type: latheRecipe id: ClothingOuterArmorPlateCarrier diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index bfbe8280db6..67aace45e47 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -205,6 +205,8 @@ - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium + - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver + - MagazineBoxSpecialMindbreaker # DeltaV - .38 Special revolver - PowerCageSmall - PowerCageMedium - PowerCageHigh @@ -742,7 +744,8 @@ - MagazineBoxPistolUranium - MagazineBoxRifleUranium - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo + - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver + - MagazineBoxSpecialMindbreaker # DeltaV - .38 Special revolver - ShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - MagazineBoxLightRifleRubber - MagazineBoxMagnumRubber diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json index 3ab4be79c0b..975993c6651 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json @@ -24,6 +24,9 @@ }, { "name": "uranium" + }, + { + "name": "mindbreaker" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png new file mode 100644 index 0000000000000000000000000000000000000000..c6f7fc228c4e2d4d85b18b987fbe7ac7dde3bb58 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XcmjMvToZV595_5o*{%Qo|DXO!b~{j Date: Sun, 18 Feb 2024 11:11:31 +0100 Subject: [PATCH 09/17] New markers, update old .38 markers --- .../Catalog/Fills/Crates/salvage.yml | 7 +- .../VendingMachines/Inventories/ammo.yml | 8 ++- .../Prototypes/DeltaV/Research/arsenal.yml | 12 ++-- .../Entities/Structures/Machines/lathe.yml | 67 ++++++++++++------- Resources/Prototypes/Research/arsenal.yml | 20 ++++-- 5 files changed, 72 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 55fed9eef69..d4d0229d65d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -74,10 +74,13 @@ prob: 0.001 - id: WeaponRevolverInspector prob: 0.001 - - id: WeaponRevolverLucky # DeltaV - .38 special revolver - prob: 0.001 - id: ClothingShoesBootsMagBlinding prob: 0.001 + # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky' to the salvage potential loot + # This code is licensed under AGPLv3. See LICENSE + - id: WeaponRevolverLucky + prob: 0.001 + # End of modified code # - Skub - id: Skub prob: 0.001 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 44ec34e1569..4080dbaead1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -13,9 +13,11 @@ MagazineBoxMagnumPractice: 3 MagazineBoxMagnumRubber: 3 - MagazineBoxSpecial: 3 # DeltaV - .38 Special revolver - MagazineBoxSpecialPractice: 3 # DeltaV - .38 Special revolver - MagazineBoxSpecialRubber: 3 # DeltaV - .38 Special revolver + # DeltaV - .38 special ammo - Add various .38 special ammo to ammovend + MagazineBoxSpecial: 3 + MagazineBoxSpecialPractice: 3 + MagazineBoxSpecialRubber: 3 + # End of modified code MagazineBoxPistol: 3 MagazineBoxPistolPractice: 3 diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 82cbde7ed7e..71993d8c313 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -10,10 +10,10 @@ tier: 1 cost: 7500 recipeUnlocks: - - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo + - CartridgeSpecialHoly + - CartridgeSpecialMindbreaker - ShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - + - type: technology id: EnergyGuns name: research-technology-energy-gun @@ -26,7 +26,7 @@ recipeUnlocks: - WeaponEnergyGun - WeaponEnergyGunMini - + - type: technology id: EnergyGunsAdvanced name: research-technology-energy-gun-advance @@ -38,7 +38,7 @@ cost: 7500 recipeUnlocks: - WeaponEnergyGunPistol - + - type: technology id: Advanced Laser Manipulation name: research-technology-advance-laser @@ -50,5 +50,5 @@ cost: 12500 recipeUnlocks: - WeaponGunLaserCarbineAutomatic - + diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 67aace45e47..47125bf371d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -158,7 +158,6 @@ - type: EmagLatheRecipes emagStaticRecipes: - CartridgePistol - - CartridgeSpecial # DeltaV - .38 Special revolver - CartridgeMagnum - ShellShotgun - ShellShotgunFlare @@ -166,53 +165,61 @@ - CartridgeLightRifle - CartridgeRifle - MagazineBoxPistol - - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle - GrenadeBlast + # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe + - CartridgeSpecial + - MagazineBoxSpecial + # End of modified code emagDynamicRecipes: - CartridgePistolRubber - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - CartridgeMagnumRubber - ShellShotgunBeanbag - CartridgeRifleRubber - CartridgeLightRifleRubber - MagazineBoxPistolRubber - - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber - ShellShotgunIncendiary - CartridgePistolIncendiary - - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgeMagnumIncendiary - CartridgeLightRifleIncendiary - CartridgeRifleIncendiary - MagazineBoxPistolIncendiary - - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary - ShellShotgunUranium - CartridgePistolUranium - - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgeMagnumUranium - CartridgeLightRifleUranium - CartridgeRifleUranium - MagazineBoxPistolUranium - - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver - - MagazineBoxSpecialMindbreaker # DeltaV - .38 Special revolver - PowerCageSmall - PowerCageMedium - PowerCageHigh - MagazineGrenadeEmpty - GrenadeEMP - GrenadeFlash + # DeltaV - .38 special ammo - Add .38 special rubber ammo to emagged autolathe + - CartridgeSpecialRubber + - MagazineBoxSpecialRubber + # End of modified code + # DeltaV - .38 special ammo - Add various .38 special ammo to emagged autolathe + # This code is licensed under AGPLv3. See LICENSE + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium + - CartridgeSpecialMindbreaker + - MagazineBoxSpecialIncendiary + - MagazineBoxSpecialUranium + - MagazineBoxSpecialMindbreaker + # End of modified code - type: entity id: AutolatheHyperConvection @@ -685,19 +692,16 @@ - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer - - MagazinePistolSpecial # DeltaV - .38 Special psi-breaker - MagazinePistol - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunTopMounted - MagazineRifle - MagazineLightRifle - MagazineBoxPistol - - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle - SpeedLoaderMagnum - - SpeedLoaderSpecial # DeltaV - .38 Special revolver - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour - TargetHuman @@ -705,24 +709,25 @@ - TargetClown - MagazineBoxLightRiflePractice - MagazineBoxMagnumPractice - - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver - MagazineBoxPistolPractice - MagazineBoxRiflePractice - ShellShotgunPractice - WeaponLaserCarbinePractice - WeaponDisablerPractice + # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab + - MagazineBoxSpecial + - MagazineBoxSpecialPractice + - SpeedLoaderSpecial + - MagazinePistolSpecial + # End of modified code dynamicRecipes: - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - EncryptionKeySyndie # Nyano - - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - CartridgeLightRifleIncendiary - CartridgeMagnumIncendiary - - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgePistolIncendiary - CartridgeRifleIncendiary - CartridgeLightRifleUranium - CartridgeMagnumUranium - - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgePistolUranium - CartridgeRifleUranium - CartridgeLightRifleRubber @@ -735,17 +740,12 @@ - HoloprojectorSecurity - MagazineBoxLightRifleIncendiary - MagazineBoxMagnumIncendiary - - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxPistolIncendiary - MagazineBoxRifleIncendiary - MagazineBoxLightRifleUranium - MagazineBoxMagnumUranium - - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxPistolUranium - MagazineBoxRifleUranium - - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver - - MagazineBoxSpecialMindbreaker # DeltaV - .38 Special revolver - ShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - MagazineBoxLightRifleRubber - MagazineBoxMagnumRubber @@ -783,6 +783,21 @@ - WeaponEnergyGunMini #DeltaV - Energy Gun but miniature - WeaponEnergyGunPistol #DeltaV - Energy Gun Mini but with the power of a normal energy gun - WeaponGunLaserCarbineAutomatic #DeltaV - New Laser Projectiles with a 20 round carbine + # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab + - CartridgeSpecialRubber + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium + - CartridgeSpecialHoly + - CartridgeSpecialMindbreaker + - MagazineBoxSpecial + - MagazineBoxSpecialPractice + - MagazineBoxSpecialRubber + - MagazineBoxSpecialIncendiary + - MagazineBoxSpecialUranium + - MagazineBoxSpecialMindbreaker + - SpeedLoaderSpecial + - MagazinePistolSpecial + # End of modified code - type: MaterialStorage whitelist: tags: @@ -817,7 +832,6 @@ staticRecipes: - CartridgePistol - CartridgeMagnum - - CartridgeSpecial # DeltaV - .38 Special revolver - ShellShotgun - ShellShotgunSlug - ShellShotgunFlare @@ -826,9 +840,12 @@ - CartridgeRifle - MagazineBoxPistol - MagazineBoxMagnum - - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxRifle - MagazineBoxLightRifle + # DeltaV - .38 special ammo - Add lethal .38 special ammo to ammo techfab + - CartridgeSpecial + - MagazineBoxSpecial + # End of modified code - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 51c5175134d..fc3c7630553 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -26,15 +26,18 @@ recipeUnlocks: - ShellShotgunIncendiary - CartridgePistolIncendiary - - CartridgeSpecialIncendiary # DeltaV - .38 Special revolver - CartridgeMagnumIncendiary - CartridgeLightRifleIncendiary - CartridgeRifleIncendiary - MagazineBoxPistolIncendiary - - MagazineBoxSpecialIncendiary # DeltaV - .38 Special revolver - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree + # This code is licensed under AGPLv3. See LICENSE + - CartridgeSpecialIncendiary + - MagazineBoxSpecialIncendiary + # End of modified code - type: technology id: ExplosiveTechnology @@ -79,15 +82,17 @@ recipeUnlocks: - ShellShotgunBeanbag - CartridgePistolRubber - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - CartridgeMagnumRubber - CartridgeLightRifleRubber - CartridgeRifleRubber - MagazineBoxPistolRubber - - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - MagazineBoxMagnumRubber - MagazineBoxLightRifleRubber - MagazineBoxRifleRubber + # DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree + - CartridgeSpecialRubber + - MagazineBoxSpecialRubber + # End of modified code - type: technology id: UraniumMunitions @@ -101,15 +106,18 @@ recipeUnlocks: - ShellShotgunUranium - CartridgePistolUranium - - CartridgeSpecialUranium # DeltaV - .38 Special revolver - CartridgeMagnumUranium - CartridgeLightRifleUranium - CartridgeRifleUranium - MagazineBoxPistolUranium - - MagazineBoxSpecialUranium # DeltaV - .38 Special revolver - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium + # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree + # This code is licensed under AGPLv3. See LICENSE + - CartridgeSpecialUranium + - MagazineBoxSpecialUranium + # End of modified code # Tier 2 From 0a189562444af21edc9d52a0d1f2fa1c2b608100 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 18 Feb 2024 11:13:45 +0100 Subject: [PATCH 10/17] commentfix --- Resources/Prototypes/Catalog/Fills/Crates/salvage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index d4d0229d65d..4da8667235d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -74,13 +74,13 @@ prob: 0.001 - id: WeaponRevolverInspector prob: 0.001 - - id: ClothingShoesBootsMagBlinding - prob: 0.001 - # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky' to the salvage potential loot + # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky 37' to the salvage potential loot # This code is licensed under AGPLv3. See LICENSE - id: WeaponRevolverLucky prob: 0.001 # End of modified code + - id: ClothingShoesBootsMagBlinding + prob: 0.001 # - Skub - id: Skub prob: 0.001 From 8ede955dcaaa877dec5adf308bce7d1d34e4e35f Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 18 Feb 2024 11:50:15 +0100 Subject: [PATCH 11/17] firerate pass 2 --- .../Objects/Weapons/Guns/Revolvers/revolvers.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 832910c12a4..a19a21dd924 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -34,7 +34,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi - type: Gun selectedMode: SemiAuto - fireRate: 2.5 + fireRate: 2 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -59,7 +59,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi - type: Gun selectedMode: SemiAuto - fireRate: 2 + fireRate: 1.75 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -84,7 +84,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - type: Gun selectedMode: SemiAuto - fireRate: 2.5 + fireRate: 2 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -108,10 +108,10 @@ - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.75 + fireRate: 1.5 availableModes: - SemiAuto - type: RevolverAmmoProvider From 73e1fbfae485030635a0695712abfe06c2c47f7d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 18 Feb 2024 11:55:55 +0100 Subject: [PATCH 12/17] Fixes --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 47125bf371d..a4191fd68f5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -785,18 +785,17 @@ - WeaponGunLaserCarbineAutomatic #DeltaV - New Laser Projectiles with a 20 round carbine # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab - CartridgeSpecialRubber - - CartridgeSpecialIncendiary - - CartridgeSpecialUranium - CartridgeSpecialHoly - CartridgeSpecialMindbreaker - - MagazineBoxSpecial - - MagazineBoxSpecialPractice - MagazineBoxSpecialRubber + # End of modified code + # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab + # This code is licensed under AGPLv3. See LICENSE + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker - - SpeedLoaderSpecial - - MagazinePistolSpecial # End of modified code - type: MaterialStorage whitelist: From e6a06258ed8800b99e609546f663d4c3792f9f45 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 18 Feb 2024 21:25:05 +0100 Subject: [PATCH 13/17] cleanup --- .../Prototypes/Catalog/Fills/Crates/salvage.yml | 1 - .../Entities/Structures/Machines/lathe.yml | 14 ++++---------- Resources/Prototypes/Research/arsenal.yml | 2 -- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 4da8667235d..24ae7c574de 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -75,7 +75,6 @@ - id: WeaponRevolverInspector prob: 0.001 # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky 37' to the salvage potential loot - # This code is licensed under AGPLv3. See LICENSE - id: WeaponRevolverLucky prob: 0.001 # End of modified code diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a4191fd68f5..1bcd0cc139a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -207,15 +207,12 @@ - MagazineGrenadeEmpty - GrenadeEMP - GrenadeFlash - # DeltaV - .38 special ammo - Add .38 special rubber ammo to emagged autolathe - - CartridgeSpecialRubber - - MagazineBoxSpecialRubber - # End of modified code # DeltaV - .38 special ammo - Add various .38 special ammo to emagged autolathe - # This code is licensed under AGPLv3. See LICENSE + - CartridgeSpecialRubber - CartridgeSpecialIncendiary - CartridgeSpecialUranium - CartridgeSpecialMindbreaker + - MagazineBoxSpecialRubber - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker @@ -785,14 +782,11 @@ - WeaponGunLaserCarbineAutomatic #DeltaV - New Laser Projectiles with a 20 round carbine # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab - CartridgeSpecialRubber + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium - CartridgeSpecialHoly - CartridgeSpecialMindbreaker - MagazineBoxSpecialRubber - # End of modified code - # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab - # This code is licensed under AGPLv3. See LICENSE - - CartridgeSpecialIncendiary - - CartridgeSpecialUranium - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fc3c7630553..dd626d470de 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,7 +34,6 @@ - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree - # This code is licensed under AGPLv3. See LICENSE - CartridgeSpecialIncendiary - MagazineBoxSpecialIncendiary # End of modified code @@ -114,7 +113,6 @@ - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - # This code is licensed under AGPLv3. See LICENSE - CartridgeSpecialUranium - MagazineBoxSpecialUranium # End of modified code From b0578772b1556c4edb717928842a2a45f879665e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 19 Feb 2024 00:25:30 +0100 Subject: [PATCH 14/17] Add new colored tips to cartridges --- .../Guns/Ammunition/Cartridges/special.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml index 931ed98c546..8e1da076c65 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml @@ -35,6 +35,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialPractice + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#dbdbdb" - type: entity id: CartridgeSpecialRubber @@ -43,6 +50,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" - type: entity id: CartridgeSpecialIncendiary @@ -51,6 +65,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialIncendiary + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#ff6e52" - type: entity id: CartridgeSpecialUranium @@ -59,6 +80,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialUranium + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#65fe08" - type: entity id: CartridgeSpecialHoly @@ -67,6 +95,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialHoly + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#fff600" - type: entity id: CartridgeSpecialMindbreaker @@ -75,6 +110,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialMindbreaker + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#950ea9" - type: ChemicalAmmo - type: SolutionContainerManager solutions: From 360d92801e8b0265c105a1645d44c5aa9ec80bd0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 20 Feb 2024 13:02:08 +0100 Subject: [PATCH 15/17] Fix typo --- .../Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml index b3e7dff0088..3b449ad404d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml @@ -85,7 +85,7 @@ parent: BaseSpeedLoaderSpecial components: - type: BallisticAmmoProvider - proto: CartridgeSpecialuranium + proto: CartridgeSpecialUranium - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi layers: From 2cb4849b3c35e57a1f26785d2d15de87798de723 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers <9823203+FluffiestFloof@users.noreply.github.com> Date: Sun, 25 Feb 2024 15:31:28 +0100 Subject: [PATCH 16/17] holy update after someone pointed out the damage It's technically still a bullet but coated in silver/holy magic whatever, so it should still pierce. Still have to print them one by one and they are not as good as normal bullet against normal things --- .../Objects/Weapons/Guns/Ammunition/Projectiles/special.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 6f2631124f8..172b09ed612 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -66,8 +66,8 @@ - type: Projectile damage: types: - Blunt: 3 - Holy: 5 + Holy: 6 + Piercing: 18 - type: entity id: BulletSpecialMindbreaker From 6aa132458b6f732cdb6ab35971023cd1340b3740 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers <9823203+FluffiestFloof@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:49:54 +0100 Subject: [PATCH 17/17] someone did the math for silver bullets I guess. --- .../Objects/Weapons/Guns/Ammunition/Projectiles/special.yml | 2 +- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 172b09ed612..a021e77f0a2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -67,7 +67,7 @@ damage: types: Holy: 6 - Piercing: 18 + Piercing: 25 - type: entity id: BulletSpecialMindbreaker diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index c31a8c37b09..cd79417a44e 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -54,8 +54,7 @@ category: Ammo completetime: 2 materials: - Plastic: 15 - Steel: 5 + Steel: 15 Silver: 5 - type: latheRecipe