April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -8,11 +8,11 @@ Contents:
|
||||
|
||||
|
||||
//ADMIN CREATE NINJA (From Player)
|
||||
/client/proc/cmd_admin_ninjafy(mob/living/carbon/human/H in player_list)
|
||||
/client/proc/cmd_admin_ninjafy(mob/living/carbon/human/H in GLOB.player_list)
|
||||
set category = null
|
||||
set name = "Make Space Ninja"
|
||||
|
||||
if (!ticker.mode)
|
||||
if (!SSticker.mode)
|
||||
alert("Wait until the game starts")
|
||||
return
|
||||
|
||||
@@ -30,7 +30,7 @@ Contents:
|
||||
H.wear_suit:randomize_param()
|
||||
spawn(0)
|
||||
H.wear_suit:ninitialize(10,H)
|
||||
ticker.mode.update_ninja_icons_added(H)
|
||||
SSticker.mode.update_ninja_icons_added(H)
|
||||
|
||||
|
||||
//ADMIN CREATE NINJA (From Ghost)
|
||||
@@ -43,13 +43,13 @@ Contents:
|
||||
if(!holder)
|
||||
to_chat(src, "Only administrators may use this command.")
|
||||
return
|
||||
if(!ticker.mode)
|
||||
if(!SSticker.mode)
|
||||
alert("The game hasn't started yet!")
|
||||
return
|
||||
if(alert("Are you sure you want to send in a space ninja?",,"Yes","No")=="No")
|
||||
return
|
||||
|
||||
var/client/C = input("Pick character to spawn as the Space Ninja", "Key", "") as null|anything in clients
|
||||
var/client/C = input("Pick character to spawn as the Space Ninja", "Key", "") as null|anything in GLOB.clients
|
||||
if(!C)
|
||||
return
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ Contents:
|
||||
//selecting a spawn_loc
|
||||
if(!spawn_loc)
|
||||
var/list/spawn_locs = list()
|
||||
for(var/obj/effect/landmark/L in landmarks_list)
|
||||
for(var/obj/effect/landmark/L in GLOB.landmarks_list)
|
||||
if(isturf(L.loc))
|
||||
switch(L.name)
|
||||
if("ninjaspawn","carpspawn")
|
||||
@@ -64,12 +64,12 @@ Contents:
|
||||
|
||||
//generate objectives - You'll generally get 6 objectives (Ninja is meant to be hardmode!)
|
||||
var/list/possible_targets = list()
|
||||
for(var/datum/mind/M in ticker.minds)
|
||||
for(var/datum/mind/M in SSticker.minds)
|
||||
if(M.current && M.current.stat != DEAD)
|
||||
if(ishuman(M.current))
|
||||
if(M.special_role)
|
||||
possible_targets[M] = 0 //bad-guy
|
||||
else if(M.assigned_role in command_positions)
|
||||
else if(M.assigned_role in GLOB.command_positions)
|
||||
possible_targets[M] = 1 //good-guy
|
||||
|
||||
var/list/objectives = list(1,2,3,4)
|
||||
@@ -155,7 +155,7 @@ Contents:
|
||||
return
|
||||
|
||||
Ninja << sound('sound/effects/ninja_greeting.ogg') //so ninja you probably wouldn't even know if you were made one
|
||||
ticker.mode.update_ninja_icons_added(Ninja)
|
||||
SSticker.mode.update_ninja_icons_added(Ninja)
|
||||
spawned_mobs += Ninja
|
||||
message_admins("[key_name_admin(Ninja)] has been made into a ninja by an event.")
|
||||
log_game("[key_name(Ninja)] was spawned as a ninja by an event.")
|
||||
@@ -168,7 +168,7 @@ Contents:
|
||||
/proc/create_space_ninja(spawn_loc)
|
||||
var/mob/living/carbon/human/new_ninja = new(spawn_loc)
|
||||
var/datum/preferences/A = new()//Randomize appearance for the ninja.
|
||||
A.real_name = "[pick(ninja_titles)] [pick(ninja_names)]"
|
||||
A.real_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]"
|
||||
A.copy_to(new_ninja)
|
||||
new_ninja.dna.update_dna_identity()
|
||||
new_ninja.equip_space_ninja()
|
||||
@@ -179,7 +179,7 @@ Contents:
|
||||
var/datum/mind/Mind = new /datum/mind(key)
|
||||
Mind.assigned_role = "Space Ninja"
|
||||
Mind.special_role = "Space Ninja"
|
||||
ticker.mode.traitors |= Mind //Adds them to current traitor list. Which is really the extra antagonist list.
|
||||
SSticker.mode.traitors |= Mind //Adds them to current traitor list. Which is really the extra antagonist list.
|
||||
return Mind
|
||||
|
||||
|
||||
@@ -216,11 +216,11 @@ Contents:
|
||||
return 1
|
||||
|
||||
/datum/game_mode/proc/update_ninja_icons_added(var/mob/living/carbon/human/ninja)
|
||||
var/datum/atom_hud/antag/ninjahud = huds[ANTAG_HUD_NINJA]
|
||||
var/datum/atom_hud/antag/ninjahud = GLOB.huds[ANTAG_HUD_NINJA]
|
||||
ninjahud.join_hud(ninja)
|
||||
set_antag_hud(ninja, "ninja")
|
||||
|
||||
/datum/game_mode/proc/update_ninja_icons_removed(datum/mind/ninja_mind)
|
||||
var/datum/atom_hud/antag/ninjahud = huds[ANTAG_HUD_NINJA]
|
||||
var/datum/atom_hud/antag/ninjahud = GLOB.huds[ANTAG_HUD_NINJA]
|
||||
ninjahud.leave_hud(ninja_mind.current)
|
||||
set_antag_hud(ninja_mind.current, null)
|
||||
|
||||
@@ -75,7 +75,7 @@ It is possible to destroy the net by the occupant or someone else.
|
||||
new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(M), M.dir)
|
||||
|
||||
visible_message("[M] suddenly vanishes!")
|
||||
M.forceMove(pick(holdingfacility)) //Throw mob in to the holding facility.
|
||||
M.forceMove(pick(GLOB.holdingfacility)) //Throw mob in to the holding facility.
|
||||
to_chat(M, "<span class='danger'>You appear in a strange place!</span>")
|
||||
|
||||
if(!isnull(master))//As long as they still exist.
|
||||
|
||||
@@ -124,7 +124,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
|
||||
to_chat(H, "<span class='notice'>Hacking \the [src]...</span>")
|
||||
spawn(0)
|
||||
var/turf/location = get_turf(H)
|
||||
for(var/mob/living/silicon/ai/AI in player_list)
|
||||
for(var/mob/living/silicon/ai/AI in GLOB.player_list)
|
||||
to_chat(AI, "<span class='userdanger'>Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]</span>.")
|
||||
|
||||
if(files && files.known_tech.len)
|
||||
@@ -156,7 +156,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
|
||||
to_chat(H, "<span class='notice'>Hacking \the [src]...</span>")
|
||||
spawn(0)
|
||||
var/turf/location = get_turf(H)
|
||||
for(var/mob/living/silicon/ai/AI in player_list)
|
||||
for(var/mob/living/silicon/ai/AI in GLOB.player_list)
|
||||
to_chat(AI, "<span class='userdanger'>Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]</span>.")
|
||||
|
||||
if(files && files.known_tech.len)
|
||||
|
||||
Reference in New Issue
Block a user