diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index a83eb4b38f7..d4819377bfe 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -75,7 +75,7 @@ /obj/item/ammo_casing/c45nostamina desc = "A .45 bullet casing." caliber = ".45" - projectile_type = /obj/item/projectile/bullet/weakbullet3 + projectile_type = /obj/item/projectile/bullet/midbullet3 /obj/item/ammo_casing/n762 desc = "A 7.62x38mmR bullet casing." diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 4ca4137b335..a056d8e95c2 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -247,11 +247,11 @@ /obj/item/ammo_box/magazine/smgm45 name = "SMG magazine (.45)" - icon_state = "c20r45-20" + icon_state = "c20r45-24" origin_tech = "combat=2" - ammo_type = /obj/item/ammo_casing/c45 + ammo_type = /obj/item/ammo_casing/c45nostamina caliber = ".45" - max_ammo = 20 + max_ammo = 24 /obj/item/ammo_box/magazine/smgm45/update_icon() ..() diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 0dc1f50c1fb..0f707737ac1 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -92,13 +92,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once. item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle cost = 14 // normally 16 -/datum/uplink_item/nukeoffer/m90gl - name = "M-90gl bundle" - desc = "A premium offer: Pick up the M-90gl, along with a magazine, some grenades, and a pack of cigarettes \ - for a 'killer' price." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle - cost = 15 // normally 18 - /datum/uplink_item/nukeoffer/bulldog name = "Bulldog bundle" desc = "Lean and mean: Optimised for people that want to get up close and personal. Contains the popular \ @@ -174,19 +167,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once. item = /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted include_modes = list(/datum/game_mode/gang) -/datum/uplink_item/dangerous/carbine - name = "M-90gl Carbine" - desc = "A fully-loaded, specialized three-round burst carbine that fires 30-round 5.56mm magazines with a togglable \ - underslung 40mm grenade launcher." - item = /obj/item/weapon/gun/projectile/automatic/m90 - cost = 12 - surplus = 50 - include_modes = list(/datum/game_mode/nuclear) - -/datum/uplink_item/dangerous/carbine/unrestricted - item = /obj/item/weapon/gun/projectile/automatic/m90/unrestricted - include_modes = list(/datum/game_mode/gang) - /datum/uplink_item/dangerous/machinegun name = "L6 Squad Automatic Weapon" desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \ @@ -439,22 +419,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once. cost = 20 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/ammo/carbine - name = "5.56 Toploader Magazine" - desc = "An additional 30-round 5.56 magazine; sutable for use with the M-90gl carbine. \ - These bullets don't have the punch to knock most targets down, but dish out higher overall damage." - item = /obj/item/ammo_box/magazine/m556 - cost = 4 - include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) - -/datum/uplink_item/ammo/a40mm - name = "40mm Grenade Box" - desc = "A box of 4 additional 40mm HE grenades for use with the M-90gl's underbarrel grenade launcher. \ - Your teammates will ask you to not shoot these down small hallways." - item = /obj/item/ammo_box/a40mm - cost = 5 - include_modes = list(/datum/game_mode/nuclear) - /datum/uplink_item/ammo/machinegun cost = 6 surplus = 0 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 3a57dbbcfd3..fc76fa407f4 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 17a31f7bb10..60228c44e70 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ