cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shotgun clip rebalance

Browse Source 
An alternative solution to the problem I highlighted in
https://github.com/PolarisSS13/Polaris/pull/4302

If this is merged, **do not merge**
https://github.com/PolarisSS13/Polaris/pull/4303
This commit is contained in:
Spades
2017-11-19 14:08:03 -05:00
parent a6aa1e0c51
commit 79d3ee82ab
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -551,12 +551,12 @@
/obj/item/ammo_magazine/clip/c12g /obj/item/ammo_magazine/clip/c12g
name = "ammo clip (12g slug)" name = "ammo clip (12g slug)"
icon_state = "12gclipslug" //largely a codersprite, looks good enough. feel free to make a better one. icon_state = "12gclipslug" // Still a placeholder sprite. Feel free to make a better one.
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with slugs." desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with slugs."
caliber = "12g" caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g ammo_type = /obj/item/ammo_casing/a12g
matter = list(DEFAULT_WALL_MATERIAL = 1790) // slugs shells x4 + 350 metal for the clip itself. matter = list(DEFAULT_WALL_MATERIAL = 1070) // slugs shells x2 + 350 metal for the clip itself.
max_ammo = 4 max_ammo = 2
multiple_sprites = 1 multiple_sprites = 1
/obj/item/ammo_magazine/clip/c12g/pellet /obj/item/ammo_magazine/clip/c12g/pellet
@@ -564,14 +564,14 @@
icon_state = "12gclipshell" icon_state = "12gclipshell"
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with buckshot." desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with buckshot."
ammo_type = /obj/item/ammo_casing/a12g/pellet ammo_type = /obj/item/ammo_casing/a12g/pellet
matter = list(DEFAULT_WALL_MATERIAL = 1790) // buckshot and slugs cost the same matter = list(DEFAULT_WALL_MATERIAL = 1070) // buckshot and slugs cost the same
/obj/item/ammo_magazine/clip/c12g/beanbag /obj/item/ammo_magazine/clip/c12g/beanbag
name = "ammo clip (12g beanbag)" name = "ammo clip (12g beanbag)"
icon_state = "12gclipbean" icon_state = "12gclipbean"
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with beanbags." desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with beanbags."
ammo_type = /obj/item/ammo_casing/a12g/beanbag ammo_type = /obj/item/ammo_casing/a12g/beanbag
matter = list(DEFAULT_WALL_MATERIAL = 1070) //beanbags x4 + 350 metal matter = list(DEFAULT_WALL_MATERIAL = 710) //beanbags x2 + 350 metal
///////// .75 Gyrojet ///////// ///////// .75 Gyrojet /////////

BIN
icons/obj/ammo.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB