Respawn and animal fixes

This commit is contained in:
ZomgPonies
2013-11-29 07:04:43 -05:00
parent 4fdba0c040
commit e956cc75cd
3 changed files with 5 additions and 3 deletions
+2 -2
View File
@@ -132,9 +132,9 @@
for(var/mob/C in player_list)
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"))
switch(alert(C,"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.","Clone Alert","Yes","No"))
if("Yes")
C.key = M.key
M.key = C.key
return
if("No")
return
+1 -1
View File
@@ -46,7 +46,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
for(var/mob/O in respawnable_list)
if(O.mind == source.mind && config.revival_pod_plants)
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"))
switch(alert(O,"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.","Pod Alert","Yes","No"))
if("Yes")
source.key = O.key
return
+2
View File
@@ -92,6 +92,8 @@
return 1
else if (istype(other, /mob/living/carbon/human) && istype(src, /mob/living/carbon/human))
return 1
else if (istype(other, /mob/living/simple_animal) && istype(src, /mob/living/simple_animal))
return 1
return 0
/mob/proc/say_quote(var/text,var/datum/language/speaking)