Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.38 Special mindbreaker fix + ammo techfab #795

Merged
merged 6 commits into from
Feb 10, 2024
Merged

.38 Special mindbreaker fix + ammo techfab #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d884cf9
Fix the funny mindbreaker boolet
FluffiestFloof Feb 8, 2024
038688d
add .38 to ammo techfab
FluffiestFloof Feb 8, 2024
1a29bf7
Add practice .38 to secfab + categories
FluffiestFloof Feb 9, 2024
a0aeca2
Practice is plastic whoops
FluffiestFloof Feb 9, 2024
ef6143c
Merge branch 'master' into 38mindbreakerfix
VMSolidus Feb 10, 2024
d806f1a
give mantis a buff with printable extra mags
FluffiestFloof Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
solutions:
ammo:
maxVol: 9
- type: RefillableSolution
solution: ammo
- type: DrainableSolution
DebugOk marked this conversation as resolved.
Show resolved Hide resolved
solution: ammo
- type: SolutionInjectOnCollide
transferAmount: 9
blockSlots: NONE #shouldn't be blocked by a mask
- type: InjectableSolution
solution: ammo
- type: GuideHelp
guides:
- Psionics
41 changes: 34 additions & 7 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
- type: latheRecipe
id: SpeedLoaderSpecial
result: SpeedLoaderSpecial
category: Ammo
completetime: 5
materials:
Steel: 200

- type: latheRecipe
id: MagazinePistolSpecial
result: MagazinePistolSpecial
category: Ammo
completetime: 5
materials:
Steel: 100

- type: latheRecipe
id: CartridgeSpecial
result: CartridgeSpecial
category: Ammo
completetime: 2
materials:
Steel: 20

- type: latheRecipe
id: CartridgeSpecialRubber
result: CartridgeSpecialRubber
category: Ammo
completetime: 2
materials:
Plastic: 5
Expand All @@ -23,6 +34,7 @@
- type: latheRecipe
id: CartridgeSpecialHoly
result: CartridgeSpecialHoly
category: Ammo
completetime: 2
materials:
Plastic: 5
Expand All @@ -32,6 +44,7 @@
- type: latheRecipe
id: CartridgeSpecialMindbreaker
result: CartridgeSpecialMindbreaker
category: Ammo
completetime: 2
materials:
Plastic: 5
Expand All @@ -41,13 +54,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:
Plastic: 950

- type: latheRecipe
id: MagazineBoxSpecialRubber
result: MagazineBoxSpecialRubber
category: Ammo
completetime: 5
materials:
Steel: 350
Expand All @@ -68,43 +91,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
Plasma: 500
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,15 @@
- ShellShotgunSlug
- ShellShotgunFlare
- ShellTranquilizer
- MagazinePistolSpecial # DeltaV - .38 Special psi-breaker
- MagazinePistol
- MagazinePistolSubMachineGun
- MagazinePistolSubMachineGunTopMounted
- MagazineRifle
- MagazineLightRifle
- MagazineBoxPistol
- MagazineBoxSpecial # DeltaV - .38 Special revolver
- MagazineBoxSpecialPractice # DeltaV - .38 Special revolver
- MagazineBoxMagnum
- MagazineBoxRifle
- MagazineBoxLightRifle
Expand Down Expand Up @@ -802,6 +804,7 @@
staticRecipes:
- CartridgePistol
- CartridgeMagnum
- CartridgeSpecial # DeltaV - .38 Special revolver
- ShellShotgun
- ShellShotgunSlug
- ShellShotgunFlare
Expand All @@ -810,6 +813,7 @@
- CartridgeRifle
- MagazineBoxPistol
- MagazineBoxMagnum
- MagazineBoxSpecial # DeltaV - .38 Special revolver
- MagazineBoxRifle
- MagazineBoxLightRifle
- type: MaterialStorage
Expand Down
Loading