cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4801 (#4802)

Browse Source 
* Fix #4801

* Apparently, that made the problem worse... This should work better.
This commit is contained in:
monster860
2016-06-28 15:54:57 -04:00
committed by Fox McCloud
parent 2f952c2dad
commit d57299ca01
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+5 -3
View File
@@ -683,7 +683,7 @@
/obj/machinery/computer/shuttle/Topic(href, href_list)
if(..())
return
return 1
usr.set_machine(src)
src.add_fingerprint(usr)
if(!allowed(usr))
@@ -726,7 +726,8 @@
admin_controlled = 1
/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
..()
if(..())
return 1
if(href_list["request"])
if(cooldown)
return
@@ -801,7 +802,8 @@ var/global/trade_dockrequest_timelimit = 0
..(user)
/obj/machinery/computer/shuttle/trade/Topic(href, href_list)
..()
if(..())
return 1
if(href_list["request"])
if(world.time < trade_dockrequest_timelimit || world.time < trade_dock_timelimit)
return