NARSIE SAYS LEAVE!

* Shuttles now properly respect the intentions of eldritch horrors
* Comms consoles will tell you when the shuttle can't be recalled
instead of just saying nope
* Admemes can now designate if their shuttles are recallable when they
call them
This commit is contained in:
IK3I
2018-01-11 11:41:04 -06:00
parent 51c0d509d9
commit d57622b460
5 changed files with 17 additions and 4 deletions
+1
View File
@@ -608,6 +608,7 @@ var/list/teleport_runes = list()
new /mob/living/simple_animal/slaughter/cult(T, pick(NORTHEAST, SOUTHEAST, NORTHWEST, SOUTHWEST))
cult_mode.demons_summoned = 1
shuttle_master.emergency.request(null, 0.5,null)
shuttle_master.emergency.canRecall = FALSE
cult_mode.third_phase()
qdel(src)
@@ -178,6 +178,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
sleep(50)
if(!ticker.mode.shadowling_ascended)
shuttle_master.emergency.request(null, 0.3)
shuttle_master.emergency.canRecall = FALSE
ticker.mode.shadowling_ascended = 1
A.mind.RemoveSpell(src)
qdel(H)
@@ -500,10 +500,13 @@
if(ticker.mode.name == "meteor")
return
shuttle_master.cancelEvac(user)
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
return
if(shuttle_master.cancelEvac(user))
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
else
to_chat(user, "The shuttle can not be recalled! Central Orders!")
log_game("[key_name(user)] has tried and failed to recall the shuttle.")
message_admins("[key_name_admin(user)] has tried and failed to recall the shuttle - [formatJumpTo(user)].", 1)
/proc/post_status(command, data1, data2, mob/user = null)
+7
View File
@@ -762,6 +762,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
switch(alert(src, "Can the crew recall?", "Recallable?", "Yes", "No"))
if("Yes")
shuttle_master.emergency.canRecall = TRUE
else
shuttle_master.emergency.canRecall = FALSE
shuttle_master.emergency.request()
@@ -781,7 +786,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
return
shuttle_master.emergency.canRecall = TRUE // Resets incase the admin recalls a round ender for some reason.
shuttle_master.emergency.cancel()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] admin-recalled the emergency shuttle.</span>")
+1
View File
@@ -38,6 +38,7 @@
sleep(70)
shuttle_master.emergency.request(null, 0.3) // Cannot recall
shuttle_master.emergency.canRecall = FALSE
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, null, 1)