shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ok putnom

Browse Source
This commit is contained in:
kevinz000
2020-01-23 18:00:33 -07:00
parent 5cbe2226e1
commit e7bf1738cd
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/antagonists/_common/antag_datum.dm
View File

@@ -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()

2
code/modules/antagonists/traitor/datum_traitor.dm
View File

@@ -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)

8
code/modules/shuttle/emergency.dm
View File

@@ -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>")