cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6905 from VOREStation/upstream-merge-6853

Browse Source 
[MIRROR] Makes holsters and webbing get along.
This commit is contained in:
Novacat
2020-03-18 09:21:43 -04:00
committed by GitHub
parent 0e4f956826 ab145c3b61
commit ae63f7b091
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/clothing/clothing_accessories.dm
View File

@@ -121,13 +121,24 @@
set name = "Remove Accessory"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
if(!istype(usr, /mob/living))
return
if(usr.stat)
return
var/obj/item/clothing/accessory/A
if(LAZYLEN(accessories))
A = input("Select an accessory to remove from [src]") as null|anything in accessories
var/accessory_amount = LAZYLEN(accessories)
if(accessory_amount)
if(accessory_amount == 1)
A = accessories[1] // If there's only one accessory, just remove it without any additional prompts.
else
A = input("Select an accessory to remove from \the [src]") as null|anything in accessories
if(A)
remove_accessory(usr,A)
if(!LAZYLEN(accessories))
src.verbs -= /obj/item/clothing/proc/removetie_verb
accessories = null

2
code/modules/clothing/under/accessories/holster.dm
View File

@@ -2,7 +2,7 @@
name = "shoulder holster"
desc = "A handgun holster."
icon_state = "holster"
slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
slot = ACCESSORY_SLOT_WEAPON
concealed_holster = 1
var/obj/item/holstered = null
var/list/can_hold //VOREStation Add