Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

fixes bloody knuckles not splashing when used by undead races and also marking the user with one of the abilities #14575

Merged
ToasterBiome merged 2 commits into from
Jun 24, 2022
Merged

fixes bloody knuckles not splashing when used by undead races and also marking the user with one of the abilities #14575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb32605
whoops
LazennG Jun 23, 2022
a25c89a
Update necropolis_chests.dm
LazennG Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions code/modules/mining/lavaland/necropolis_chests.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,16 +1171,16 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
return
next_knuckle = world.time + COOLDOWN_ANIMAL

/obj/item/melee/knuckles/attack_self(mob/living/user)
/obj/item/melee/knuckles/attack_self(mob/user)
var/turf/T = get_turf(user)
if(next_splash > world.time)
to_chat(user, span_warning("You can't do that yet!"))
return
user.visible_message(span_warning("[user] splashes blood from their knuckles!"))
user.visible_message(span_warning("[user] splashes blood from the knuckles!"))
playsound(T, 'sound/effects/splat.ogg', 80, 5, -1)
for(var/i = 0 to splash_range)
if(T)
user.add_splatter_floor(T)
new /obj/effect/decal/cleanable/blood(T)
T = get_step(T,user.dir)
next_splash = world.time + COOLDOWN

Expand All @@ -1192,6 +1192,8 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
return
var/valid_reaching = FALSE
for(var/mob/living/L in view(7, U))
if(L == U)
continue
for(var/obj/effect/decal/cleanable/B in range(0,L))
if(istype(B, /obj/effect/decal/cleanable/blood )|| istype(B, /obj/effect/decal/cleanable/trail_holder))
valid_reaching = TRUE
Expand Down