cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17839 from optimumtact/watisgoinon

Browse Source 
Fix an antipattern when using canUseTopic
This commit is contained in:
AnturK
2016-05-24 17:46:11 +02:00
parent aeea5b3245 947e2c5c19
commit 802cdf9f5c
7 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+2 -2
View File
@@ -381,10 +381,10 @@
/obj/structure/closet/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
if(!user.canUseTopic(src, be_close=TRUE))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(opened || !secure || !in_range(src, user))
if(opened || !secure)
return
else
togglelock(user)
code/game/objects/structures/reflector.dm
+1 -3
View File
@@ -124,11 +124,9 @@
/obj/structure/reflector/AltClick(mob/user)
..()
if(!user.canUseTopic(user))
if(!user.canUseTopic(src, be_close=TRUE))
user << "<span class='warning'>You can't do that right now!</span>"
return
if(!in_range(src, user))
return
else
rotate()