cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

More guns for the gun box

Browse Source 
- NT Mk98 (re)added.
- P92X added.
This commit is contained in:
Spades
2018-01-18 18:53:43 -05:00
parent cd2526c8a2
commit 8e42db3e7f
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/items/gunbox_vr.dm
View File

@@ -1,3 +1,18 @@
/obj/item/gunbox /obj/item/gunbox
name = "security sidearm box" name = "security sidearm box"
desc = "A secure box containing a security sidearm." 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 = input(user,"Would you prefer a pistol or a revolver?") as null|anything in 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)

5
code/modules/projectiles/guns/projectile/pistol_vr.dm
View File

@@ -1,2 +1,5 @@
/obj/item/weapon/gun/projectile/sec/flash /obj/item/weapon/gun/projectile/sec/flash
name = ".45 pistol" name = ".45 pistol"
/obj/item/weapon/gun/projectile/p92x/sec
magazine_type = /obj/item/ammo_magazine/m9mm/rubber