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

Resolves conflicts.

Browse Source
This commit is contained in:
Desolate
2018-10-11 05:36:22 -05:00
parent 4c062212ab 44ba995aa6
commit f7627d2fcb
486 changed files with 16260 additions and 10647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+1 -1
View File
@@ -881,7 +881,7 @@ var/global/trade_dockrequest_timelimit = 0
docking_request = 1
var/possible_destinations_dock
var/possible_destinations_nodock
var/docking_request_message = "A trading ship has requested docking aboard the NSS Cyberiad for trading. This request can be accepted or denied using a communications console."
var/docking_request_message = "A trading ship has submitted a request to dock for trading. This request can be accepted or denied using a communications console."
/obj/machinery/computer/shuttle/trade/attack_hand(mob/user)
if(world.time < trade_dock_timelimit)