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' into toml-config

Browse Source
This commit is contained in:
AffectedArc07
2021-06-23 08:44:32 +00:00
committed by GitHub
parent fd06f8c9f8 93a0b15834
commit ed11899f11
243 changed files with 925 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle_rotate.dm
+3
View File
@@ -56,6 +56,9 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
d2 = temp
update_icon()
/obj/structure/shuttle/engine/shuttleRotate(rotation, params)
setDir(angle2dir(rotation+dir2angle(dir)))
//Fixes dpdir on shuttle rotation
/obj/structure/disposalpipe/shuttleRotate(rotation, params)
. = ..()
code/modules/shuttle/syndicate.dm
+4 -2
View File
@@ -12,6 +12,7 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = NODECONSTRUCT
var/challenge = FALSE
var/challenge_time = 0 //When was war declared?
/obj/machinery/computer/shuttle/syndicate/recall
name = "syndicate shuttle recall terminal"
@@ -19,9 +20,10 @@
possible_destinations = "syndicate_away"
/obj/machinery/computer/shuttle/syndicate/can_call_shuttle(user, action)
var/time_to_go = max(SYNDICATE_CHALLENGE_TIMER, (challenge_time + 10 MINUTES))
if(action == "move")
if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
to_chat(user, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
if(challenge && world.time < time_to_go)
to_chat(user, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((time_to_go - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
return FALSE
return TRUE