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

Another .38 special clean up / balance #852

Merged
merged 18 commits into from
Mar 7, 2024
+380 −59
Merged

Another .38 special clean up / balance #852

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e8218dc
Fix weird firerates
FluffiestFloof Feb 16, 2024
180d31c
change ejection port placement on psibreaker
FluffiestFloof Feb 16, 2024
825d2ec
Rubber nerf + new ammo + fix recipe costs
FluffiestFloof Feb 16, 2024
a698516
Make lucky available in salvage
FluffiestFloof Feb 16, 2024
6c296d8
Update look of speedloader
FluffiestFloof Feb 16, 2024
4eaa0a1
Fix mistakes :bread:
FluffiestFloof Feb 16, 2024
74a469f
Add extra speedloaders
FluffiestFloof Feb 16, 2024
977bce1
mindbreaker ammo box
FluffiestFloof Feb 17, 2024
be41b0a
New markers, update old .38 markers
FluffiestFloof Feb 18, 2024
0a18956
commentfix
FluffiestFloof Feb 18, 2024
8ede955
firerate pass 2
FluffiestFloof Feb 18, 2024
73e1fbf
Fixes
FluffiestFloof Feb 18, 2024
e6a0625
cleanup
FluffiestFloof Feb 18, 2024
45da14c
Merge branch 'master' into 38balancepassnumbertwentyseven
FluffiestFloof Feb 18, 2024
b057877
Add new colored tips to cartridges
FluffiestFloof Feb 18, 2024
360d928
Fix typo
FluffiestFloof Feb 20, 2024
2cb4849
holy update after someone pointed out the damage
FluffiestFloof Feb 25, 2024
6aa1324
someone did the math for silver bullets
FluffiestFloof Feb 25, 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
Prev Previous commit
Next Next commit
Add new colored tips to cartridges
@FluffiestFloof
FluffiestFloof committed Feb 18, 2024
commit b0578772b1556c4edb717928842a2a45f879665e
42 changes: 42 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml
View file
Original file line number Diff line number Diff line change
@@ -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: