Merge branch 'master' of https://github.com/XeonMations/BeeStation-Ho…

…rnet

code/modules/mob/dead/observer/observer.dm

@@ -453,7 +453,7 @@ 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_original)
 	var/atom/movable/target = target_original.get_orbitable()
-	if (!istype(target) || target_original.orbit_datum?.parent == target_original)
+	if (!istype(target) || orbiting?.parent == target_original)
 		return
 
 	var/icon/I = icon(target.icon,target.icon_state,target.dir)

html/changelog.html

@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">27 August 2024</h2>
+			<h3 class="author">XeonMations updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ghosts can now orbit the same person another ghost is orbiting.</li>
+			</ul>
+
 			<h2 class="date">26 August 2024</h2>
 			<h3 class="author">XeonMations updated:</h3>
 			<ul class="changes bgimages16">
@@ -870,48 +876,6 @@ <h3 class="author">XeonMations updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed holy aura not being removed after holy water is removed from the person's symptom</li>
 			</ul>
-
-			<h2 class="date">25 June 2024</h2>
-			<h3 class="author">EvilDragonfiend updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Language menu TGUI now shows language icon, and better readable description layout</li>
-				<li class="code_imp">Slightly improved language menu code</li>
-			</ul>
-			<h3 class="author">Gilgaxx updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Echostation: replaced disposals' delivery chute (input) with a disposals outlet (output)</li>
-				<li class="bugfix">Echostation: Inverted the airmixer to distro so it's now 21/79 o2/n2</li>
-			</ul>
-			<h3 class="author">HowToLoLu updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Tinfoil envirosuit helmets act as internals now and no longer block syringes, just like other envirosuit helmets</li>
-			</ul>
-			<h3 class="author">Markus Larsson updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added almost 20 new maintenance rooms.</li>
-				<li class="tweak">Added a chance for a ripley to spawn.</li>
-				<li class="tweak">Added a sniffer to the Robotics maintenance room.</li>
-			</ul>
-			<h3 class="author">PowerfulBacon updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Lowers damage of cult sword from 30 to 23. Maximum damage from sharpening reduced from 40 to 30.</li>
-				<li class="balance">Cult stun now EMPs the target's headset.</li>
-				<li class="balance">Holy protection is now visible to anyone with holy protection themselves, and is also visible to cultists.</li>
-				<li class="balance">Flagellant's have postiive armour rather than negative armour, making them somewhat viable.</li>
-				<li class="balance">Holy protection will now allow you to bypass the mirror shield's blocking, and will result in taking reduced damage from cult swords.</li>
-				<li class="balance">EMPs will no longer disable all your channels on radio headsets, instead temporarilly disabling them for 20 seconds similar to other EMP effects.</li>
-			</ul>
-			<h3 class="author">XeonMations updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Renewed Cyborg software to correctly deal with laser pointer spam.</li>
-				<li class="balance">Laser pointers now stunlock a cyborg for 5 seconds instead of the previous 1-2 seconds, now consider cyborg software before flashing a borg.</li>
-			</ul>
-			<h3 class="author">rkz, Fikou, twaticus, Pepsiman0, Twaticus, Arkatos1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">expanded Tile reskinning to all iron tiles. Tile reskinning now controlled via radial menu when pressing 'Z' while holding the tilestack.</li>
-				<li class="rscadd">rad edits</li>
-				<li class="rscadd">adds several new iron tile types, at the moment exclusively in the tile reskinning menu</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -44022,3 +44022,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   XeonMations:
   - bugfix: Fixed a few mobs having floating animations.
   - bugfix: Ghosts can no longer become stuck in the orbit animation.
+2024-08-27:
+  XeonMations:
+  - bugfix: Ghosts can now orbit the same person another ghost is orbiting.