Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ghost orbiting a zmimic will make you orbit the original atom. #10856

Merged
merged 5 commits into from
Apr 11, 2024
Merged

Ghost orbiting a zmimic will make you orbit the original atom. #10856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43baef7
It just works
JixS4v Apr 5, 2024
d2864e0
fucky wucky
JixS4v Apr 5, 2024
849f2df
Refactor
JixS4v Apr 9, 2024
435aa18
Update code/game/atoms.dm
JixS4v Apr 9, 2024
699e512
Update code/modules/multiz/zmimic/mimic_movable.dm
JixS4v Apr 9, 2024
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
3 changes: 3 additions & 0 deletions code/game/atoms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1906,3 +1906,6 @@
luminosity = max(max(base_luminosity, affecting_dynamic_lumi), 1)
else
luminosity = max(base_luminosity, affecting_dynamic_lumi)

/atom/movable/proc/get_orbitable()
return src
3 changes: 2 additions & 1 deletion code/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp


// This is the ghost's follow verb with an argument
/mob/dead/observer/check_orbitable(atom/movable/target)
/mob/dead/observer/check_orbitable(atom/movable/target_original)
var/atom/movable/target = target_original.get_orbitable()
if (!istype(target))
return

Expand Down
4 changes: 4 additions & 0 deletions code/modules/multiz/zmimic/mimic_movable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@
if (!destruction_timer)
destruction_timer = QDEL_IN(src, 10 SECONDS)

// Get actual source atom when orbiting
/atom/movable/openspace/mimic/get_orbitable()
return associated_atom

// -- TURF PROXY --
// This thing holds the mimic appearance for non-OVERWRITE turfs.
/atom/movable/openspace/turf_proxy
Expand Down
Loading