From d884cf9dd4976ee0be6acaa068a4b0415bc315a7 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 8 Feb 2024 18:56:36 +0100 Subject: [PATCH 1/5] Fix the funny mindbreaker boolet --- .../Guns/Ammunition/Projectiles/special.yml | 20 +++++++++++++++++-- 1 file changed, 18 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 b477d685dbf..76d285668e6 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,10 +48,26 @@ - type: entity id: BulletSpecialMindbreaker name: bullet (.38 special mindbreaker) - parent: BaseBullet + parent: BaseBulletPractice noSpawn: true components: - type: Projectile damage: types: - Blunt: 3 + Blunt: 1 + - type: SolutionContainerManager + solutions: + ammo: + maxVol: 9 + - type: RefillableSolution + solution: ammo + - type: DrainableSolution + solution: ammo + - type: SolutionInjectOnCollide + transferAmount: 9 + blockSlots: NONE #shouldn't be blocked by a mask + - type: InjectableSolution + solution: ammo + - type: GuideHelp + guides: + - Psionics From 038688de63fa00d169fd1ec7378d722862b4bfce Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 8 Feb 2024 18:59:59 +0100 Subject: [PATCH 2/5] add .38 to ammo techfab --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0ee347ff94b..369ca5b0a6a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -802,6 +802,7 @@ staticRecipes: - CartridgePistol - CartridgeMagnum + - CartridgeSpecial # DeltaV - .38 Special revolver - ShellShotgun - ShellShotgunSlug - ShellShotgunFlare @@ -810,6 +811,7 @@ - CartridgeRifle - MagazineBoxPistol - MagazineBoxMagnum + - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxRifle - MagazineBoxLightRifle - type: MaterialStorage From 1a29bf7395fb62c55d954471b954ae9f5a7d1611 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 9 Feb 2024 21:30:43 +0100 Subject: [PATCH 3/5] Add practice .38 to secfab + categories --- .../DeltaV/Recipes/Lathes/security.yml | 33 +++++++++++++++---- .../Entities/Structures/Machines/lathe.yml | 1 + 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 4d1157eb525..64ed63eeabc 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -1,6 +1,7 @@ - type: latheRecipe id: SpeedLoaderSpecial result: SpeedLoaderSpecial + category: Ammo completetime: 5 materials: Steel: 200 @@ -8,6 +9,7 @@ - type: latheRecipe id: CartridgeSpecial result: CartridgeSpecial + category: Ammo completetime: 2 materials: Steel: 20 @@ -15,6 +17,7 @@ - type: latheRecipe id: CartridgeSpecialRubber result: CartridgeSpecialRubber + category: Ammo completetime: 2 materials: Plastic: 5 @@ -23,6 +26,7 @@ - type: latheRecipe id: CartridgeSpecialHoly result: CartridgeSpecialHoly + category: Ammo completetime: 2 materials: Plastic: 5 @@ -32,6 +36,7 @@ - type: latheRecipe id: CartridgeSpecialMindbreaker result: CartridgeSpecialMindbreaker + category: Ammo completetime: 2 materials: Plastic: 5 @@ -41,13 +46,23 @@ - type: latheRecipe id: MagazineBoxSpecial result: MagazineBoxSpecial + category: Ammo completetime: 5 materials: Steel: 1000 +- type: latheRecipe + id: MagazineBoxSpecialPractice + result: MagazineBoxSpecialPractice + category: Ammo + completetime: 5 + materials: + Steel: 950 + - type: latheRecipe id: MagazineBoxSpecialRubber result: MagazineBoxSpecialRubber + category: Ammo completetime: 5 materials: Steel: 350 @@ -68,43 +83,47 @@ materials: Steel: 500 Plastic: 1000 - + - type: latheRecipe id: WeaponEnergyGun result: WeaponEnergyGun + category: Weapons completetime: 8 materials: Steel: 2000 Glass: 800 Plastic: 500 - -- type: latheRecipe + +- type: latheRecipe id: WeaponEnergyGunMini result: WeaponEnergyGunMini + category: Weapons completetime: 4 materials: #Half of Energy Gun Recipe Steel: 1000 Glass: 400 - Plastic: 250 + Plastic: 250 - type: latheRecipe id: WeaponEnergyGunPistol result: WeaponEnergyGunPistol + category: Weapons completetime: 10 materials: Steel: 1500 Glass: 600 Plastic: 400 Gold: 150 - + - type: latheRecipe id: WeaponGunLaserCarbineAutomatic result: WeaponGunLaserCarbineAutomatic + category: Weapons completetime: 15 - materials: + materials: Steel: 2000 Glass: 1000 Plastic: 500 Gold: 250 Silver: 100 - Plasma: 500 \ No newline at end of file + Plasma: 500 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 369ca5b0a6a..2a9d9e06b1f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -684,6 +684,7 @@ - MagazineLightRifle - MagazineBoxPistol - MagazineBoxSpecial # DeltaV - .38 Special revolver + - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle From a0aeca2fdce2e38c177e3bf090429c21366eb4e6 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 9 Feb 2024 21:33:41 +0100 Subject: [PATCH 4/5] Practice is plastic whoops --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 64ed63eeabc..731d87441f3 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -57,7 +57,7 @@ category: Ammo completetime: 5 materials: - Steel: 950 + Plastic: 950 - type: latheRecipe id: MagazineBoxSpecialRubber From d806f1a6d90df19162df2e07061fa551ec522361 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sat, 10 Feb 2024 23:16:10 +0100 Subject: [PATCH 5/5] give mantis a buff with printable extra mags I'm sure no one will use this for traitorous acts :trollface: --- Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml | 8 ++++++++ .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 2 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 731d87441f3..4bae83432bd 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -6,6 +6,14 @@ materials: Steel: 200 +- type: latheRecipe + id: MagazinePistolSpecial + result: MagazinePistolSpecial + category: Ammo + completetime: 5 + materials: + Steel: 100 + - type: latheRecipe id: CartridgeSpecial result: CartridgeSpecial diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2a9d9e06b1f..30cad0ea0a9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -677,6 +677,7 @@ - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer + - MagazinePistolSpecial # DeltaV - .38 Special psi-breaker - MagazinePistol - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunTopMounted