From 3c10cc1aeef6764fc836dc0548038bdd68fe2699 Mon Sep 17 00:00:00 2001 From: GhostActual Date: Sun, 20 Mar 2022 00:03:01 -0400 Subject: [PATCH] Base Commit --- code/game/objects/items/gunbox.dm | 4 ++-- code/game/objects/items/gunbox_vr.dm | 22 +++------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/code/game/objects/items/gunbox.dm b/code/game/objects/items/gunbox.dm index 7b998c169d3..d97aa51ba08 100644 --- a/code/game/objects/items/gunbox.dm +++ b/code/game/objects/items/gunbox.dm @@ -1,5 +1,5 @@ /* - * Detective Lethal + * Sidearm Lethal */ /obj/item/gunbox name = "sidearm box" @@ -23,7 +23,7 @@ qdel(src) /* - * Detective Stun + * Sidearm Stun */ /obj/item/gunbox/stun name = "non-lethal sidearm box" diff --git a/code/game/objects/items/gunbox_vr.dm b/code/game/objects/items/gunbox_vr.dm index 377fa172afd..2770745f39b 100644 --- a/code/game/objects/items/gunbox_vr.dm +++ b/code/game/objects/items/gunbox_vr.dm @@ -1,22 +1,6 @@ -/obj/item/gunbox - name = "security sidearm box" - desc = "A secure box containing a security sidearm." - -/obj/item/gunbox/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/rubber) - options["NT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) - options["SW 625 Revolver (.45)"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) - options["P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/sec, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber) - var/choice = tgui_input_list(user,"Would you prefer a pistol or a revolver?", "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) - +/* + * Shotgun Box + */ /obj/item/gunbox/warden name = "warden's shotgun case" desc = "A secure guncase containing the warden's beloved shotgun."