Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command

This commit is contained in:
Markolie
2017-02-05 20:36:04 +01:00
parent 9127d07b4e
commit b17dca7c57
3 changed files with 8 additions and 2 deletions
@@ -344,6 +344,10 @@
to_chat(user, "[choice] is already dead!")
used = FALSE
return
else 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
@@ -95,7 +95,8 @@
visible_message(
"<span class='danger'>[src] devours [L]!</span>",
"<span class='userdanger'>You feast on [L], restoring your health!</span>")
adjustBruteLoss(-L.maxHealth/2)
if(!is_station_level(z) && !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)
+2 -1
View File
@@ -246,7 +246,8 @@
/obj/machinery/teleport/station,
/obj/machinery/teleport/hub,
/obj/machinery/telepad,
/obj/machinery/clonepod
/obj/machinery/clonepod,
/obj/effect/hierophant
)
if(A)
if(is_type_in_list(A, blacklist))