Skip to content

Commit

Permalink
FUCKING ANIMATE CODE RAHHHHHH
Browse files Browse the repository at this point in the history
  • Loading branch information
XeonMations committed Aug 23, 2024
1 parent 2831e18 commit 2cfdc63
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions code/modules/mob/dead/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT)
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
invisibility = INVISIBILITY_SPIRIT
hud_type = /datum/hud/ghost
movement_type = GROUND | FLYING
light_system = MOVABLE_LIGHT
light_range = 1
light_power = 2
Expand Down Expand Up @@ -135,9 +134,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT)
remove_verb(/mob/dead/observer/verb/boo)
remove_verb(/mob/dead/observer/verb/possess)

animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)
animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)

add_to_dead_mob_list()

for(var/v in GLOB.active_alternate_appearances)
Expand All @@ -153,6 +149,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT)
data_huds_on = 1

AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE, "#490066")
AddElement(/datum/element/movetype_handler)
ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost")

/mob/dead/observer/get_photo_description(obj/item/camera/camera)
return "You can also see a g-g-g-g-ghooooost!"
Expand Down Expand Up @@ -480,14 +478,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp

/mob/dead/observer/orbit()
setDir(2)//reset dir so the right directional sprites show up
REMOVE_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost")
return ..()

/mob/dead/observer/stop_orbit(datum/component/orbiter/orbits)
. = ..()
//restart our floating animation after orbit is done.
pixel_y = base_pixel_y
animate(src, pixel_y = base_pixel_y + 2, time = 1 SECONDS, loop = -1)
animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)
ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost")

/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
Expand Down

0 comments on commit 2cfdc63

Please sign in to comment.