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

Renamed SVD mag to be consistent per request.

Browse Source 
It's just a 10 round 762 magazine. It's compatible with the STS.
This commit is contained in:
Spades
2016-06-06 22:03:03 -04:00
parent baf8ca5dcc
commit e51da6c35b
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/uplink/ammunition.dm
View File

@@ -60,14 +60,14 @@
name = "20rnd Rifle Magazine (7.62mm AP)" name = "20rnd Rifle Magazine (7.62mm AP)"
path = /obj/item/ammo_magazine/c762/ap path = /obj/item/ammo_magazine/c762/ap
/datum/uplink_item/item/ammo/SVD /datum/uplink_item/item/ammo/s762
name = "10rnd Rifle Magazine (7.62mm)" name = "10rnd Rifle Magazine (7.62mm)"
path = /obj/item/ammo_magazine/SVD path = /obj/item/ammo_magazine/s762
item_cost = 1 // Half the capacity. item_cost = 1 // Half the capacity.
/datum/uplink_item/item/ammo/SVD/ap /datum/uplink_item/item/ammo/s762/ap
name = "10rnd Rifle Magazine (7.62mm AP)" name = "10rnd Rifle Magazine (7.62mm AP)"
path = /obj/item/ammo_magazine/SVD/ap path = /obj/item/ammo_magazine/s762/ap
/datum/uplink_item/item/ammo/a10mm /datum/uplink_item/item/ammo/a10mm
name = "SMG Magazine (10mm)" name = "SMG Magazine (10mm)"

4
code/game/machinery/autolathe_datums.dm
View File

@@ -513,9 +513,9 @@
hidden = 1 hidden = 1
/////// 7.62 /////// 7.62
/datum/autolathe/recipe/rifle_SVD /datum/autolathe/recipe/rifle_small_762
name = "10rnd rifle magazine (7.62mm)" name = "10rnd rifle magazine (7.62mm)"
path = /obj/item/ammo_magazine/SVD path = /obj/item/ammo_magazine/s762
category = "Arms and Ammunition" category = "Arms and Ammunition"
hidden = 1 hidden = 1

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

@@ -387,8 +387,8 @@
/obj/item/ammo_magazine/c762/empty /obj/item/ammo_magazine/c762/empty
initial_ammo = 0 initial_ammo = 0
/obj/item/ammo_magazine/SVD /obj/item/ammo_magazine/s762 // 's' for small!
name = "\improper SVD magazine (7.62mm)" name = "magazine (7.62mm)"
icon_state = "SVD" icon_state = "SVD"
mag_type = MAGAZINE mag_type = MAGAZINE
caliber = "a762" caliber = "a762"
@@ -397,11 +397,11 @@
max_ammo = 10 max_ammo = 10
multiple_sprites = 1 multiple_sprites = 1
/obj/item/ammo_magazine/SVD/empty /obj/item/ammo_magazine/s762/empty
initial_ammo = 0 initial_ammo = 0
/obj/item/ammo_magazine/SVD/ap /obj/item/ammo_magazine/s762/ap
name = "\improper SVD magazine (7.62mm armor-piercing)" name = "magazine (7.62mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a762/ap ammo_type = /obj/item/ammo_casing/a762/ap
/obj/item/ammo_magazine/clip/a762 /obj/item/ammo_magazine/clip/a762

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

@@ -61,7 +61,7 @@
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
load_method = MAGAZINE load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/c762 magazine_type = /obj/item/ammo_magazine/c762
allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/SVD) allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/s762)
one_handed_penalty = 4 one_handed_penalty = 4
@@ -73,7 +73,7 @@
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
..() ..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/SVD)) if(istype(ammo_magazine,/obj/item/ammo_magazine/s762))
icon_state = "arifle-small" icon_state = "arifle-small"
else else
icon_state = (ammo_magazine)? "arifle" : "arifle-empty" icon_state = (ammo_magazine)? "arifle" : "arifle-empty"