For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore * Bugfixing, sanity checks etc. * Update hos.dm * Sprite fixed * Automatic changelog compile [ci skip] * HoS Weapon Selection * Icons * Clamp fix, removing rogue items from ye olde list * Update ammo.dmi * Requested Changes Part 1 * Beacon fixed (kind of) * Subtypes fix * User * Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty * redundant item * Adds an examine notice on how to remove the magazine * Requested Changes * Icons Co-authored-by: Changelogs <action@github.com>
This commit is contained in:
@@ -115,6 +115,20 @@
|
||||
new /obj/item/toy/crayon/spraycan(src)
|
||||
new /obj/item/clothing/shoes/sandal(src)
|
||||
|
||||
/obj/item/choice_beacon/hosgun
|
||||
name = "personal weapon beacon"
|
||||
desc = "Use this to summon your personal Head of Security issued firearm!"
|
||||
|
||||
/obj/item/choice_beacon/hosgun/generate_display_names()
|
||||
var/static/list/hos_gun_list
|
||||
if(!hos_gun_list)
|
||||
hos_gun_list = list()
|
||||
var/list/templist = subtypesof(/obj/item/storage/secure/briefcase/hos/) //we have to convert type = name to name = type, how lovely!
|
||||
for(var/V in templist)
|
||||
var/atom/A = V
|
||||
hos_gun_list[initial(A.name)] = A
|
||||
return hos_gun_list
|
||||
|
||||
/obj/item/skub
|
||||
desc = "It's skub."
|
||||
name = "skub"
|
||||
|
||||
@@ -147,6 +147,35 @@
|
||||
for(var/i = 0, i < STR.max_items - 2, i++)
|
||||
new /obj/item/stack/spacecash/c1000(src)
|
||||
|
||||
/obj/item/storage/secure/briefcase/mws_pack
|
||||
name = "\improper \'MWS\' gun kit"
|
||||
desc = "A storage case for a multi-purpose handgun. Variety hour!"
|
||||
|
||||
/obj/item/storage/secure/briefcase/mws_pack/PopulateContents()
|
||||
new /obj/item/gun/ballistic/revolver/mws(src)
|
||||
new /obj/item/ammo_box/magazine/mws_mag(src)
|
||||
for(var/path in subtypesof(/obj/item/ammo_casing/mws_batt))
|
||||
new path(src)
|
||||
|
||||
/obj/item/storage/secure/briefcase/hos/mws_pack_hos
|
||||
name = "\improper \'MWS\' gun kit"
|
||||
desc = "A storage case for a multi-purpose handgun. Variety hour!"
|
||||
|
||||
/obj/item/storage/secure/briefcase/hos/mws_pack_hos/PopulateContents()
|
||||
new /obj/item/gun/ballistic/revolver/mws(src)
|
||||
new /obj/item/ammo_box/magazine/mws_mag(src)
|
||||
new /obj/item/ammo_casing/mws_batt/lethal(src)
|
||||
new /obj/item/ammo_casing/mws_batt/lethal(src)
|
||||
new /obj/item/ammo_casing/mws_batt/stun(src)
|
||||
new /obj/item/ammo_casing/mws_batt/stun(src)
|
||||
new /obj/item/ammo_casing/mws_batt/ion(src)
|
||||
|
||||
/obj/item/storage/secure/briefcase/hos/multiphase_box
|
||||
name = "\improper X-01 Multiphase energy gun box"
|
||||
desc = "A storage case for a high-tech energy firearm."
|
||||
|
||||
/obj/item/storage/secure/briefcase/mws_pack_hos/PopulateContents()
|
||||
new /obj/item/gun/energy/e_gun/hos(src)
|
||||
|
||||
// -----------------------------
|
||||
// Secure Safe
|
||||
@@ -183,4 +212,4 @@
|
||||
return attack_self(user)
|
||||
|
||||
/obj/item/storage/secure/safe/HoS
|
||||
name = "head of security's safe"
|
||||
name = "head of security's safe"
|
||||
@@ -76,12 +76,13 @@
|
||||
new /obj/item/storage/box/flashbangs(src)
|
||||
new /obj/item/shield/riot/tele(src)
|
||||
new /obj/item/storage/belt/security/full(src)
|
||||
new /obj/item/gun/energy/e_gun/hos(src)
|
||||
new /obj/item/choice_beacon/hosgun(src)
|
||||
new /obj/item/flashlight/seclite(src)
|
||||
new /obj/item/pinpointer/nuke(src)
|
||||
new /obj/item/circuitboard/machine/techfab/department/security(src)
|
||||
new /obj/item/storage/photo_album/HoS(src)
|
||||
new /obj/item/clothing/suit/hooded/wintercoat/hos(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/warden
|
||||
name = "\proper warden's locker"
|
||||
req_access = list(ACCESS_ARMORY)
|
||||
|
||||
Reference in New Issue
Block a user