From 703436065bfc166f28534aa04c43a9c176d6ca15 Mon Sep 17 00:00:00 2001 From: Spock Date: Tue, 23 Jan 2024 21:56:03 -0800 Subject: [PATCH] Adds Ostwind to WO gun selection and gives them an ammo pouch (#4965) --- code/game/objects/items/weapons/storage/hardcases.dm | 1 + .../objects/structures/crates_lockers/closets/secure/security.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/items/weapons/storage/hardcases.dm b/code/game/objects/items/weapons/storage/hardcases.dm index 99b438a9657..b31fa09c573 100644 --- a/code/game/objects/items/weapons/storage/hardcases.dm +++ b/code/game/objects/items/weapons/storage/hardcases.dm @@ -500,6 +500,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user) var/list/options = list() // Moved the Galaxy to secondary selection options["Osprey - precision rifle"] = list(/obj/item/gun/projectile/automatic/omnirifle/scoped/fancy,/obj/item/ammo_magazine/heavy_rifle_408,/obj/item/ammo_magazine/heavy_rifle_408, /obj/item/ammo_magazine/heavy_rifle_408/rubber) options["SWAT - combat shotgun"] = list(/obj/item/gun/projectile/shotgun/pump/swat, /obj/item/ammo_magazine/ammobox/shotgun/beanbags/pepperball, /obj/item/ammo_magazine/ammobox/c10x24_small) + options["Ostwind - police carbine"] = list(/obj/item/gun/projectile/automatic/ostwind, /obj/item/ammo_magazine/light_rifle_257, /obj/item/ammo_magazine/light_rifle_257, /obj/item/ammo_magazine/light_rifle_257/rubber/pepperball) var/choice = input(user,"What type of equipment?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 08f1eb00ed4..88ec32de799 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -66,6 +66,7 @@ new /obj/item/device/holowarrant(src) new /obj/item/taperoll/police(src) new /obj/item/gunbox/warrantofficer(src) // Primary on their locker, secondary on their hardcase. + new /obj/item/storage/pouch/ammo(src) new /obj/item/clothing/gloves/stungloves(src) new /obj/item/device/taperecorder(src) new /obj/item/clipboard(src)