cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
ItsSelis
2022-07-03 16:18:28 +02:00
parent 11852cb017 456d3bbc56
commit 7e75bf19a6
29 changed files with 201 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/gunbox_vr.dm
+23
View File
@@ -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)
code/game/objects/items/weapons/explosives_vr.dm
+1 -1
View File
@@ -8,7 +8,7 @@
target = src
var/turf/T = get_turf(target)
if(T.z in using_map.station_levels)
if((T.z in using_map.station_levels) || (T.z in using_map.admin_levels))
target.visible_message("<span class='danger'>\The [src] lets out a loud beep as safeties trigger, before imploding and falling apart.</span>")
target.cut_overlay(image_overlay, TRUE)
qdel(src)
code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+2 -2
View File
@@ -189,9 +189,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)
/obj/item/clothing/accessory/holster/machete/rapier)