diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 57a1c25431..6fdb2b4f09 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -240,7 +240,7 @@ containername = "\improper shotgun flechette crate" group = "Ammo" -//------------------------For 88M4 ---------------- +//------------------------For vp70 ---------------- /datum/supply_packs/ammo_vp70_mag_box_ap name = "Magazine box (VP70, 16x mags)" diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index b1f3a1c9ef..1717d1e9de 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -501,7 +501,7 @@ list("M4A3 Service Pistol", round(scale * 25), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), list("SIDEARM NONLETHAL AMMUNITION", -1, null, null), - list("88M4 Rubber Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/vp70/rubber, VENDOR_ITEM_REGULAR), + list("VP70 Rubber Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/vp70/rubber, VENDOR_ITEM_REGULAR), list("M4A3 Rubber Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/rubber, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", -1, null, null), diff --git a/code/game/sound.dm b/code/game/sound.dm index 6bee74ba01..b9c9636093 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -433,8 +433,8 @@ S = pick('sound/weapons/gun_shotgun_tactical_1.ogg','sound/weapons/gun_shotgun_tactical_2.ogg','sound/weapons/gun_shotgun_tactical_3.ogg','sound/weapons/gun_shotgun_tactical_4.ogg') if("m4a3") S = pick('sound/weapons/gun_m4a3_1.ogg','sound/weapons/gun_m4a3_2.ogg','sound/weapons/gun_m4a3_3.ogg','sound/weapons/gun_m4a3_4.ogg','sound/weapons/gun_m4a3_5.ogg') - if("88m4") - S = pick('sound/weapons/gun_88m4_v7.ogg') + if("vp70") + S = pick('sound/weapons/gun_vp70_v7.ogg') if("gun_casing_shotgun") S = pick ('sound/bullets/bulletcasing_shotgun_fall1.ogg') if("gun_nsg23") diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 2a5c395427..d3fff0e05d 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -53,7 +53,7 @@ icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m4a3" item_state = "m4a3" - fire_sound = "88m4" + fire_sound = "vp70" current_mag = /obj/item/ammo_magazine/pistol flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED attachable_allowed = list( @@ -110,12 +110,12 @@ name = "\improper VP70 M5 service pistol" desc = "Standard issue semi-automatic USCM service pistol. Recently replacing the M4A3, it retains its predecessor's 9mm chambering but offers both a higher magazine capacity and a 3-round burst selector." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' - icon_state = "88m4" - item_state = "88m4" - fire_sound = "88m4" + icon_state = "vp70" + item_state = "vp70" + fire_sound = "vp70" firesound_volume = 20 - reload_sound = 'sound/weapons/gun_88m4_reload.ogg' - unload_sound = 'sound/weapons/gun_88m4_unload.ogg' + reload_sound = 'sound/weapons/gun_vp70_reload.ogg' + unload_sound = 'sound/weapons/gun_vp70_unload.ogg' current_mag = /obj/item/ammo_magazine/pistol/vp70 force = 8 flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED @@ -288,7 +288,7 @@ icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi' icon_state = "np92" item_state = "np92" - fire_sound = "88m4" + fire_sound = "vp70" current_mag = /obj/item/ammo_magazine/pistol/np92 flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED attachable_allowed = list( @@ -515,8 +515,8 @@ item_state = "es4" fire_sound = 'sound/weapons/gun_es4.ogg' firesound_volume = 20 - reload_sound = 'sound/weapons/gun_88m4_reload.ogg' - unload_sound = 'sound/weapons/gun_88m4_unload.ogg' + reload_sound = 'sound/weapons/gun_vp70_reload.ogg' + unload_sound = 'sound/weapons/gun_vp70_unload.ogg' current_mag = /obj/item/ammo_magazine/pistol/es4 force = 8 muzzle_flash = "muzzle_flash_blue" diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 9c678529e9..91e298cb25 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -405,7 +405,7 @@ name = "\improper PKL 'Double' Blaster" desc = "Sold to civilians and private corporations, the Pflager Katsumata Series-L Blaster is a premium double barrel sidearm that can fire two rounds at the same time. Usually found in the hands of combat synths and replicants, this hand cannon is worth more than the combined price of three Emanators. Originally commissioned by the Wallace Corporation, it has since been released onto public market as a luxury firearm." icon_state = "pkd_double" - item_state = "88m4" //placeholder + item_state = "vp70" //placeholder attachable_allowed = list( /obj/item/attachable/flashlight, diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm index 49fa3122de..ddcbefcb63 100644 --- a/code/modules/projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/magazines/pistols.dm @@ -60,52 +60,52 @@ //------------------------------------------------------- -//88M4 based off VP70 +//vp70 based off VP70 /obj/item/ammo_magazine/pistol/vp70 name = "\improper VP70 Magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol caliber = "9mm" - icon_state = "88m4" + icon_state = "vp70" max_rounds = 19 gun_type = /obj/item/weapon/gun/pistol/vp70 - ammo_band_icon = "+88m4_band" - ammo_band_icon_empty = "+88m4_band_e" + ammo_band_icon = "+vp70_band" + ammo_band_icon_empty = "+vp70_band_e" ammo_band_color = null /obj/item/ammo_magazine/pistol/vp70/ap name = "\improper VP70 AP magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol/ap caliber = "9mm" - icon_state = "88m4" + icon_state = "vp70" max_rounds = 19 gun_type = /obj/item/weapon/gun/pistol/vp70 ammo_band_color = AMMO_BAND_COLOR_AP /obj/item/ammo_magazine/pistol/vp70/extended // Unused - name = "\improper 88M4 extended magazine (9mm)" - icon_state = "88m4_mag_ex" + name = "\improper vp70 extended magazine (9mm)" + icon_state = "vp70_mag_ex" default_ammo = /datum/ammo/bullet/pistol caliber = "9mm" /obj/item/ammo_magazine/pistol/vp70/toxin - name = "\improper 88M4 toxic magazine (9mm)" + name = "\improper vp70 toxic magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol/ap/toxin ammo_band_color = AMMO_BAND_COLOR_TOXIN /obj/item/ammo_magazine/pistol/vp70/penetrating - name = "\improper 88M4 wall-penetrating magazine (9mm)" + name = "\improper vp70 wall-penetrating magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol/ap/penetrating ammo_band_color = AMMO_BAND_COLOR_PENETRATING /obj/item/ammo_magazine/pistol/vp70/incendiary - name = "\improper 88M4 incendiary magazine (9mm)" + name = "\improper vp70 incendiary magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol/incendiary ammo_band_color = AMMO_BAND_COLOR_INCENDIARY /obj/item/ammo_magazine/pistol/vp70/rubber - name = "\improper 88M4 rubber magazine (9mm)" + name = "\improper vp70 rubber magazine (9mm)" default_ammo = /datum/ammo/bullet/pistol/rubber ammo_band_color = AMMO_BAND_COLOR_RUBBER @@ -319,7 +319,7 @@ It is a modified Beretta 93R, and can fire three-round burst or single fire. Whe default_ammo = /datum/ammo/bullet/pistol/squash caliber = "9mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' - icon_state = "88m4" //PLACEHOLDER + icon_state = "vp70" //PLACEHOLDER max_rounds = 50 gun_type = /obj/item/weapon/gun/pistol/auto9 diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 9d841a0f8b..2455759ed6 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 80d160f57b..53e0a13027 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index de243a2d2a..90aacb3563 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi index 35241cf3a3..7e8537cca5 100644 Binary files a/icons/obj/items/weapons/guns/lineart.dmi and b/icons/obj/items/weapons/guns/lineart.dmi differ diff --git a/sound/weapons/gun_88m4_reload.ogg b/sound/weapons/gun_vp70_reload.ogg similarity index 100% rename from sound/weapons/gun_88m4_reload.ogg rename to sound/weapons/gun_vp70_reload.ogg diff --git a/sound/weapons/gun_88m4_unload.ogg b/sound/weapons/gun_vp70_unload.ogg similarity index 100% rename from sound/weapons/gun_88m4_unload.ogg rename to sound/weapons/gun_vp70_unload.ogg diff --git a/sound/weapons/gun_88m4_v7.ogg b/sound/weapons/gun_vp70_v7.ogg similarity index 100% rename from sound/weapons/gun_88m4_v7.ogg rename to sound/weapons/gun_vp70_v7.ogg