From 1eb3a37f9084901465a5f564641df471c2f04b38 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 31 Jul 2023 21:54:44 +0200 Subject: [PATCH 1/3] remove lethal and ruber ammo that the CL as in is lock box but can't use with the gun he as in is safe. adding the possibility to buy extra ammo as CL --- code/game/objects/items/devices/portable_vendor.dm | 3 +++ code/game/objects/items/storage/lockbox.dm | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm index 0b96b859c4ac..875087efbff0 100644 --- a/code/game/objects/items/devices/portable_vendor.dm +++ b/code/game/objects/items/devices/portable_vendor.dm @@ -270,4 +270,7 @@ list("MISC", 0, null, null, null), list("Hollow Cane", 15, /obj/item/weapon/pole/fancy_cane/this_is_a_knife, "white", "A hollow cane that can store any commonplace sharp weaponry. Said weapon not included."), + + list("AMMO", 0, null, null, null), + list("ES-4 stun magazine", 10, /obj/item/ammo_magazine/pistol/es4, "white", "Holds 19 rounds of specialized Conductive 9mm."), ) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index aa9d91921fae..ed78dd74676f 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -53,12 +53,6 @@ name = "\improper Wey-Yu equipment lockbox" req_access = list(ACCESS_WY_CORPORATE) -/obj/item/storage/lockbox/loyalty/fill_preset_inventory() - new /obj/item/ammo_magazine/pistol/mod88(src) - new /obj/item/ammo_magazine/pistol/mod88(src) - new /obj/item/ammo_magazine/pistol/mod88/rubber(src) - new /obj/item/ammo_magazine/pistol/mod88/rubber(src) - /obj/item/storage/lockbox/cluster name = "lockbox of cluster flashbangs" From 8108fa670ddb0bc8e499f527288e317c919b0a90 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 1 Aug 2023 09:21:47 +0200 Subject: [PATCH 2/3] fix breaking the code there... --- code/game/objects/items/storage/lockbox.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index ed78dd74676f..28732ccf4e2c 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -53,6 +53,7 @@ name = "\improper Wey-Yu equipment lockbox" req_access = list(ACCESS_WY_CORPORATE) +/obj/item/storage/lockbox/loyalty/fill_preset_inventory() /obj/item/storage/lockbox/cluster name = "lockbox of cluster flashbangs" From b0686521ea6271683e1c9c7cce736bf00d745678 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 1 Aug 2023 17:42:57 +0200 Subject: [PATCH 3/3] adding three mag for the es4 to the wy lockbox --- code/game/objects/items/storage/lockbox.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 28732ccf4e2c..30be2f6bc2e2 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -54,6 +54,9 @@ req_access = list(ACCESS_WY_CORPORATE) /obj/item/storage/lockbox/loyalty/fill_preset_inventory() + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) /obj/item/storage/lockbox/cluster name = "lockbox of cluster flashbangs"