mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Some ammo fixes
- Fixes pirate gun not getting 12g caliber correctly. - Fixes .357 caliber not being named consistently with everything else. (Do not merge this until https://github.com/PolarisSS13/Polaris/pull/3533 is merged pls, unless Yosh fixes his caliber to be correct also.) - Changes .50AE ammo to .44 because that's more consistent with what the gun is capable of in-game, because it uses the same damage values as the .357 and not a bullet that shoots through through your fridge, through your house, and hits your neighbor's home invader like a .50AE is IRL. The fact that it's .44 makes much more sense. This is purely a fluff change because it annoyed me. - Fixes a bunch of ammo.dmi icon names and makes the file not a jumbled fucking mess. This means now your 762 mags and the newly renamed 44 mags will not be broken anymore.
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
name = "speedloader (.357)"
|
||||
desc = "A speedloader for .357 revolvers."
|
||||
icon_state = "38"
|
||||
caliber = "357"
|
||||
caliber = ".357"
|
||||
ammo_type = /obj/item/ammo_casing/a357
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 1260)
|
||||
max_ammo = 6
|
||||
@@ -383,14 +383,14 @@
|
||||
|
||||
///////// .50 AE /////////
|
||||
|
||||
/obj/item/ammo_magazine/m50
|
||||
name = "magazine (.50 AE)"
|
||||
icon_state = "50ae"
|
||||
/obj/item/ammo_magazine/m44
|
||||
name = "magazine (.44)"
|
||||
icon_state = ".44"
|
||||
origin_tech = list(TECH_COMBAT = 2)
|
||||
mag_type = MAGAZINE
|
||||
caliber = ".50AE"
|
||||
caliber = ".44"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 1260)
|
||||
ammo_type = /obj/item/ammo_casing/a50ae
|
||||
ammo_type = /obj/item/ammo_casing/a44
|
||||
max_ammo = 7
|
||||
multiple_sprites = 1
|
||||
|
||||
@@ -401,8 +401,8 @@
|
||||
name = "ammo clip (.50 AE)"
|
||||
icon_state = "clip_pistol"
|
||||
desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
|
||||
caliber = ".50AE"
|
||||
ammo_type = /obj/item/ammo_casing/a50ae
|
||||
caliber = ".44"
|
||||
ammo_type = /obj/item/ammo_casing/a44
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
|
||||
max_ammo = 9
|
||||
multiple_sprites = 1
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
/obj/item/ammo_casing/a357
|
||||
desc = "A .357 bullet casing."
|
||||
caliber = "357"
|
||||
caliber = ".357"
|
||||
projectile_type = /obj/item/projectile/bullet/pistol/strong
|
||||
|
||||
/*
|
||||
@@ -54,9 +54,9 @@
|
||||
* .50 Action Express
|
||||
*/
|
||||
|
||||
/obj/item/ammo_casing/a50ae
|
||||
desc = "A .50AE bullet casing."
|
||||
caliber = ".50AE"
|
||||
/obj/item/ammo_casing/a44
|
||||
desc = "A .44 bullet casing."
|
||||
caliber = ".44"
|
||||
projectile_type = /obj/item/projectile/bullet/pistol/strong
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user