From 7ac2d6537b0c721d7963eb706cc677cdb74faf55 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 3 Jul 2022 05:06:46 -0400 Subject: [PATCH] Merge pull request #13249 from BonniePandora/petty-rage Changes the site manager's sidearm from a singular option to a choice instead --- code/game/objects/items/gunbox_vr.dm | 23 +++++++++++++++++++ .../closets/secure/security_vr.dm | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/gunbox_vr.dm b/code/game/objects/items/gunbox_vr.dm index 2770745f39..4dbbb98b27 100644 --- a/code/game/objects/items/gunbox_vr.dm +++ b/code/game/objects/items/gunbox_vr.dm @@ -19,3 +19,26 @@ if(istype(AM, /obj/item/weapon/gun)) to_chat(user, "You have chosen \the [AM]. Say hello to your new best friend.") qdel(src) + +/* + * Site Manager's Box + */ +/obj/item/gunbox/captain + name = "Captain's sidearm box" + desc = "A secure box containing a sidearm befitting of the site manager. Includes both lethal and non-lethal munitions, beware what's loaded!" + icon = 'icons/obj/storage.dmi' + icon_state = "gunbox" +/obj/item/gunbox/captain/attack_self(mob/living/user) + var/list/options = list() + options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["MT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["LAEP80 \"Thor\" (Stun/Laser)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) + options["MarsTech P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm) + var/choice = tgui_input_list(user,"Would you prefer a ballistic pistol or an energy gun?", "Gun!", options) + if(src && choice) + var/list/things_to_spawn = options[choice] + for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo. + var/atom/movable/AM = new new_type(get_turf(src)) + if(istype(AM, /obj/item/weapon/gun)) + to_chat(user, "You have chosen \the [AM]. Say hello to your new friend.") + qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index 1372d70623..330431b781 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -192,9 +192,9 @@ /obj/item/weapon/storage/lockbox/medal, /obj/item/device/radio/headset/heads/captain, /obj/item/device/radio/headset/heads/captain/alt, - /obj/item/weapon/gun/energy/gun, + /obj/item/gunbox/captain, /obj/item/weapon/melee/telebaton, /obj/item/device/flash, /obj/item/weapon/storage/box/ids, /obj/item/weapon/melee/rapier, - /obj/item/clothing/accessory/holster/machete/rapier) \ No newline at end of file + /obj/item/clothing/accessory/holster/machete/rapier)