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

bandaid fixes some invisible guns (#7077)

Browse Source
This commit is contained in:
tacoguy7765093
2023-10-04 20:40:59 -05:00
committed by GitHub
parent 051c754727
commit c262e908b9
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,7 @@
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(MAT_STEEL = 1200)
caliber = "9mm"
max_ammo = 20
max_ammo = 50 //CHOMPedit
multiple_sprites = 1
/obj/item/ammo_magazine/m9mmt/empty
@@ -645,7 +645,7 @@
matter = list(MAT_STEEL = 10000)
ammo_type = /obj/item/ammo_casing/a545
w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
max_ammo = 50
max_ammo = 150 //CHOMPedit
multiple_sprites = 1
/obj/item/ammo_magazine/m545saw/empty
@@ -722,7 +722,7 @@
caliber = "7.62mm"
matter = list(MAT_STEEL = 2000)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
max_ammo = 25 //CHOMPedit
multiple_sprites = 1
/obj/item/ammo_magazine/m762/empty
@@ -737,7 +737,7 @@
name = "extended magazine (7.62mm)"
icon_state = "m762"
matter = list(MAT_STEEL = 4000)
max_ammo = 20
max_ammo = 50 //CHOMPedit
/obj/item/ammo_magazine/m762/ext/empty
initial_ammo = 0

18
code/modules/projectiles/ammunition/zz_magazines_ch.dm
View File

@@ -6,30 +6,30 @@
/obj/item/ammo_magazine/a57p90 //congratulations you are now being converted 5.7x28mm, a.k.a the round the p90 actually uses.
name = "\improper P90K Top-Mounted Magazine (5.7x28mm Standard)"
desc = "A 50-round magazine for the P90K, loaded with caseless ammunition."
desc = "A 125-round magazine for the P90K, loaded with caseless ammunition."
icon_state = "p90"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a57
matter = list(MAT_STEEL = 2500) // Reduced from 2700 to 2500 for rounding.
caliber = "5.7x28mm"
max_ammo = 50
max_ammo = 125
multiple_sprites = 1
/obj/item/ammo_magazine/a57p90/ap
name = "\improper P90K Top-Mounted Magazine (5.7x28mm Armor-Piercing)"
desc = "A 50-round magazine for the P90K, loaded with caseless armor-piercing ammunition."
desc = "A 125-round magazine for the P90K, loaded with caseless armor-piercing ammunition."
ammo_type = /obj/item/ammo_casing/a57/ap
matter = list(MAT_STEEL = 3000)
/obj/item/ammo_magazine/a57p90/rubber
name = "\improper P90K Top-Mounted Magazine (5.7x28mm Rubber)"
desc = "A 50-round magazine for the P90K, loaded with less-than-lethal caseless rubber ammunition."
desc = "A 125-round magazine for the P90K, loaded with less-than-lethal caseless rubber ammunition."
ammo_type = /obj/item/ammo_casing/a57/rubber
matter = list(MAT_STEEL = 2000) // Slightly cheaper.
/obj/item/ammo_magazine/a57p90/hp
name = "\improper P90K Top-Mounted Magazine (5.7x28mm Hollow-Point)"
desc = "A 50-round magazine for the P90K, loaded with caseless hollow-point ammunition."
desc = "A 125-round magazine for the P90K, loaded with caseless hollow-point ammunition."
ammo_type = /obj/item/ammo_casing/a57/hp
matter = list(MAT_STEEL = 3000)
@@ -42,18 +42,18 @@
/obj/item/ammo_magazine/m10mm
name = "\improper C-20R Magazine (10mm Standard)"
desc = "A 20-round magazine for the C-20R, loaded with caseless ammunition."
desc = "A 50-round magazine for the C-20R, loaded with caseless ammunition."
icon_state = "10mm"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a10mm
matter = list(MAT_STEEL = 3000)
caliber = "10mm"
max_ammo = 20
max_ammo = 50
multiple_sprites = 1
/obj/item/ammo_magazine/m10mm/ap
name = "\improper C-20R Magazine (10mm Armor-Piercing)"
desc = "A 20-round magazine for the C-20R, loaded with caseless armor-piercing ammunition."
desc = "A 50-round magazine for the C-20R, loaded with caseless armor-piercing ammunition."
matter = list(MAT_STEEL = 3500)
ammo_type = /obj/item/ammo_casing/a10mm/ap
@@ -680,4 +680,4 @@
/obj/item/ammo_magazine/s45lc/rifle
name = "speedloader (.45 LC +P)"
icon_state = "RI44"
ammo_type = /obj/item/ammo_casing/a45lc/rifle
ammo_type = /obj/item/ammo_casing/a45lc/rifle

6
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -254,7 +254,7 @@
/obj/item/weapon/gun/projectile/automatic/z8/update_icon(var/ignore_inhands)
..()
if(ammo_magazine)
icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]"
icon_state = "carbine-[round(ammo_magazine.stored_ammo.len, 5)]" //CHOMPedit
else
icon_state = "carbine"
if(!ignore_inhands) update_held_icon()
@@ -279,7 +279,7 @@
description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by professional armed forces across human space."
icon = 'icons/obj/64x32guns_ch.dmi' //Chomp EDIT
icon_expected_width = 64 //Chomp EDIT
icon_state = "l6closed100"
icon_state = "l6closed150" //chompEDIT
item_state = "l6closed"
wielded_item_state = "genericLMG-wielded"
w_class = ITEMSIZE_HUGE //CHOMP Edit.
@@ -333,7 +333,7 @@
icon_state = "l6[cover_open ? "open" : "closed"]mag"
item_state = icon_state
else
icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]"
icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 50) : "-empty"]" //CHOMPedit
item_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"]"
update_held_icon()

6
code/modules/projectiles/guns/projectile/automatic_ch.dm
View File

@@ -46,7 +46,7 @@
)
/obj/item/weapon/gun/projectile/automatic/p90/update_icon() // Code for visually updating the item depending on current magazine capacity.
icon_state = "p90smgnew-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]"
icon_state = "p90smgnew-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "empty"]" //Theres sprites that wont be used because of magazine refactor
// C-20R
@@ -86,7 +86,7 @@
)
/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
icon_state = "c20r-[ammo_magazine ? round(ammo_magazine.stored_ammo.len,4) : "empty"]"
icon_state = "c20r-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 10) : "empty"]"
/obj/item/weapon/gun/projectile/automatic/c20r/rubber
magazine_type = /obj/item/ammo_magazine/m10mm/rubber
@@ -124,4 +124,4 @@
if(ammo_magazine)
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)]-empty"
icon_state = "[initial(icon_state)]-empty"

6
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -1217,7 +1217,7 @@
/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
..()
if(ammo_magazine)
icon_state = "c20r-[round(ammo_magazine.stored_ammo.len,4)]"
icon_state = "c20r-[round(ammo_magazine.stored_ammo.len,10)]"
else
icon_state = "c20r"
return
@@ -1252,7 +1252,7 @@
/obj/item/weapon/gun/projectile/automatic/wt550
muzzle_velocity = 375 //Guestimation
icon = 'icons/obj/64x32guns_ch.dmi'
icon_state = "wt550-20"
icon_state = "wt550-50"
icon_expected_height = 32
icon_expected_width = 64
@@ -1278,7 +1278,7 @@
/obj/item/weapon/gun/projectile/automatic/z8/update_icon()
..()
if(ammo_magazine)
icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]"
icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,5)]"
else
icon_state = "carbine-e"
return