Respawn bugfixes

baystation12.dme

@@ -148,7 +148,6 @@
 #include "code\datums\diseases\advance\symptoms\youth.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\events.dm"
-#include "code\datums\helper_datums\getrev.dm"
 #include "code\datums\helper_datums\global_iterator.dm"
 #include "code\datums\helper_datums\teleport.dm"
 #include "code\datums\helper_datums\topic_input.dm"
@@ -1057,6 +1056,7 @@
 #include "code\modules\mob\living\simple_animal\borer.dm"
 #include "code\modules\mob\living\simple_animal\constructs.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
+#include "code\modules\mob\living\simple_animal\emote.dm"
 #include "code\modules\mob\living\simple_animal\parrot.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"

code/game/dna/dna_modifier.dm

@@ -128,8 +128,10 @@
 		|| locate(/obj/machinery/computer/cloning, get_step(src, WEST)))
 
 		if(!M.client && M.mind)
+			message_admins("No client found, searching for compatible mind")
 			for(var/mob/C in player_list)
-				if(C.mind == M.mind)
+				if(C.mind && C.mind.key == M.mind.key)
+					message_admins("Found mind, asking for respawn")
 					switch(alert(C,"<b><font color = #330033><font size = 3>Your corpse has been placed into a cloning scanner. Do you want to be resurrected/cloned? Please not if you select 'No', you will be able to be cloned or borged again this round.</b></font color>","Yes","No"))
 						if("Yes")
 							C.key = M.key

code/game/gamemodes/game_mode.dm

@@ -69,8 +69,8 @@
 	feedback_set_details("round_start","[time2text(world.realtime)]")
 	if(ticker && ticker.mode)
 		feedback_set_details("game_mode","[ticker.mode]")
-	if(revdata)
-		feedback_set_details("revision","[revdata.revision]")
+//	if(revdata)
+//		feedback_set_details("revision","[revdata.revision]")
 	feedback_set_details("server_ip","[world.internet_address]:[world.port]")
 	return 1
 

code/game/machinery/podmen.dm

@@ -43,10 +43,15 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
 			source = B.data["donor"]
 			user << "The strange, sluglike seeds quiver gently and swell with blood."
 			if(!source.client && source.mind)
-				for(var/mob/dead/observer/O in player_list)
+				for(var/mob/O in respawnable_list)
 					if(O.mind == source.mind && config.revival_pod_plants)
-						O << "<b><font color = #330033><font size = 3>Your blood has been placed into a replica pod seed. Return to your body if you want to be returned to life as a pod person!</b> (Verbs -> Ghost -> Re-enter corpse)</font color>"
-						break
+						message_admins("Found mind, asking for respawn")
+						switch(alert(O,"<b><font color = #330033><font size = 3>Your corpse has been placed into a pod plant. Do you want to be resurrected/cloned? Please not if you select 'No', you will be able to be cloned or borged again this round.</b></font color>","Yes","No"))
+							if("Yes")
+								source.key = O.key
+								return
+							if("No")
+								return
 		else
 			user << "Nothing happens."
 			return

code/modules/mob/dead/observer/observer.dm

@@ -274,34 +274,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	else
 		see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
-/mob/dead/observer/verb/become_mouse()
-	set name = "Become mouse"
-	set category = "OOC"
-
-	var/timedifference = world.time - client.time_died_as_mouse
-	if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
-		var/timedifference_text
-		timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss")
-		src << "<span class='warning'>You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.</span>"
-		return
-
-	//find a viable mouse candidate
-	var/mob/living/simple_animal/mouse/host
-	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
-	var/list/found_vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
-		if(!v.welded && v.z == src.z)
-			found_vents.Add(v)
-	if(found_vents.len)
-		vent_found = pick(found_vents)
-		host = new /mob/living/simple_animal/mouse(vent_found.loc)
-	else
-		src << "<span class='warning'>Unable to find any unwelded vents to spawn mice at.</span>"
-
-	if(host)
-		host.ckey = src.ckey
-		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
-
 /mob/dead/observer/verb/view_manfiest()
 	set name = "View Crew Manifest"
 	set category = "Ghost"

code/modules/mob/living/carbon/metroid/death.dm

@@ -5,7 +5,7 @@
 
 	if(!gibbed)
 		if(istype(src, /mob/living/carbon/slime/adult))
-			ghostize()
+//			ghostize()
 			var/mob/living/carbon/slime/M1 = new primarytype(loc)
 			M1.rabid = 1
 			var/mob/living/carbon/slime/M2 = new primarytype(loc)

code/modules/mob/living/living.dm

@@ -671,7 +671,7 @@
 
 
 
-/mob/living/verb/become_mouse()
+/mob/living/proc/become_mouse()
 	if(usr in respawnable_list)
 		var/timedifference = world.time - client.time_died_as_mouse
 		if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)

code/modules/mob/living/simple_animal/emote.dm

@@ -0,0 +1,131 @@
+/mob/living/carbon/simple_animal/emote(var/act,var/m_type=1,var/message = null)
+
+	var/param = null
+	if (findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
+	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
+
+	switch(act)
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+
+		if ("custom")
+			return custom_emote(m_type, message)
+
+		if("sign")
+			if (!src.restrained())
+				message = text("<B>The monkey</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
+				m_type = 1
+		if("scratch")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> scratches."
+				m_type = 1
+		if("whimper")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> whimpers."
+				m_type = 2
+		if("roar")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> roars."
+				m_type = 2
+		if("tail")
+			message = "<B>The [src.name]</B> waves his tail."
+			m_type = 1
+		if("gasp")
+			message = "<B>The [src.name]</B> gasps."
+			m_type = 2
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+		if("drool")
+			message = "<B>The [src.name]</B> drools."
+			m_type = 1
+		if("paw")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> flails his paw."
+				m_type = 1
+		if("scretch")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> scretches."
+				m_type = 2
+		if("choke")
+			message = "<B>The [src.name]</B> chokes."
+			m_type = 2
+		if("moan")
+			message = "<B>The [src.name]</B> moans!"
+			m_type = 2
+		if("nod")
+			message = "<B>The [src.name]</B> nods his head."
+			m_type = 1
+		if("sit")
+			message = "<B>The [src.name]</B> sits down."
+			m_type = 1
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+		if("sulk")
+			message = "<B>The [src.name]</B> sulks down sadly."
+			m_type = 1
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches violently."
+			m_type = 1
+		if("dance")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> dances around happily."
+				m_type = 1
+		if("roll")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> rolls."
+				m_type = 1
+		if("shake")
+			message = "<B>The [src.name]</B> shakes his head."
+			m_type = 1
+		if("gnarl")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> gnarls and shows his teeth.."
+				m_type = 2
+		if("jump")
+			message = "<B>The [src.name]</B> jumps!"
+			m_type = 1
+		if("collapse")
+			Paralyse(2)
+			message = text("<B>[]</B> collapses!", src)
+			m_type = 2
+		if("deathgasp")
+			message = "<b>The [src.name]</b> lets out a faint chimper as it collapses and stops moving..."
+			m_type = 1
+		if("help")
+			src << "choke, collapse, dance, deathgasp, drool, gasp, shiver, gnarl, jump, paw, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper"
+		else
+			src << text("Invalid Emote: []", act)
+	if ((message && src.stat == 0))
+		if(src.client)
+			log_emote("[name]/[key] : [message]")
+		if (m_type & 1)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(703)
+		else
+			for(var/mob/O in hearers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(746)
+	return

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -15,7 +15,7 @@
 
 	var/turns_per_move = 1
 	var/turns_since_move = 0
-	universal_speak = 1
+	universal_speak = 0
 	var/meat_amount = 0
 	var/meat_type
 	var/stop_automated_movement = 0 //Use this to temporarely stop random movement or to if you write special movement code for animals.

code/world.dm

@@ -153,7 +153,7 @@
 			n++
 		s["players"] = n
 
-		if(revdata)	s["revision"] = revdata.revision
+//		if(revdata)	s["revision"] = revdata.revision
 		s["admins"] = admins
 
 		return list2params(s)