From baaf3b2335e150e9df78eacf5c3d896154750a2a Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 23 May 2016 00:36:12 -0400 Subject: [PATCH 1/4] Fixes #178 --- code/modules/mob/living/simple_animal/hostile/vore/alien.dm | 2 ++ code/modules/mob/living/simple_animal/hostile/vore/vore.dm | 3 +++ 2 files changed, 5 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm index cb92c649df..aeded41f02 100644 --- a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm @@ -81,6 +81,8 @@ move_to_delay = 4 maxHealth = 400 health = 400 + old_x = -16 + old_y = -16 pixel_x = -16 capacity = 3 diff --git a/code/modules/mob/living/simple_animal/hostile/vore/vore.dm b/code/modules/mob/living/simple_animal/hostile/vore/vore.dm index ca55f039b7..7bae66df36 100644 --- a/code/modules/mob/living/simple_animal/hostile/vore/vore.dm +++ b/code/modules/mob/living/simple_animal/hostile/vore/vore.dm @@ -140,6 +140,9 @@ Don't use ranged mobs for vore mobs. icon_dead = "snake-dead" icon_living = "snake" icon_state = "snake" + old_x = -16 + old_y = -16 pixel_x = -16 + pixel_y = -16 maxHealth = 200 health = 200 \ No newline at end of file From 1f24969d4421c845b33fa5da55e80f516370671b Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 23 May 2016 00:36:58 -0400 Subject: [PATCH 2/4] Tweak --- code/modules/mob/living/simple_animal/hostile/vore/alien.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm index aeded41f02..08f6e38ab7 100644 --- a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm @@ -82,8 +82,9 @@ maxHealth = 400 health = 400 old_x = -16 - old_y = -16 + old_y = 0 pixel_x = -16 + pixel_y = 0 capacity = 3 /obj/item/projectile/neurotox From d5710556a8aa577bfaa19dac4e541ae6b6d80d84 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 23 May 2016 00:50:22 -0400 Subject: [PATCH 3/4] Faction wasn't correct! --- code/modules/mob/living/simple_animal/hostile/vore/alien.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm index 08f6e38ab7..e157f8aec2 100644 --- a/code/modules/mob/living/simple_animal/hostile/vore/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/vore/alien.dm @@ -78,6 +78,7 @@ icon_state = "queen_s" icon_living = "queen_s" icon_dead = "queen_dead" + faction = "alien" move_to_delay = 4 maxHealth = 400 health = 400 From bbc70d1bd99f1bea5ac15f84ab505fbd41f06e70 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 23 May 2016 01:16:14 -0400 Subject: [PATCH 4/4] Ghost alert prompt no longer lies --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a7c4384f4f..e783853aa8 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -219,7 +219,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return src.client.admin_ghost() else - response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") + response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. Don't abuse ghost unless you are inside a cryopod or equivalent! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") // VOREStation edit because we don't make players stay dead for 30 minutes. if(response != "Ghost") return resting = 1