Merge pull request #9557 from kingofkosmos/altclickghosttogglefix

Alt-click-toggles now do proper checks
This commit is contained in:
Cheridan
2015-05-20 08:03:25 -05:00
5 changed files with 34 additions and 8 deletions
+8 -2
View File
@@ -315,9 +315,15 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
..()
/obj/item/clothing/under/AltClick()
/obj/item/clothing/under/AltClick(var/mob/user)
..()
rolldown()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
return
else
rolldown()
/obj/item/clothing/under/verb/jumpsuit_adjust()
set name = "Adjust Jumpsuit Style"
+8 -1
View File
@@ -19,7 +19,14 @@
/obj/item/clothing/head/soft/AltClick(var/mob/user)
flip(user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
return
else
flip(user)
/obj/item/clothing/head/soft/proc/flip(var/mob/user)
+8 -1
View File
@@ -16,7 +16,14 @@
adjustmask(user)
/obj/item/clothing/mask/breath/AltClick(var/mob/user)
adjustmask(user)
..()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
return
else
adjustmask(user)
/obj/item/clothing/mask/breath/examine(mob/user)
..()
+8 -2
View File
@@ -53,9 +53,15 @@
//Toggle exosuits for different aesthetic styles (hoodies, suit jacket buttons, etc)
/obj/item/clothing/suit/toggle/AltClick()
/obj/item/clothing/suit/toggle/AltClick(var/mob/user)
..()
suit_toggle()
if(!user.canUseTopic(user))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
return
else
suit_toggle(user)
/obj/item/clothing/suit/toggle/ui_action_click()
suit_toggle()