cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17529 from ChangelingRain/unrisendead

Browse Source 
Fixes the raise dead rune so it actually works
This commit is contained in:
Jordie
2016-05-11 22:53:40 +10:00
parent 372d9837b1 9b8f813925
commit d21d4acb79
1 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/runes.dm
+43 -26
View File
@@ -534,40 +534,29 @@ var/list/teleport_runes = list()
var/mob/living/user = invokers[1]
if(rune_in_use)
return
for(var/mob/living/M in orange(1,src))
for(var/mob/living/M in orange(1,T))
if(M.stat == DEAD)
potential_sacrifice_mobs.Add(M)
potential_sacrifice_mobs |= M
if(!potential_sacrifice_mobs.len)
user << "<span class='cultitalic'>There are no eligible sacrifices nearby!</span>"
log_game("Raise Dead rune failed - no catalyst corpse")
return
mob_to_sacrifice = input(user, "Choose a corpse to sacrifice.", "Corpse to Sacrifice") as null|anything in potential_sacrifice_mobs
if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !mob_to_revive || !mob_to_sacrifice || rune_in_use)
log_game("Raise Dead rune failed - no catalyst corpses")
fail_invoke()
return
for(var/mob/living/M in T.contents)
if(M.stat == DEAD)
potential_revive_mobs.Add(M)
potential_revive_mobs |= M
if(!potential_revive_mobs.len)
user << "<span class='cultitalic'>There is no eligible revival target on the rune!</span>"
log_game("Raise Dead rune failed - no corpse to revived")
log_game("Raise Dead rune failed - no corpses to revive")
fail_invoke()
return
mob_to_sacrifice = input(user, "Choose a corpse to sacrifice.", "Corpse to Sacrifice") as null|anything in potential_sacrifice_mobs
if(!src || qdeleted(src) || rune_in_use || !validness_checks(mob_to_sacrifice, user, 1))
return
mob_to_revive = input(user, "Choose a corpse to revive.", "Corpse to Revive") as null|anything in potential_revive_mobs
if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use)
if(!src || qdeleted(src) || rune_in_use || !validness_checks(mob_to_sacrifice, user, 1))
return
if(!in_range(mob_to_sacrifice,src))
user << "<span class='cultitalic'>The sacrificial target has been moved!</span>"
fail_invoke()
log_game("Raise Dead rune failed - catalyst corpse moved")
return
if(!(mob_to_revive in T.contents))
user << "<span class='cultitalic'>The corpse to revive has been moved!</span>"
fail_invoke()
log_game("Raise Dead rune failed - revival target moved")
return
if(mob_to_sacrifice.stat != DEAD)
user << "<span class='cultitalic'>The sacrificial target must be dead!</span>"
fail_invoke()
log_game("Raise Dead rune failed - catalyst corpse is not dead")
if(!validness_checks(mob_to_revive, user, 0))
return
rune_in_use = 1
if(user.name == "Herbert West")
@@ -579,19 +568,47 @@ var/list/teleport_runes = list()
mob_to_revive.Beam(mob_to_sacrifice,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=20)
sleep(20)
if(!mob_to_sacrifice || !in_range(mob_to_sacrifice, src))
mob_to_sacrifice.visible_message("<span class='warning'><b>[mob_to_sacrifice] disintegrates into a pile of bones</span>")
rune_in_use = 0
return
mob_to_sacrifice.dust()
if(!mob_to_revive || mob_to_revive.stat != DEAD)
visible_message("<span class='warning'>The glowing tendril snaps against the rune with a shocking crack.</span>")
rune_in_use = 0
fail_invoke()
return
mob_to_revive.revive() //This does remove disabilities and such, but the rune might actually see some use because of it!
mob_to_sacrifice.visible_message("<span class='warning'><b>[mob_to_sacrifice] disintegrates into a pile of bones.</span>")
mob_to_sacrifice.dust()
mob_to_revive.revive(1, 1) //This does remove disabilities and such, but the rune might actually see some use because of it!
mob_to_revive << "<span class='cultlarge'>\"PASNAR SAVRAE YAM'TOTH. Arise.\"</span>"
mob_to_revive.visible_message("<span class='warning'>[mob_to_revive] draws in a huge breath, red light shining from their eyes.</span>", \
"<span class='cultlarge'>You awaken suddenly from the void. You're alive!</span>")
rune_in_use = 0
/obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user, saccing)
var/turf/T = get_turf(src)
if(!user)
return 0
if(!Adjacent(user) || user.incapacitated())
return 0
if(!target_mob)
fail_invoke()
return 0
if(saccing)
if(!in_range(target_mob, src))
user << "<span class='cultitalic'>The sacrificial target has been moved!</span>"
fail_invoke()
log_game("Raise Dead rune failed - catalyst corpse moved")
return 0
if(target_mob.stat != DEAD)
user << "<span class='cultitalic'>The sacrificial target must be dead!</span>"
fail_invoke()
log_game("Raise Dead rune failed - catalyst corpse is not dead")
return 0
else if(!(target_mob in T.contents))
user << "<span class='cultitalic'>The corpse to revive has been moved!</span>"
fail_invoke()
log_game("Raise Dead rune failed - revival target moved")
return 0
return 1
/obj/effect/rune/raise_dead/fail_invoke()
..()