Skip to content

Commit

Permalink
Updates some abnormalities
Browse files Browse the repository at this point in the history
Abnormality updates

updates pale horse
  • Loading branch information
Coxswain-Navigator committed Dec 3, 2023
1 parent 325fc99 commit 1caf091
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
var/atom/movable/AM
if(user.pulling)
AM = user.pulling
AM.forceMove(T)
if(ishuman(AM)) //We don't want players dragging the supplies in and out
AM.forceMove(T)
else
user.stop_pulling()
user.forceMove(T)
if(AM)
user.start_pulling(AM)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
var/teleport_cooldown_time = 30 SECONDS
//attack
var/mob/living/set_target
var/pulse_range = 7 //same range as scorched girl
var/pulse_range = 11 //fairly large area - enough to breach several abnormalities
var/fog_damage = 3
var/ash_damage = 20

Expand Down Expand Up @@ -113,13 +113,15 @@
H.apply_damage(fog_damage, PALE_DAMAGE, null, H.run_armor_check(null, PALE_DAMAGE), spread_damage = TRUE)


/mob/living/simple_animal/hostile/abnormality/pale_horse/Move() //more damaging fog when moving
/mob/living/simple_animal/hostile/abnormality/pale_horse/Moved() //more damaging fog when moving
. = ..()
if(!.)
return
var/turf/target_turf = get_turf(src)
for(var/turf/T in view(1, target_turf))
new /obj/effect/temp_visual/palefog(T)
..()

/mob/living/simple_animal/hostile/abnormality/pale_horse/AttackingTarget() //works but abnormality does not do it on its own todo: FIX!
/mob/living/simple_animal/hostile/abnormality/pale_horse/AttackingTarget()
. = ..()
if(!ishuman(target))
return FALSE
Expand Down Expand Up @@ -258,20 +260,26 @@
duration = 5

//status effects
//MORTIS - Raises pale vulnurability briefly
//MORTIS - Raises pale vulnurability briefly and deals pale damage over time
/datum/status_effect/mortis
id = "mortis"
duration = 15 SECONDS
status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/mortis
var/datum/abnormality/datum_reference = null
var/damage = 2

/atom/movable/screen/alert/status_effect/mortis
name = "Fated to die"
desc = "The pale horse saw your end and wept."
icon = 'ModularTegustation/Teguicons/status_sprites.dmi'
icon_state = "mortis"

/datum/status_effect/mortis/tick()
owner.apply_damage(damage, PALE_DAMAGE, null, owner.run_armor_check(null, PALE_DAMAGE), spread_damage = TRUE)
if(owner.health < 0 && ishuman(owner))
owner.dust()

/datum/status_effect/mortis/on_apply()
. = ..()
if(ishuman(owner))
Expand Down

0 comments on commit 1caf091

Please sign in to comment.