cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Base Commit

Browse Source 
Whoops

Not supposed to be here

Idea I had in the middle of the night that wanted to add
This commit is contained in:
GhostActual
2022-03-18 23:50:00 -04:00
parent da1bd80a5c
commit 47b9f404f6
14 changed files with 299 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/gunbox.dm
+24 -3
View File
@@ -1,15 +1,36 @@
/*
* Detective Lethal
*/
/obj/item/gunbox
name = "detective's gun box"
desc = "A secure box containing a Detective's sidearm."
name = "sidearm box"
desc = "A secure box containing a lethal sidearm."
icon = 'icons/obj/storage.dmi'
icon_state = "gunbox"
w_class = ITEMSIZE_HUGE
/obj/item/gunbox/attack_self(mob/living/user)
var/list/options = list()
options[".45 Pistol"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
options[".45 Revolver"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/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)
/*
* Detective Stun
*/
/obj/item/gunbox/stun
name = "non-lethal sidearm box"
desc = "A secure box containing a non-lethal sidearm."
/obj/item/gunbox/stun/attack_self(mob/living/user)
var/list/options = list()
options["Stun Revolver"] = list(/obj/item/weapon/gun/energy/stunrevolver/detective, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
options["Taser"] = list(/obj/item/weapon/gun/energy/taser, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
var/choice = tgui_input_list(user,"Please, select an option.", "Stun 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.
code/game/objects/random/guns_and_ammo.dm
+3 -3
View File
@@ -460,9 +460,9 @@
/obj/item/ammo_magazine/s44
),
prob(1);list(
/obj/item/weapon/gun/projectile/revolver/webley/auto,
/obj/item/ammo_magazine/s44,
/obj/item/ammo_magazine/s44
/obj/item/weapon/gun/projectile/revolver/consul,
/obj/item/ammo_magazine/s44/rubber,
/obj/item/ammo_magazine/s44/rubber
)
)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -1
View File
@@ -236,7 +236,7 @@
/obj/item/clothing/accessory/badge/holo/detective,
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
/obj/item/weapon/gun/energy/stunrevolver/vintage,
/obj/item/gunbox/stun,
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,