mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-11 10:22:13 +00:00
THIS FIXES IT (well it should :) )
This commit is contained in:
@@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
|
|||||||
if(input == "Random")
|
if(input == "Random")
|
||||||
input = pick(GLOB.ai_core_display_screens - "Random")
|
input = pick(GLOB.ai_core_display_screens - "Random")
|
||||||
if(input == "Portrait")
|
if(input == "Portrait")
|
||||||
var/datum/portrait_picker/tgui = new(usr)//create the datum
|
var/datum/portrait_picker/tgui = new(usr)//create the datum
|
||||||
tgui.ui_interact(usr)//datum has a tgui component, here we open the window
|
tgui.ui_interact(usr)//datum has a tgui component, here we open the window
|
||||||
return "ai-portrait" //just take this until they decide
|
return "ai-portrait" //just take this until they decide
|
||||||
return "ai-[lowertext(input)]"
|
return "ai-[lowertext(input)]"
|
||||||
|
|||||||
@@ -181,30 +181,37 @@ SUBSYSTEM_DEF(shuttle)
|
|||||||
return S
|
return S
|
||||||
WARNING("couldn't find dock with id: [id]")
|
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)
|
var/srd = CONFIG_GET(number/shuttle_refuel_delay)
|
||||||
if(world.time - SSticker.round_start_time < srd)
|
if(world.time - SSticker.round_start_time < srd)
|
||||||
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>")
|
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
|
return FALSE
|
||||||
|
|
||||||
switch(emergency.mode)
|
switch(emergency.mode)
|
||||||
if(SHUTTLE_RECALL)
|
if(SHUTTLE_RECALL)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle may not be called while returning to CentCom.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle may not be called while returning to CentCom.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
if(SHUTTLE_CALL)
|
if(SHUTTLE_CALL)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle is already on its way.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle is already on its way.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
if(SHUTTLE_DOCKED)
|
if(SHUTTLE_DOCKED)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle is already here.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle is already here.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
if(SHUTTLE_IGNITING)
|
if(SHUTTLE_IGNITING)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle is firing its engines to leave.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle is firing its engines to leave.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
if(SHUTTLE_ESCAPE)
|
if(SHUTTLE_ESCAPE)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle is moving away to a safe distance.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle is moving away to a safe distance.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
if(SHUTTLE_STRANDED)
|
if(SHUTTLE_STRANDED)
|
||||||
to_chat(user, "<span class='alert'>The emergency shuttle has been disabled by CentCom.</span>")
|
if(!silent)
|
||||||
|
to_chat(user, "<span class='alert'>The emergency shuttle has been disabled by CentCom.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|||||||
@@ -107,7 +107,7 @@
|
|||||||
message.answered = answer_index
|
message.answered = answer_index
|
||||||
message.answer_callback.InvokeAsync()
|
message.answer_callback.InvokeAsync()
|
||||||
if ("callShuttle")
|
if ("callShuttle")
|
||||||
if (!authenticated(usr))
|
if (!authenticated(usr) || !SSshuttle.canEvac(usr, TRUE))
|
||||||
return
|
return
|
||||||
var/reason = trim(params["reason"], MAX_MESSAGE_LEN)
|
var/reason = trim(params["reason"], MAX_MESSAGE_LEN)
|
||||||
if (length(reason) < CALL_SHUTTLE_REASON_LENGTH)
|
if (length(reason) < CALL_SHUTTLE_REASON_LENGTH)
|
||||||
@@ -355,10 +355,10 @@
|
|||||||
data["shuttleCalled"] = FALSE
|
data["shuttleCalled"] = FALSE
|
||||||
data["shuttleLastCalled"] = FALSE
|
data["shuttleLastCalled"] = FALSE
|
||||||
|
|
||||||
data["alertLevel"] = GLOB.security_level
|
data["alertLevel"] = NUM2SECLEVEL(GLOB.security_level)
|
||||||
data["authorizeName"] = authorize_name
|
data["authorizeName"] = authorize_name
|
||||||
data["canLogOut"] = !issilicon(user)
|
data["canLogOut"] = !issilicon(user)
|
||||||
data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user)
|
data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user, TRUE)
|
||||||
|
|
||||||
if (authenticated_as_non_silicon_captain(user))
|
if (authenticated_as_non_silicon_captain(user))
|
||||||
data["canMessageAssociates"] = TRUE
|
data["canMessageAssociates"] = TRUE
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
var/volume = 10000 //in liters
|
var/volume = 10000 //in liters
|
||||||
/// The typepath of the gas this tank should be filled with.
|
/// 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()
|
/obj/machinery/atmospherics/components/unary/tank/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -319,7 +319,7 @@
|
|||||||
if(timing && valve_timer < world.time)
|
if(timing && valve_timer < world.time)
|
||||||
valve_open = !valve_open
|
valve_open = !valve_open
|
||||||
timing = FALSE
|
timing = FALSE
|
||||||
if(!valve_open)
|
if(valve_open)
|
||||||
var/turf/T = get_turf(src)
|
var/turf/T = get_turf(src)
|
||||||
var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air()
|
var/datum/gas_mixture/target_air = holding ? holding.air_contents : T.return_air()
|
||||||
|
|
||||||
|
|||||||
BIN
icons/mob/AI.dmi
BIN
icons/mob/AI.dmi
Binary file not shown.
|
Before Width: | Height: | Size: 480 KiB After Width: | Height: | Size: 481 KiB |
@@ -168,7 +168,7 @@ export const CSScripture = (props, context) => {
|
|||||||
onClick={() => act('bind', {
|
onClick={() => act('bind', {
|
||||||
'script': script.type,
|
'script': script.type,
|
||||||
})}>
|
})}>
|
||||||
content={script.bound ? (
|
{script.bound ? (
|
||||||
`Unbind ${script.bound}`
|
`Unbind ${script.bound}`
|
||||||
) : (
|
) : (
|
||||||
'Quickbind'
|
'Quickbind'
|
||||||
|
|||||||
@@ -400,6 +400,12 @@ export const PageMain = (props, context) => {
|
|||||||
showAlertLevelConfirm={showAlertLevelConfirm}
|
showAlertLevelConfirm={showAlertLevelConfirm}
|
||||||
setShowAlertLevelConfirm={setShowAlertLevelConfirm}
|
setShowAlertLevelConfirm={setShowAlertLevelConfirm}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<AlertButton
|
||||||
|
alertLevel="amber"
|
||||||
|
showAlertLevelConfirm={showAlertLevelConfirm}
|
||||||
|
setShowAlertLevelConfirm={setShowAlertLevelConfirm}
|
||||||
|
/>
|
||||||
</Flex.Item>
|
</Flex.Item>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Section>
|
</Section>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user