THIS FIXES IT (well it should :) )

This commit is contained in:
Letter N
2021-02-22 21:05:07 +08:00
parent 7c0a63f729
commit 2be4c76add
9 changed files with 29 additions and 16 deletions

View File

@@ -181,29 +181,36 @@ SUBSYSTEM_DEF(shuttle)
return S
WARNING("couldn't find dock with id: [id]")
/datum/controller/subsystem/shuttle/proc/canEvac(mob/user)
/datum/controller/subsystem/shuttle/proc/canEvac(mob/user, silent=FALSE)
var/srd = CONFIG_GET(number/shuttle_refuel_delay)
if(world.time - SSticker.round_start_time < srd)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before trying again.</span>")
return FALSE
switch(emergency.mode)
if(SHUTTLE_RECALL)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle may not be called while returning to CentCom.</span>")
return FALSE
if(SHUTTLE_CALL)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle is already on its way.</span>")
return FALSE
if(SHUTTLE_DOCKED)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle is already here.</span>")
return FALSE
if(SHUTTLE_IGNITING)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle is firing its engines to leave.</span>")
return FALSE
if(SHUTTLE_ESCAPE)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle is moving away to a safe distance.</span>")
return FALSE
if(SHUTTLE_STRANDED)
if(!silent)
to_chat(user, "<span class='alert'>The emergency shuttle has been disabled by CentCom.</span>")
return FALSE

View File

@@ -107,7 +107,7 @@
message.answered = answer_index
message.answer_callback.InvokeAsync()
if ("callShuttle")
if (!authenticated(usr))
if (!authenticated(usr) || !SSshuttle.canEvac(usr, TRUE))
return
var/reason = trim(params["reason"], MAX_MESSAGE_LEN)
if (length(reason) < CALL_SHUTTLE_REASON_LENGTH)
@@ -355,10 +355,10 @@
data["shuttleCalled"] = FALSE
data["shuttleLastCalled"] = FALSE
data["alertLevel"] = GLOB.security_level
data["alertLevel"] = NUM2SECLEVEL(GLOB.security_level)
data["authorizeName"] = authorize_name
data["canLogOut"] = !issilicon(user)
data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user)
data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user, TRUE)
if (authenticated_as_non_silicon_captain(user))
data["canMessageAssociates"] = TRUE

View File

@@ -13,7 +13,7 @@
var/volume = 10000 //in liters
/// The typepath of the gas this tank should be filled with.
var/gas_type = null
var/gas_type = 0
/obj/machinery/atmospherics/components/unary/tank/New()
..()

View File

@@ -319,7 +319,7 @@
if(timing && valve_timer < world.time)
valve_open = !valve_open
timing = FALSE
if(!valve_open)
if(valve_open)
var/turf/T = get_turf(src)
var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 480 KiB

After

Width:  |  Height:  |  Size: 481 KiB

View File

@@ -168,7 +168,7 @@ export const CSScripture = (props, context) => {
onClick={() => act('bind', {
'script': script.type,
})}>
content={script.bound ? (
{script.bound ? (
`Unbind ${script.bound}`
) : (
'Quickbind'

View File

@@ -400,6 +400,12 @@ export const PageMain = (props, context) => {
showAlertLevelConfirm={showAlertLevelConfirm}
setShowAlertLevelConfirm={setShowAlertLevelConfirm}
/>
<AlertButton
alertLevel="amber"
showAlertLevelConfirm={showAlertLevelConfirm}
setShowAlertLevelConfirm={setShowAlertLevelConfirm}
/>
</Flex.Item>
</Flex>
</Section>

File diff suppressed because one or more lines are too long