Skip to content

Commit

Permalink
Holster upgrade, badassery for everyone (#78642)
Browse files Browse the repository at this point in the history
Holsters now can be attached to _almost_ any clothing in the suit slot
(jackets, hazard vests, etc.)

Holsters now can hold Captain Antique gun and HoS gun (they are designed
to look like handguns, are normal-sized and can be fitted in the
backpack which is more convenient than a holster)

SecTech now has 4 energy holsters (which can only house medium-sized
energy/laser weaponry) in the premium section.
Holsters being possible to attach to the suits makes them more
convenient to use for those who have their belt slot occupied and don't
have armour while still wanting to have a badass holster. It won't be a
storage abuse as it is still more convenient and stealthy to keep guns
in the backpack (holsters can only hold normal-sized guns).

Captain Antique gun and HoS gun were the only normal-sized guns which
were left over from the holsters. Now Captains and HoSs can spin their
cool guns in their hands.

SecTech having holsters (can only house 1 gun) let Security more easier
access to more badass gear if they really want to. It won't change a lot
as they would've kept their gun on the armour anyway (which holster can
be clipped on).
:cl: DrDiasyl aka DrTuxedo
balance: Holsters can now be clipped to any suit, and house Captain
antique gun and HoS gun. You now can buy holsters from the SecTech
premium section.
/:cl:
  • Loading branch information
DrDiasyl authored and Gboster-0 committed Oct 3, 2023
1 parent d654c94 commit ef77724
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
18 changes: 14 additions & 4 deletions code/game/objects/items/storage/holsters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
))
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/e_gun/hos,
))

/obj/item/storage/belt/holster/energy
name = "energy shoulder holsters"
Expand All @@ -47,7 +49,9 @@
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/recharge/ebow,
))
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/e_gun/hos,
))

/obj/item/storage/belt/holster/energy/thermal
name = "thermal shoulder holsters"
Expand Down Expand Up @@ -100,6 +104,8 @@
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/e_gun/hos,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
))

Expand Down Expand Up @@ -173,8 +179,12 @@
/obj/item/gun/energy/recharge/ebow,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling
))
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/e_gun/hos,
))

atom_storage.silent = TRUE

/obj/item/storage/belt/holster/nukie
name = "operative holster"
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/_suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/tank/jetpack/oxygen/captain,
/obj/item/storage/belt/holster,
)
armor_type = /datum/armor/none
drop_sound = 'sound/items/handling/cloth_drop.ogg'
Expand Down
11 changes: 10 additions & 1 deletion code/modules/clothing/suits/jacket.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
/obj/item/clothing/suit/jacket
icon = 'icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
allowed = list(
/obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/toy,
/obj/item/storage/fancy/cigarettes,
/obj/item/lighter,
/obj/item/radio,
/obj/item/storage/belt/holster,
)
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
/obj/item/clothing/gloves/tackler = 5,
/obj/item/grenade/stingbang = 1,
/obj/item/watertank/pepperspray = 2,
/obj/item/storage/belt/holster/energy = 4,
/obj/item/ammo_box/magazine/m35 = 5, //monkestation edit: Paco sec
)
refill_canister = /obj/item/vending_refill/security
Expand Down

0 comments on commit ef77724

Please sign in to comment.