Merge remote-tracking branch 'citadel/master' into mobility_flags
This commit is contained in:
@@ -4,6 +4,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
|
||||
|
||||
/mob/dead
|
||||
sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
|
||||
move_resist = INFINITY
|
||||
throwforce = 0
|
||||
|
||||
/mob/dead/Initialize()
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
density = FALSE
|
||||
stat = DEAD
|
||||
|
||||
anchored = TRUE // don't get pushed around
|
||||
|
||||
var/mob/living/new_character //for instant transfer once the round is set up
|
||||
|
||||
//Used to make sure someone doesn't get spammed with messages if they're ineligible for roles
|
||||
|
||||
@@ -663,10 +663,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
to_chat(src, "<span class='warning'>This creature is too powerful for you to possess!</span>")
|
||||
return 0
|
||||
|
||||
if(istype (target, /mob/living/simple_animal/hostile/spawner))
|
||||
to_chat(src, "<span class='warning'>This isn't really a creature, now is it!</span>")
|
||||
return 0
|
||||
|
||||
if(can_reenter_corpse && mind && mind.current)
|
||||
if(alert(src, "Your soul is still tied to your former life as [mind.current.name], if you go forward there is no going back to that life. Are you sure you wish to continue?", "Move On", "Yes", "No") == "No")
|
||||
return 0
|
||||
|
||||
Reference in New Issue
Block a user