Skip to content

Commit

Permalink
Merge pull request #5755 from Trilbyspaceclone/ill_lower_crayon_sanit…
Browse files Browse the repository at this point in the history
…y_damage_i_guess

Lowers crayon sanity damage
  • Loading branch information
Trilbyspaceclone authored Oct 15, 2024
2 parents 7760271 + f8e3d1e commit 354703d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions code/game/objects/effects/decals/crayon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
layer = TURF_DECAL_LAYER
anchored = TRUE
random_rotation = 0
sanity_damage = 4
sanity_damage = 0.04
var/is_rune = FALSE
var/obj/item/pen/crayon/follow_crayon

Expand All @@ -19,6 +19,7 @@
desc = "A fine mist comes off this rune"
alpha = 150
is_rune = TRUE //We can infact cast from this rune
sanity_damage = 4

/obj/effect/decal/cleanable/crayon/mist/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover, /obj/item/projectile/beam))
Expand All @@ -31,6 +32,7 @@
desc = "The air shimmers about this rune."
alpha = 150
is_rune = TRUE //We can infact cast from this rune
sanity_damage = 4

/obj/effect/decal/cleanable/crayon/shimmer/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover, /obj/item/projectile) && !istype(mover, /obj/item/projectile/beam))
Expand All @@ -43,6 +45,7 @@
desc = "The air shimmers about this rune."
alpha = 50
is_rune = TRUE //We can infact cast from this rune
sanity_damage = 4
var/playmate = 0
var/draw = 1

Expand Down Expand Up @@ -146,8 +149,9 @@
if(follow_crayon)
var/old_desc = "[follow_crayon.desc]"
follow_crayon.desc = "[old_desc] The strange energies of this planet seem to have infused it with more signicance than before."
desc = "A rune drawn in empowered crayon wax."
follow_crayon = null
desc = "A rune drawn in empowered crayon wax."
sanity_damage = 4
var/datum/reagent/organic/blood/B = M.get_blood()
var/candle_amount = 0
for(var/obj/item/flame/candle/mage_candle in oview(3))
Expand Down

0 comments on commit 354703d

Please sign in to comment.