Re-added ninjas

This commit is contained in:
ZomgPonies
2013-09-16 22:34:28 -04:00
parent 640e38ce23
commit 9580552fd3
25 changed files with 116 additions and 59 deletions
+2 -2
View File
@@ -793,7 +793,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1)
feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/*
/datum/admins/proc/toggle_space_ninja()
set category = "Server"
set desc="Toggle space ninjas spawning."
@@ -802,7 +802,7 @@ var/global/floorIsLava = 0
log_admin("[key_name(usr)] toggled Space Ninjas to [toggle_space_ninja].")
message_admins("[key_name_admin(usr)] toggled Space Ninjas [toggle_space_ninja ? "on" : "off"].", 1)
feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
*/
/datum/admins/proc/delay()
set category = "Server"
set desc="Delay the game start/end"
+5 -5
View File
@@ -90,8 +90,8 @@ var/list/admin_verbs_fun = list(
/client/proc/cinematic,
/client/proc/one_click_antag,
/datum/admins/proc/toggle_aliens,
// /datum/admins/proc/toggle_space_ninja,
// /client/proc/send_space_ninja,
/datum/admins/proc/toggle_space_ninja,
/client/proc/send_space_ninja,
/client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_add_random_ai_law,
/client/proc/make_sound,
@@ -120,7 +120,7 @@ var/list/admin_verbs_server = list(
/datum/admins/proc/adspawn,
/datum/admins/proc/adjump,
/datum/admins/proc/toggle_aliens,
// /datum/admins/proc/toggle_space_ninja,
/datum/admins/proc/toggle_space_ninja,
/client/proc/toggle_random_events,
/client/proc/check_customitem_activity,
/client/proc/delbook
@@ -186,8 +186,8 @@ var/list/admin_verbs_hideable = list(
/client/proc/drop_bomb,
/client/proc/cinematic,
/datum/admins/proc/toggle_aliens,
// /datum/admins/proc/toggle_space_ninja,
// /client/proc/send_space_ninja,
/datum/admins/proc/toggle_space_ninja,
/client/proc/send_space_ninja,
/client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_add_random_ai_law,
/client/proc/cmd_admin_create_centcom_report,
+2 -2
View File
@@ -36,9 +36,9 @@
log_admin("[key_name(usr)] has spawned a nuke team.")
if(!src.makeNukeTeam())
usr << "\red Unfortunately there weren't enough candidates available."
/* if("8")
if("8")
log_admin("[key_name(usr)] has spawned a ninja.")
src.makeSpaceNinja()*/
src.makeSpaceNinja()
if("9")
log_admin("[key_name(usr)] has spawned aliens.")
src.makeAliens()
+2 -2
View File
@@ -309,11 +309,11 @@ client/proc/one_click_antag()
/datum/admins/proc/makeAliens()
alien_infestation(3)
return 1
/*
/datum/admins/proc/makeSpaceNinja()
space_ninja_arrival()
return 1
*/
/datum/admins/proc/makeDeathsquad()
var/list/mob/dead/observer/candidates = list()
var/mob/dead/observer/theghost = null
+2 -2
View File
@@ -357,7 +357,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(synd_spawn)
new_character.loc = get_turf(synd_spawn)
call(/datum/game_mode/proc/equip_syndicate)(new_character)
/* if("Ninja")
if("Ninja")
new_character.equip_space_ninja()
new_character.internal = new_character.s_store
new_character.internals.icon_state = "internal1"
@@ -372,7 +372,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
new_character.loc = pick(latejoin)
else if (ninjastart.len == 0)
new_character << "<B>\red Still no spawneable locations could be found. Aborting.</B>"
*/
if("Death Commando")//Leaves them at late-join spawn.
new_character.equip_death_commando()
new_character.internal = new_character.s_store