mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 14:39:58 +01:00
Small devil fixes (#19302)
* Removes errant cast from devilinfo.add_soul() * Clarifies a banishment ritual in the Codex Gigas. Sprinkling holy water isn't enough, it needs to be in the devil's bloodstream. * Infernal jaunt now correctly extinguishes the user. Revival contracts no longer actually set the target on fire, but rather uses a fake fire. * Pitchforks don't burn devils or soulless on use/pickup anymore. Adds cast charge time to infernal jaunt, so that it's impossible to jaunt while already jaunting. Adds feedback to using infernal jaunt to jaunt in.
This commit is contained in:
@@ -790,3 +790,10 @@
|
||||
blood_volume -= amount
|
||||
return ..()
|
||||
|
||||
/mob/living/carbon/fakefire(var/fire_icon = "Generic_mob_burning")
|
||||
overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"= fire_icon, "layer"=-FIRE_LAYER)
|
||||
apply_overlay(FIRE_LAYER)
|
||||
|
||||
/mob/living/carbon/fakefireextinguish()
|
||||
remove_overlay(FIRE_LAYER)
|
||||
|
||||
|
||||
@@ -1044,3 +1044,9 @@ Sorry Giacom. Please don't be mad :(
|
||||
G.Recall()
|
||||
G << "<span class='holoparasite'>Your summoner has changed \
|
||||
form!</span>"
|
||||
|
||||
/mob/living/proc/fakefireextinguish()
|
||||
return
|
||||
|
||||
/mob/living/proc/fakefire()
|
||||
return
|
||||
@@ -187,11 +187,9 @@
|
||||
add_logs(user, H, "infernally revived via contract")
|
||||
user.visible_message("<span class='notice'>With a sudden blaze, [H] stands back up.</span>")
|
||||
H.adjust_fire_stacks(20)
|
||||
H.IgniteMob()
|
||||
H.fakefire()
|
||||
FulfillContract(H)
|
||||
sleep(5)
|
||||
H.ExtinguishMob()
|
||||
H.adjustFireLoss(0)
|
||||
addtimer(H, "fakefireextinguish",5,TRUE)
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
/obj/effect/proc_holder/spell/targeted/infernal_jaunt
|
||||
name = "Infernal Jaunt"
|
||||
desc = "Use hellfire to phase out of existence."
|
||||
charge_max = 10
|
||||
charge_max = 200
|
||||
clothes_req = 0
|
||||
selection_type = "range"
|
||||
range = -1
|
||||
@@ -121,6 +121,7 @@
|
||||
else
|
||||
user.notransform = 1
|
||||
user.fakefire()
|
||||
src << "<span class='warning'>You begin to phase back into sinful flames.</span>"
|
||||
addtimer(user, "infernalphaseout",150,TRUE,get_turf(user))
|
||||
start_recharge()
|
||||
return
|
||||
@@ -159,20 +160,7 @@
|
||||
src.client.eye = src
|
||||
src.visible_message("<span class='warning'><B>[src] appears in a firey blaze!</B>")
|
||||
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
|
||||
addtimer(src, "fakefireextinguish" ,15,TRUE,get_turf(src))
|
||||
|
||||
/mob/living/proc/fakefire()
|
||||
return
|
||||
|
||||
/mob/living/carbon/fakefire(var/fire_icon = "Generic_mob_burning")
|
||||
overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"= fire_icon, "layer"=-FIRE_LAYER)
|
||||
apply_overlay(FIRE_LAYER)
|
||||
|
||||
/mob/living/proc/fakefireextinguish()
|
||||
return
|
||||
|
||||
/mob/living/carbon/fakefireextinguish()
|
||||
remove_overlay(FIRE_LAYER)
|
||||
addtimer(src, "fakefireextinguish", 15,TRUE)
|
||||
|
||||
/obj/effect/proc_holder/spell/targeted/sintouch
|
||||
name = "Sin Touch"
|
||||
|
||||
Reference in New Issue
Block a user