cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Purchasing weapon goodie packs require weapon permits, rather than actually being a head of security (includes other small changes) [MDB IGNORE] (#19133)

Browse Source 
* Purchasing weapon goodie packs require weapon permits, rather than actually being a head of security (includes other small changes)

* Update inventory.dm

* Update goodies.dm

* Update inventory.dm

* update modular

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-02-19 19:19:59 +00:00
committed by GitHub
co-authored by necromanceranne lessthanthree Tom
parent a2cb8c5c0c
commit 9435aeb31d
5 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/holsters.dm
+19 -6
View File
@@ -31,11 +31,11 @@
/obj/item/gun/energy/laser/thermal
))
/obj/item/storage/belt/holster/thermal
name = "thermal shoulder holsters"
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Meant to hold a twinned pair of thermal pistols, but can fit several kinds of energy handguns as well."
/obj/item/storage/belt/holster/energy
name = "energy shoulder holsters"
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry."
/obj/item/storage/belt/holster/thermal/Initialize(mapload)
/obj/item/storage/belt/holster/energy/Initialize(mapload)
. = ..()
atom_storage.max_slots = 2
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
@@ -44,15 +44,28 @@
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling,
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/recharge/ebow,
))
/obj/item/storage/belt/holster/thermal/PopulateContents()
/obj/item/storage/belt/holster/energy/thermal
name = "thermal shoulder holsters"
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Meant to hold a twinned pair of thermal pistols, but can fit several kinds of energy handguns as well."
/obj/item/storage/belt/holster/energy/thermal/PopulateContents()
generate_items_inside(list(
/obj/item/gun/energy/laser/thermal/inferno = 1,
/obj/item/gun/energy/laser/thermal/cryo = 1,
),src)
/obj/item/storage/belt/holster/energy/disabler
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry. A production stamp indicates that it was shipped with a disabler."
/obj/item/storage/belt/holster/energy/disabler/PopulateContents()
generate_items_inside(list(
/obj/item/gun/energy/disabler = 1,
),src)
/obj/item/storage/belt/holster/detective
name = "detective's holster"
desc = "A holster able to carry handguns and some ammo. WARNING: Badasses only."