mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-26 01:52:29 +00:00
Altclick on a uniform will now unholster a holstered gun.
This commit is contained in:
@@ -824,6 +824,12 @@
|
||||
var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
|
||||
var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi'
|
||||
|
||||
/obj/item/clothing/under/AltClick(mob/user)
|
||||
for(var/obj/item/clothing/accessory in accessories)
|
||||
if(accessory.AltClick(user))
|
||||
return TRUE
|
||||
. = ..()
|
||||
|
||||
/obj/item/clothing/under/attack_hand(var/mob/user)
|
||||
if(LAZYLEN(accessories))
|
||||
..()
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
|
||||
/obj/item/clothing/mask/gas/sechailer/AltClick(mob/user)
|
||||
selectphrase()
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/mask/gas/sechailer/verb/selectphrase()
|
||||
set name = "Select gas mask phrase"
|
||||
|
||||
@@ -929,6 +929,7 @@
|
||||
|
||||
/obj/item/clothing/suit/caution/AltClick()
|
||||
toggle()
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/suit/caution/proc/toggle()
|
||||
if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr)) return
|
||||
|
||||
@@ -8,6 +8,12 @@
|
||||
var/holster_in = 'sound/items/holsterin.ogg'
|
||||
var/holster_out = 'sound/items/holsterout.ogg'
|
||||
|
||||
/obj/item/clothing/accessory/holster/AltClick(mob/user)
|
||||
if(holstered)
|
||||
unholster(user)
|
||||
return TRUE
|
||||
. = ..()
|
||||
|
||||
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
|
||||
if(holstered && istype(user))
|
||||
to_chat(user, "<span class='warning'>There is already \a [holstered] holstered here!</span>")
|
||||
@@ -34,7 +40,7 @@
|
||||
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)
|
||||
if(!holstered)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user