From c53ece134d2eebaff9aadb0fdab819b29e495f69 Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Wed, 20 Oct 2010 20:29:18 +0000 Subject: [PATCH] Added changeling mode handling to the 'list current traitors' secret. Wizard mode handling is commented out because it doesn't work at the moment. Reduced the damage radius when using a lit welder on a fueltank. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@335 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/wizard/wizard.dm | 3 +++ code/game/objects/items/weapons/tools.dm | 2 +- code/modules/admin/admin.dm | 33 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 5d7e326765a..46794b6c2d9 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -3,6 +3,7 @@ config_tag = "wizard" var/datum/mind/wizard + var/list/datum/mind/wizards = list() var/finished = 0 var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time @@ -121,6 +122,8 @@ equip_wizard(wizard.current) + wizards += wizard.current + wizard.current << "\red You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 26151f75676..71fc249ef62 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -146,7 +146,7 @@ WELDINGTOOOL else if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding) user << "\red That was stupid of you." - explosion(O.loc,-1,0,6) + explosion(O.loc,-1,0,2) if(O) del(O) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 53c2952fac7..983d725e8bf 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1277,6 +1277,39 @@ var/showadminmessages = 1 var/turf/mob_loc = get_turf_loc(M) dat += "[mob_loc.loc]" dat += "" + + if("changeling") + if(ticker.mode:changelings.len > 0) + dat += "
" + for(var/datum/mind/changeling in ticker.mode:changelings) + var/mob/M = changeling.current + if(M) + dat += "" + dat += "" + dat += "" + else + dat += "" + dat += "
Changelings
[M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""]PMShow Objective
Changeling not found!
" + else + dat += "There are no changelings." + + /* this doesn't work + if("wizard") + if(ticker.mode:wizards.len > 0) + dat += "
" + for(var/datum/mind/wizard in ticker.mode:wizards) + var/mob/M = wizard.current + if(M) + dat += "" + dat += "" + dat += "" + else + dat += "" + dat += "
Wizards
[M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""]PMShow Objective
Wizard not found!
" + else + dat += "There are no wizards." + */ + else // i'll finish this later if(ticker.mode.traitors.len > 0) dat += "
"
Traitors