From 9fff5ab55f5a22c000a79bcb9f09063615abca34 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 21 Jan 2017 12:09:04 -0600 Subject: [PATCH 1/3] Blood Contract --- code/modules/mining/lavaland/necropolis_chests.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 2735174c3f1..c8914e2ed24 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -734,6 +734,10 @@ user << "[choice] is already dead!" used = FALSE return + if(choice == user) + user << "You feel like writing your own name into a cursed death warrant would be unwise." + used + FALSE + return else var/mob/living/L = choice From 2b5e15c1c8d9ef21790d77590df8ccd440e821cb Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 21 Jan 2017 12:18:31 -0600 Subject: [PATCH 2/3] Megafauna won't heal while on station --- .../mob/living/simple_animal/hostile/megafauna/megafauna.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 29e0dfcbabd..1a8e8a44c7a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -97,7 +97,8 @@ visible_message( "[src] devours [L]!", "You feast on [L], restoring your health!") - adjustBruteLoss(-L.maxHealth/2) + if(z != ZLEVEL_STATION && !client) //NPC monsters won't heal while on station + adjustBruteLoss(-L.maxHealth/2) L.gib() /mob/living/simple_animal/hostile/megafauna/ex_act(severity, target) From e35a1d18b4db271a30c6880df4b0899aa16c4040 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 21 Jan 2017 12:24:03 -0600 Subject: [PATCH 3/3] Typo Fix --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index c8914e2ed24..5ff9b0c61fd 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -736,7 +736,7 @@ return if(choice == user) user << "You feel like writing your own name into a cursed death warrant would be unwise." - used + FALSE + used = FALSE return else