ok putnom
This commit is contained in:
+3
-7
@@ -61,9 +61,6 @@
|
||||
var/late_joiner = FALSE
|
||||
|
||||
var/force_escaped = FALSE // Set by Into The Sunset command of the shuttle manipulator
|
||||
|
||||
var/hijack_speed = 0 //whether or not we can hackerman the shuttle and hijack it. 0 means you can't, 1 is normal speed hack, 2 is double, 0.5 is half, etc.
|
||||
|
||||
var/list/learned_recipes //List of learned recipe TYPES.
|
||||
|
||||
/datum/mind/New(var/key)
|
||||
@@ -717,11 +714,10 @@
|
||||
G.reenter_corpse()
|
||||
|
||||
/// Sets our can_hijack to the fastest speed our antag datums allow.
|
||||
/datum/mind/proc/update_hijack_speed()
|
||||
hijack_speed = 0
|
||||
/datum/mind/proc/get_hijack_speed()
|
||||
. = 0
|
||||
for(var/datum/antagonist/A in antag_datums)
|
||||
hijack_speed = max(hijack_speed, A.hijack_speed())
|
||||
return hijack_speed
|
||||
. = max(., A.hijack_speed())
|
||||
|
||||
/datum/mind/proc/has_objective(objective_type)
|
||||
for(var/datum/antagonist/A in antag_datums)
|
||||
|
||||
@@ -73,7 +73,6 @@ GLOBAL_LIST_EMPTY(antagonists)
|
||||
give_antag_moodies()
|
||||
if(is_banned(owner.current) && replace_banned)
|
||||
replace_banned_player()
|
||||
owner.update_hijack_speed()
|
||||
|
||||
/datum/antagonist/proc/is_banned(mob/M)
|
||||
if(!M)
|
||||
@@ -101,7 +100,6 @@ GLOBAL_LIST_EMPTY(antagonists)
|
||||
var/datum/team/team = get_team()
|
||||
if(team)
|
||||
team.remove_member(owner)
|
||||
owner.update_hijack_speed()
|
||||
qdel(src)
|
||||
|
||||
/datum/antagonist/proc/greet()
|
||||
|
||||
@@ -63,11 +63,9 @@
|
||||
// needs to be refactored to base /datum/antagonist sometime..
|
||||
/datum/antagonist/traitor/proc/add_objective(datum/objective/O)
|
||||
objectives += O
|
||||
owner?.update_hijack_speed()
|
||||
|
||||
/datum/antagonist/traitor/proc/remove_objective(datum/objective/O)
|
||||
objectives -= O
|
||||
owner?.update_hijack_speed()
|
||||
|
||||
/datum/antagonist/traitor/proc/forge_traitor_objectives()
|
||||
switch(traitor_kind)
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
. = ..()
|
||||
if(hijack_announce)
|
||||
. += "<span class='danger'>Security systems present on console. Any unauthorized tampering will result in an emergency announcement.</span>"
|
||||
if(user?.mind?.hijack_speed)
|
||||
if(user?.mind?.get_hijack_speed())
|
||||
. += "<span class='danger'>Alt click on this to attempt to hijack the shuttle. This will take multiple tries (current: stage [SSshuttle.emergency.hijack_status]/[HIJACKED]).</span>"
|
||||
. += "<span class='notice'>It will take you [(hijack_stage_time * user.mind.hijack_speed) / 10] seconds to reprogram a stage of the shuttle's navigational firmware, and the console will undergo automated timed lockout for [hijack_stage_cooldown/10] seconds after each stage.</span>"
|
||||
. += "<span class='notice'>It will take you [(hijack_stage_time * user.mind.get_hijack_speed()) / 10] seconds to reprogram a stage of the shuttle's navigational firmware, and the console will undergo automated timed lockout for [hijack_stage_cooldown/10] seconds after each stage.</span>"
|
||||
if(hijack_announce)
|
||||
. += "<span class='warning'>It is probably best to fortify your position as to be uninterrupted during the attempt, given the automatic announcements..</span>"
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
/obj/machinery/computer/emergency_shuttle/proc/attempt_hijack_stage(mob/living/user)
|
||||
if(!user.CanReach(src))
|
||||
return
|
||||
if(!user?.mind?.hijack_speed)
|
||||
if(!user?.mind?.get_hijack_speed())
|
||||
to_chat(user, "<span class='warning'>You manage to open a user-mode shell on [src], and hundreds of lines of debugging output fly through your vision. It is probably best to leave this alone.</span.")
|
||||
return
|
||||
if(hijack_hacking == TRUE)
|
||||
@@ -193,7 +193,7 @@
|
||||
to_chat(user, "<span class='boldwarning'>You [SSshuttle.emergency.hijack_status == INTACT? "begin" : "continue"] to override [src]'s navigational protocols.</span>")
|
||||
say("Software override initiated.")
|
||||
. = FALSE
|
||||
if(do_after(user, hijack_stage_time * user.mind.hijack_speed, target = src))
|
||||
if(do_after(user, hijack_stage_time * user.mind.get_hijack_speed(), target = src))
|
||||
increase_hijack_stage()
|
||||
. = TRUE
|
||||
to_chat(user, "<span class='notice'>You reprogram some of [src]'s programming, putting it on timeout for [hijack_stage_cooldown/10] seconds.</span>")
|
||||
|
||||
Reference in New Issue
Block a user