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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE

Browse Source
This commit is contained in:
Aurorablade
2019-01-19 23:35:15 -05:00
parent bbe6370b91 eaeeb0cb7d
commit b812736517
439 changed files with 12076 additions and 5435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+5 -31
View File
@@ -861,6 +861,8 @@
/obj/machinery/computer/shuttle/sst
name = "Syndicate Strike Time Shuttle Console"
desc = "Used to call and send the SST shuttle."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(access_syndicate)
shuttleId = "sst"
possible_destinations = "sst_home;sst_away"
@@ -868,51 +870,23 @@
/obj/machinery/computer/shuttle/sit
name = "Syndicate Infiltration Team Shuttle Console"
desc = "Used to call and send the SIT shuttle."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(access_syndicate)
shuttleId = "sit"
possible_destinations = "sit_arrivals;sit_engshuttle;sit_away"
var/global/trade_dock_timelimit = 0
var/global/trade_dockrequest_timelimit = 0
/obj/machinery/computer/shuttle/trade
name = "Freighter Console"
docking_request = 1
var/possible_destinations_dock
var/possible_destinations_nodock
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)
possible_destinations = possible_destinations_dock
else
possible_destinations = possible_destinations_nodock
docking_request = (world.time > trade_dockrequest_timelimit && world.time > trade_dock_timelimit)
..(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
to_chat(usr, "<span class='notice'>Request sent.</span>")
event_announcement.Announce(docking_request_message, "Docking Request")
trade_dockrequest_timelimit = world.time + 1200 // They have 2 minutes to approve the request.
return 1
/obj/machinery/computer/shuttle/trade/sol
req_access = list(access_trade_sol)
possible_destinations_dock = "trade_sol_base;trade_sol_offstation;trade_dock"
possible_destinations_nodock = "trade_sol_base;trade_sol_offstation"
possible_destinations = "trade_sol_base;trade_dock"
shuttleId = "trade_sol"
docking_request_message = "A trading ship of Sol origin has requested docking aboard the NSS Cyberiad for trading. This request can be accepted or denied using a communications console."
//#undef DOCKING_PORT_HIGHLIGHT
/turf/proc/copyTurf(turf/T)
if(T.type != type)
var/obj/O