Skip to content

Commit

Permalink
Xeno telegraph effect can now be any rgb colour
Browse files Browse the repository at this point in the history
  • Loading branch information
Birdtalon committed Dec 12, 2023
1 parent 25d70da commit c9bdbe1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
19 changes: 10 additions & 9 deletions code/game/objects/effects/aliens.dm
Original file line number Diff line number Diff line change
Expand Up @@ -489,29 +489,30 @@
/obj/effect/xenomorph/xeno_telegraph
name = "???"
desc = ""
icon_state = "xeno_telegraph_red"
icon_state = "xeno_telegraph_base"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/obj/effect/xenomorph/xeno_telegraph/New(loc, ttl = 10)
/obj/effect/xenomorph/xeno_telegraph/New(loc, ttl = 10, color = null)
..(loc)
if(color)
src.color = color
QDEL_IN(src, ttl)

/obj/effect/xenomorph/xeno_telegraph/red
icon_state = "xeno_telegraph_red"
color = COLOUR_DARK_RED

/obj/effect/xenomorph/xeno_telegraph/brown
icon_state = "xeno_telegraph_brown"
color = COLOUR_BROWN

/obj/effect/xenomorph/xeno_telegraph/green
icon_state = "xeno_telegraph_green"
color = COLOUR_GREEN

/obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook
/obj/effect/xenomorph/xeno_telegraph/abduct_hook
icon_state = "xeno_telegraph_abduct_hook_anim"

/obj/effect/xenomorph/xeno_telegraph/brown/lash
/obj/effect/xenomorph/xeno_telegraph/lash
icon_state = "xeno_telegraph_lash"


color = COLOUR_BROWN

/obj/effect/xenomorph/acid_damage_delay
name = "???"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@

turflist += turf
facing = get_dir(turf, atom)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook(turf, windup)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/abduct_hook(turf, windup)

if(!length(turflist))
to_chat(xeno, SPAN_XENOWARNING("You don't have any room to do your abduction!"))
Expand Down Expand Up @@ -467,14 +467,14 @@
continue

target_turfs += T
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/lash(T, windup)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/lash(T, windup)

var/turf/next_turf = get_step(T, facing)
if (!istype(next_turf) || next_turf.density)
continue

target_turfs += next_turf
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/lash(next_turf, windup)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/lash(next_turf, windup)

if(!length(target_turfs))
to_chat(X, SPAN_XENOWARNING("You don't have any room to do your tail lash!"))
Expand Down
Binary file modified icons/mob/xenos/effects.dmi
Binary file not shown.

0 comments on commit c9bdbe1

Please sign in to comment.