Merge pull request #35542 from ShizCalev/free-spam-removal

Cleans up some duplicate canusetopic warnings
This commit is contained in:
oranges
2018-02-16 15:34:37 +13:00
committed by CitadelStationBot
parent 86f27dd5e8
commit 5dc3549801
14 changed files with 43 additions and 51 deletions

View File

@@ -226,10 +226,7 @@
/obj/AltClick(mob/user)
. = ..()
if(unique_reskin && !current_skin && in_range(user,src))
if(user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
reskin_obj(user)
/obj/proc/reskin_obj(mob/M)

View File

@@ -37,7 +37,6 @@
if(istype(L))
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return FALSE
else
return TRUE
@@ -226,7 +225,6 @@
if(!item_chair || !usr.can_hold_items() || has_buckled_mobs() || src.flags_1 & NODECONSTRUCT_1)
return
if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr)))
to_chat(usr, "<span class='warning'>You can't do that right now!</span>")
return
usr.visible_message("<span class='notice'>[usr] grabs \the [src.name].</span>", "<span class='notice'>You grab \the [src.name].</span>")
var/C = new item_chair(loc)

View File

@@ -161,7 +161,6 @@
return FALSE
var/new_angle = input(user, "Input a new angle for primary reflection face.", "Reflector Angle", rotation_angle) as null|num
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!isnull(new_angle))
setAngle(SIMPLIFY_DEGREES(new_angle))