cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@335 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
musketstgstation@gmail.com
2010-10-20 20:29:18 +00:00
parent d86f609105
commit c53ece134d
3 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/gamemodes/wizard/wizard.dm
View File

@@ -3,6 +3,7 @@
config_tag = "wizard" config_tag = "wizard"
var/datum/mind/wizard var/datum/mind/wizard
var/list/datum/mind/wizards = list()
var/finished = 0 var/finished = 0
var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time
@@ -121,6 +122,8 @@
equip_wizard(wizard.current) equip_wizard(wizard.current)
wizards += wizard.current
wizard.current << "<B>\red You are the Space Wizard!</B>" wizard.current << "<B>\red You are the Space Wizard!</B>"
wizard.current << "<B>The Space Wizards Federation has given you the following tasks:</B>" wizard.current << "<B>The Space Wizards Federation has given you the following tasks:</B>"

2
code/game/objects/items/weapons/tools.dm
View File

@@ -146,7 +146,7 @@ WELDINGTOOOL
else if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding) else if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
user << "\red That was stupid of you." user << "\red That was stupid of you."
explosion(O.loc,-1,0,6) explosion(O.loc,-1,0,2)
if(O) if(O)
del(O) del(O)

33
code/modules/admin/admin.dm
View File

@@ -1277,6 +1277,39 @@ var/showadminmessages = 1
var/turf/mob_loc = get_turf_loc(M) var/turf/mob_loc = get_turf_loc(M)
dat += "<td>[mob_loc.loc]</td></tr>" dat += "<td>[mob_loc.loc]</td></tr>"
dat += "</table>" dat += "</table>"
if("changeling")
if(ticker.mode:changelings.len > 0)
dat += "<br><table cellspacing=5><tr><td><B>Changelings</B></td><td></td><td></td></tr>"
for(var/datum/mind/changeling in ticker.mode:changelings)
var/mob/M = changeling.current
if(M)
dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
else
dat += "<tr><td><i>Changeling not found!</i></td></tr>"
dat += "</table>"
else
dat += "There are no changelings."
/* this doesn't work
if("wizard")
if(ticker.mode:wizards.len > 0)
dat += "<br><table cellspacing=5><tr><td><B>Wizards</B></td><td></td><td></td></tr>"
for(var/datum/mind/wizard in ticker.mode:wizards)
var/mob/M = wizard.current
if(M)
dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
else
dat += "<tr><td><i>Wizard not found!</i></td></tr>"
dat += "</table>"
else
dat += "There are no wizards."
*/
else // i'll finish this later else // i'll finish this later
if(ticker.mode.traitors.len > 0) if(ticker.mode.traitors.len > 0)
dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>" dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>"