cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Holsters will now show as 'occupied' on examine if something is in them.

Browse Source
This commit is contained in:
Zuhayr
2015-11-20 17:44:54 +10:30
parent 8c097c3361
commit 07874b9ca8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,11 @@
holstered.add_fingerprint(user) holstered.add_fingerprint(user)
w_class = max(w_class, holstered.w_class) w_class = max(w_class, holstered.w_class)
user.visible_message("<span class='notice'>[user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>") user.visible_message("<span class='notice'>[user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>")
name = "occupied [initial(name)]"
/obj/item/clothing/accessory/holster/proc/clear_holster()
holstered = null
name = initial(name)
/obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob) /obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
if(!holstered) if(!holstered)
@@ -40,8 +45,8 @@
) )
user.put_in_hands(holstered) user.put_in_hands(holstered)
holstered.add_fingerprint(user) holstered.add_fingerprint(user)
holstered = null
w_class = initial(w_class) w_class = initial(w_class)
clear_holster()
/obj/item/clothing/accessory/holster/attack_hand(mob/user as mob) /obj/item/clothing/accessory/holster/attack_hand(mob/user as mob)
if (has_suit) //if we are part of a suit if (has_suit) //if we are part of a suit