From e2b8d9e2e1c5f09ca2a59f0d4513556bd85fcda7 Mon Sep 17 00:00:00 2001 From: CCC23 <91553605+CCC23@users.noreply.github.com> Date: Tue, 18 Oct 2022 23:10:19 -0500 Subject: [PATCH] Adds back purchasing the Autorifle and ammo through emagging the cargo supply console (#70518) Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com> Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/modules/cargo/exports/weapons.dm | 6 ++++++ code/modules/cargo/packs/security.dm | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index f171a0e3149..bceeab64b4c 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -74,3 +74,9 @@ unit_name = "pair" message = "of handcuffs" export_types = list(/obj/item/restraints/handcuffs) + +/datum/export/weapon/wt550 + cost = CARGO_CRATE_VALUE * 1.5 + unit_name = "WT-550 automatic rifle" + export_types = list(/obj/item/gun/ballistic/automatic/wt550) + diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 5c1dbbe0f5d..3789e079c7e 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -357,3 +357,26 @@ cost = CARGO_CRATE_VALUE * 7 contains = list(/obj/item/storage/belt/holster/thermal = 2) crate_name = "thermal pistol crate" + +/datum/supply_pack/security/armory/wt550 + name = "Recalled Weapon Pack" + desc = "Contains a set of old Nanotrasen brand autorifles recalled due to choking hazard." + cost = CARGO_CRATE_VALUE * 7 + hidden = TRUE + contains = list( + /obj/item/gun/ballistic/automatic/wt550 = 2, + /obj/item/ammo_box/magazine/wt550m9 = 2, + ) + crate_name = "Recalled rifle crate" + +/datum/supply_pack/security/armory/wt550ammo + name = "Recalled Ammo Pack" + desc = "Contains four 20-round magazine for the Recalled WT-550 Auto Rifle. \ + Each magazine is designed to facilitate rapid tactical reloads. Recalled due to Security demands." + cost = CARGO_CRATE_VALUE * 4 + hidden = TRUE + contains = list( + /obj/item/ammo_box/magazine/wt550m9 = 4, + ) + crate_name = "Ammo box" +