Almost all chemicals sould heal and harm humans and non-humans properly.

Various bugfixes for cult.
-raised and manifested are cultists
-you cannot use target for sacrificing
-free a cultis frees from muzzle, closets, pods
-removed unused files.
Added satitize() to emotes.
Extended and Random were returned to Game Panel.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1432 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-10 20:57:42 +00:00
parent 83e4a41480
commit ae1d99ee73
41 changed files with 542 additions and 1374 deletions

View File

@@ -266,6 +266,8 @@ var/showadminmessages = 1
var/dat = {"<B>What mode do you wish to play?</B><HR>"}
for (var/mode in config.modes)
dat += {"<A href='?src=\ref[src];c_mode2=[mode]'>[config.mode_names[mode]]</A><br>"}
dat += {"<A href='?src=\ref[src];c_mode2=secret'>Secret</A><br>"}
dat += {"<A href='?src=\ref[src];c_mode2=random'>Random</A><br>"}
dat += {"Now: [master_mode]"}
usr << browse(dat, "window=c_mode")
@@ -280,6 +282,7 @@ var/showadminmessages = 1
world << "\blue <b>The mode is now: [master_mode]</b>"
world.save_mode(master_mode)
.(href, list("c_mode"=1))
if (href_list["monkeyone"])
if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
@@ -634,7 +637,7 @@ var/showadminmessages = 1
alert("Is a Revolutionary!")
return
if("cult")
if(M.mind in current_mode:cult)
if(M.mind in current_mode.cult)
alert("Is a Cultist!")
return
if("wizard")
@@ -1957,24 +1960,15 @@ var/showadminmessages = 1
alert("[M.name] is not prisoned.")
/mob/proc/revive()
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
for(var/A in H.organs)
var/datum/organ/external/affecting = null
if(!H.organs[A]) continue
affecting = H.organs[A]
if(!istype(affecting, /datum/organ/external)) continue
affecting.heal_damage(1000, 1000) //fixes getting hit after ingestion, killing you when game updates organ health
H.UpdateDamageIcon()
src.fireloss = 0
//src.fireloss = 0
src.toxloss = 0
src.bruteloss = 0
//src.bruteloss = 0
src.oxyloss = 0
src.paralysis = 0
src.stunned = 0
src.weakened =0
src.health = 100
src.updatehealth()
//src.health = 100
src.heal_overall_damage(1000, 1000)
src.buckled = initial(src.buckled)
src.handcuffed = initial(src.handcuffed)
if(src.stat > 1) src.stat=0

View File

@@ -221,7 +221,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!wordtravel)
runerandom()
if(M)
if(cultists.Find(M))
if(M.mind in ticker.mode.cult)
return
else
if(alert("Spawn that person a tome?",,"Yes","No")=="Yes")
@@ -247,12 +247,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M << "\red You remembered one thing from the glimpse... [wordself] is self..."
if("8")
M << "\red You remembered one thing from the glimpse... [wordsee] is see..."
cultists.Add(M)
if(M.mind)
M.mind.special_role = "Cultist"
ticker.mode.cult += M.mind
src << "Made [M] a cultist."
if(ticker.mode.name == "cult")
ticker.mode:cult += M.mind
/client/proc/cmd_debug_del_all()
set category = "Debug"

View File

@@ -421,26 +421,18 @@ TO DO: actually integrate random appearance and player preference save.
alert("Cannot revive a ghost")
return
if(config.allow_admin_rev)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
for(var/A in H.organs)
var/datum/organ/external/affecting = null
if(!H.organs[A]) continue
affecting = H.organs[A]
if(!istype(affecting, /datum/organ/external)) continue
affecting.heal_damage(1000, 1000) //fixes getting hit after ingestion, killing you when game updates organ health
H.UpdateDamageIcon()
M.fireloss = 0
//M.fireloss = 0
M.toxloss = 0
M.bruteloss = 0
//M.bruteloss = 0
M.oxyloss = 0
M.paralysis = 0
M.stunned = 0
M.weakened = 0
M.radiation = 0
M.health = 100
//M.health = 100
M.nutrition = 400
M.updatehealth()
M.heal_overall_damage(1000, 1000)
//M.updatehealth()
M.buckled = initial(M.buckled)
M.handcuffed = initial(M.handcuffed)
if (M.stat > 1)