Fixed a few bugs with meme.

This commit is contained in:
cib
2012-05-19 16:47:09 +02:00
parent a2e415edb3
commit e57851fbaf
4 changed files with 22 additions and 11 deletions
@@ -62,11 +62,11 @@
if (O)
O.hear_talk(src, message)
var/list/listening = hearers(message_range, src)
var/list/listening = get_mobs_in_view(message_range, src)
// listening -= src
// listening += src
// WAT.
var/list/eavesdropping = hearers(2, src)
var/list/eavesdropping = get_mobs_in_view(message_range, src)
eavesdropping -= src
eavesdropping -= listening
var/list/watching = hearers(5, src)
+16 -9
View File
@@ -35,6 +35,7 @@ mob/living/parasite/proc/enter_host(mob/living/carbon/host)
return 0
src.host = host
src.loc = host
host.parasites.Add(src)
if(client) client.eye = host
@@ -44,6 +45,7 @@ mob/living/parasite/proc/enter_host(mob/living/carbon/host)
mob/living/parasite/proc/exit_host()
src.host.parasites.Remove(src)
src.host = null
src.loc = null
return 1
@@ -68,8 +70,8 @@ mob/living/parasite/meme/Life()
if(!host) return
// recover meme points slowly
var/gain = 1
if(dormant) gain = 3 // dormant recovers points faster
var/gain = 2
if(dormant) gain = 6 // dormant recovers points faster
meme_points = min(meme_points + gain, MAXIMUM_MEME_POINTS)
@@ -435,17 +437,17 @@ mob/living/parasite/meme/verb/Possession()
host << "\red Everything goes black.."
spawn
var/mob/dummy = new
var/client/host_key = host.key
var/client/meme_key = src.key
var/mob/living/dummy = new
var/datum/mind/host_mind = host.mind
var/datum/mind/meme_mind = src.mind
dummy.key = host_key
host.key = meme_key
host_mind.transfer_to(dummy)
meme_mind.transfer_to(host)
sleep(600)
src.key = meme_key
host.key = host_key
meme_mind.transfer_to(src)
host_mind.transfer_to(host)
src << "\red You lose control.."
del dummy
@@ -468,6 +470,11 @@ mob/living/parasite/meme/verb/Dormant()
usr << "\red You have regained all points and exited dormant mode!"
mob/living/parasite/meme/verb/Show_Points()
set category = "Meme"
usr << "<b>Meme Points: [src.meme_points]/[MAXIMUM_MEME_POINTS]</b>"
// Game mode helpers, used for theft objectives
// --------------------------------------------
mob/living/parasite/check_contents_for(t)