diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm index 2e439be6bab..ff26b11fbab 100644 --- a/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -29,9 +29,17 @@ desc = "A .45 bullet casing." caliber = ".45" projectile_type = /obj/projectile/bullet/c45_ap - + /obj/item/ammo_casing/c45/inc name = ".45 armor-piercing bullet casing" desc = "A .45 bullet casing." caliber = ".45" projectile_type = /obj/projectile/bullet/incendiary/c45 + +// 9x19mm (PP-95) + +/obj/item/ammo_casing/c9x19mm + name = "9x19mm bullet casing" + desc = "A 9.19mm bullet casing." + caliber = "9x19mm" + projectile_type = /obj/projectile/bullet/c9x19mm diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index 4c399f1e4de..9c6ac8d7b1a 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -27,6 +27,20 @@ ..() icon_state = "46x30mmtI-[round(ammo_count(),4)]" +/obj/item/ammo_box/magazine/plastikov9mm + name = "PP-95 magazine (9x19mm)" + icon_state = "9x19-50" + ammo_type = /obj/item/ammo_casing/c9x19mm + caliber = "9x19mm" + max_ammo = 50 + +/obj/item/ammo_box/magazine/plastikov9mm/update_icon() + . = ..() + if(ammo_count()) + icon_state = "9x19-50" + return + icon_state = "9x19-0" + /obj/item/ammo_box/magazine/uzim9mm name = "uzi magazine (9mm)" icon_state = "uzi9mm-32" diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 0d3631dcdc4..1232204987a 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -95,6 +95,20 @@ mag_display_ammo = TRUE empty_indicator = TRUE +/obj/item/gun/ballistic/automatic/plastikov + name = "\improper PP-95 SMG" + desc = "An ancient 9x19mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much." + icon_state = "plastikov" + inhand_icon_state = "plastikov" + mag_type = /obj/item/ammo_box/magazine/plastikov9mm + burst_size = 5 + spread = 25 + can_suppress = FALSE + actions_types = list() + mag_display = TRUE + empty_indicator = TRUE + fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg' + /obj/item/gun/ballistic/automatic/mini_uzi name = "\improper Type U3 Uzi" desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds." diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 37f420ac0ea..1ec17a17577 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -3,7 +3,7 @@ /obj/projectile/bullet/c45 name = ".45 bullet" damage = 35 - + /obj/projectile/bullet/c45_ap name = ".45 armor-piercing bullet" damage = 30 @@ -29,3 +29,9 @@ name = "4.6x30mm incendiary bullet" damage = 10 fire_stacks = 1 + +// 9x19mm (PP-95) + +/obj/projectile/bullet/c9x19mm + name = "9x19mm bullet" + damage = 10 diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 479917831b5..0a87f842015 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -510,11 +510,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) include_modes = list(/datum/game_mode/nuclear) exclude_modes = list(/datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/dangerous/bolt_action - name = "Surplus Rifle" - desc = "A horribly outdated bolt action weapon. You've got to be desperate to use this." - item = /obj/item/gun/ballistic/rifle/boltaction - cost = 1 +/datum/uplink_item/dangerous/surplus_smg + name = "Surplus SMG" + desc = "A horribly outdated automatic weapon. Why would you want to use this?" + item = /obj/item/gun/ballistic/automatic/plastikov + cost = 2 include_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/dangerous/revolver @@ -899,10 +899,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 6 include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/ammo/bolt_action - name = "Surplus Rifle Clip" - desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds." - item = /obj/item/ammo_box/a762 +/datum/uplink_item/ammo/surplus_smg + name = "Surplus SMG Magazine" + desc = "A cylindrical magazine designed for the PP-95 SMG." + item = /obj/item/ammo_box/magazine/plastikov9mm cost = 1 include_modes = list(/datum/game_mode/nuclear) illegal_tech = FALSE diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 3d73913c710..88768477d28 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index b2465e1ecec..f75ee2c0e04 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 9eccfe62533..f0789296895 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 06d590a9c6d..92bb9074bd3 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ