Fixes some other ghost interaction issues.

This commit is contained in:
AnturK
2016-02-26 23:13:13 +01:00
parent 3e83932840
commit 59774fc0fb
5 changed files with 17 additions and 14 deletions
+3 -1
View File
@@ -137,7 +137,9 @@
actions_types = list(/datum/action/item_action/toggle_barrier_spread)
var/mode = SINGLE
/obj/item/weapon/grenade/barrier/AltClick(mob/user)
/obj/item/weapon/grenade/barrier/AltClick(mob/living/user)
if(!istype(user) || user.incapacitated())
return
toggle_mode(user)
/obj/item/weapon/grenade/barrier/proc/toggle_mode(mob/user)
+2 -3
View File
@@ -48,9 +48,8 @@ var/list/doppler_arrays = list()
src.dir = turn(src.dir, 90)
return
/obj/machinery/doppler_array/AltClick(mob/user)
..()
if(user.incapacitated())
/obj/machinery/doppler_array/AltClick(mob/living/user)
if(!istype(user) || user.incapacitated())
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
@@ -132,8 +132,9 @@
return 1
..()
/obj/item/device/geiger_counter/AltClick()
..()
/obj/item/device/geiger_counter/AltClick(mob/living/user)
if(!istype(user) || user.incapacitated())
return ..()
if(!scanning)
usr << "<span class='warning'>[src] must be on to reset its radiation level!</span>"
return 0
@@ -235,10 +235,10 @@
else
togglelock(user)
/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user)
/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user)
if(!istype(O) || O.anchored || istype(O, /obj/screen))
return
if(user.incapacitated() || user.lying)
if(!istype(user) || user.incapacitated() || user.lying)
return
if(!Adjacent(user) || !user.Adjacent(O))
return
+7 -6
View File
@@ -62,20 +62,21 @@
flags_cover = MASKCOVERSEYES
burn_state = FLAMMABLE
/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/user)
var/mob/M = usr
/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/living/user)
if(!istype(user) || user.incapacitated())
return
var/list/options = list()
options["True Form"] = "clown"
options["The Feminist"] = "sexyclown"
options["The Madman"] = "joker"
options["The Rainbow Color"] ="rainbow"
var/choice = input(M,"To what form do you wish to Morph this mask?","Morph Mask") in options
var/choice = input(user,"To what form do you wish to Morph this mask?","Morph Mask") in options
if(src && choice && !M.stat && in_range(M,src))
if(src && choice && !user.stat && in_range(user,src))
icon_state = options[choice]
M << "<span class='notice'>Your Clown Mask has now morphed into [choice], all praise the Honkmother!</span>"
user << "<span class='notice'>Your Clown Mask has now morphed into [choice], all praise the Honkmother!</span>"
return 1
/obj/item/clothing/mask/gas/sexyclown