[MIRROR] Fixing ghost bobbing (for real this time) [MDB IGNORE] (#11526)

* Fixing ghost bobbing (for real this time) (#64891)

* Fixing ghost bobbing (for real this time)

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-02-15 23:28:06 +00:00
committed by GitHub
co-authored by GoldenAlpharex
parent 1838decf7e
commit 6de04ee694
2 changed files with 4 additions and 1 deletions
+2
View File
@@ -767,6 +767,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define DRONE_SHY_TRAIT "drone_shy"
/// Pacifism trait given by stabilized light pink extracts.
#define STABILIZED_LIGHT_PINK_TRAIT "stabilized_light_pink"
/// Trait given to a ghost when they orbit something.
#define GHOST_ORBITING_TRAIT "ghost_orbiting"
/**
* Trait granted by [/mob/living/carbon/Initialize] and
+2 -1
View File
@@ -500,13 +500,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
ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, GHOST_ORBITING_TRAIT)
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)
REMOVE_TRAIT(src, TRAIT_NO_FLOATING_ANIM, GHOST_ORBITING_TRAIT)
/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"