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

[MIRROR] A bunch of tweaks to holsters. (#419)

Browse Source 
* A bunch of tweaks to holsters. (#53031)

Regular holsters:

Can no longer hold pulse carbines.
Can now hold toy pistols.
Detective's holster:

Can no longer carry ALL ammo box types, it's crazy this was possible.
Can now carry all handguns instead of only revolvers, their ammo, the mini e-gun, and the toy pistol and its magazines.
Chameleon holster:

Can no longer hold pulse carbines.
Can now hold all the ammo of guns it can hold (handguns and revolvers), the toy pistol and its magazine, and the small energy crossbow.
Operative holster:

Can now hold... basically everything gun related. All guns, all ammo (except ammo boxes), all grenades.

Descriptions of all holsters changed to reflect this.

* A bunch of tweaks to holsters.

Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-19 20:07:14 -04:00
committed by GitHub
co-authored by uomo
parent 94960eaefc
commit d9344f6f89
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/holsters.dm
+33 -15
View File
@@ -1,7 +1,7 @@
/obj/item/storage/belt/holster
name = "shoulder holster"
desc = "A rather plain but still badass looking holster with a single pouch that can hold a small firearm."
desc = "A rather plain but still cool looking holster that can hold a handgun."
icon_state = "holster"
inhand_icon_state = "holster"
worn_icon_state = "holster"
@@ -24,15 +24,15 @@
STR.set_holdable(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/automatic/toy/pistol,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/pulse/carbine,
/obj/item/gun/energy/dueling
))
/obj/item/storage/belt/holster/detective
name = "detective's holster"
desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
desc = "A holster able to carry handguns and some ammo. WARNING: Badasses only."
/obj/item/storage/belt/holster/detective/ComponentInitialize()
. = ..()
@@ -40,8 +40,18 @@
STR.max_items = 3
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/ammo_box/magazine/m9mm, // Pistol magazines.
/obj/item/ammo_box/magazine/m9mm_aps,
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m50,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box,
/obj/item/ammo_box/c38, // Revolver speedloaders.
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a762,
/obj/item/gun/ballistic/automatic/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling
))
@@ -54,7 +64,7 @@
/obj/item/storage/belt/holster/chameleon
name = "syndicate holster"
desc = "A two pouched hip holster that uses chameleon technology to disguise itself and any guns in it."
desc = "A hip holster that uses chameleon technology to disguise itself, it can hold handguns and their ammo."
icon_state = "syndicate_holster"
inhand_icon_state = "syndicate_holster"
worn_icon_state = "syndicate_holster"
@@ -90,16 +100,25 @@
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/m9mm_aps,
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m50,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a762,
/obj/item/gun/ballistic/automatic/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol,
/obj/item/gun/energy/kinetic_accelerator/crossbow,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/pulse/carbine,
/obj/item/gun/energy/dueling
))
/obj/item/storage/belt/holster/nukie
name = "operative holster"
desc = "A deep shoulder holster capable of holding almost any form of ballistic weaponry."
desc = "A deep shoulder holster capable of holding almost any form of firearm and its ammo."
icon_state = "syndicate_holster"
inhand_icon_state = "syndicate_holster"
worn_icon_state = "syndicate_holster"
@@ -111,12 +130,11 @@
STR.max_items = 2
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
/obj/item/gun/ballistic/automatic,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/pulse/carbine,
/obj/item/gun/energy/dueling,
/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/rocketlauncher
/obj/item/gun, // ALL guns.
/obj/item/ammo_box/magazine, // ALL magazines.
/obj/item/ammo_box/c38, //There isn't a speedloader parent type, so I just put these three here by hand.
/obj/item/ammo_box/a357, //I didn't want to just use /obj/item/ammo_box, because then this could hold huge boxes of ammo.
/obj/item/ammo_box/a762,
/obj/item/ammo_casing, // For shotgun shells, rockets, launcher grenades, and a few other things.
/obj/item/grenade, // All regular grenades, the big grenade launcher fires these.
))