mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-14 08:35:39 +01:00
A couple ghost fixes
This commit is contained in:
@@ -123,8 +123,14 @@
|
||||
if(ishuman(body))
|
||||
var/mob/living/carbon/human/H = body
|
||||
add_overlay(H.overlays_standing)
|
||||
<<<<<<< HEAD
|
||||
|
||||
if(!T)
|
||||
=======
|
||||
default_pixel_x = body.default_pixel_x
|
||||
default_pixel_y = body.default_pixel_y
|
||||
if(!T && length(latejoin))
|
||||
>>>>>>> 37f30aeaf66... Merge pull request #8694 from Verkister/patch-94
|
||||
T = pick(latejoin) //Safety in case we cannot find the body's position
|
||||
if(T)
|
||||
forceMove(T)
|
||||
@@ -136,8 +142,16 @@
|
||||
name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
|
||||
real_name = name
|
||||
animate(src, pixel_y = 2, time = 10, loop = -1)
|
||||
<<<<<<< HEAD
|
||||
observer_mob_list += src
|
||||
..()
|
||||
=======
|
||||
animate(pixel_y = default_pixel_y, time = 10, loop = -1)
|
||||
. = ..()
|
||||
|
||||
exonet = new(src)
|
||||
init_exonet()
|
||||
>>>>>>> 37f30aeaf66... Merge pull request #8694 from Verkister/patch-94
|
||||
|
||||
/mob/observer/dead/Topic(href, href_list)
|
||||
if (href_list["track"])
|
||||
@@ -505,10 +519,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
/mob/observer/dead/stop_orbit()
|
||||
. = ..()
|
||||
//restart our floating animation after orbit is done.
|
||||
pixel_y = 0
|
||||
pixel_x = 0
|
||||
pixel_y = default_pixel_y
|
||||
pixel_x = default_pixel_x
|
||||
transform = null
|
||||
animate(src, pixel_y = 2, time = 10, loop = -1)
|
||||
animate(pixel_y = default_pixel_y, time = 10, loop = -1)
|
||||
|
||||
/mob/observer/dead/proc/stop_following()
|
||||
following = null
|
||||
|
||||
Reference in New Issue
Block a user