Merge pull request #8659 from Ghommie/Ghommie-cit57

ports "Componentizes orbiting"
This commit is contained in:
kevinz000
2019-06-23 06:50:32 -07:00
committed by GitHub
19 changed files with 223 additions and 245 deletions
+1 -4
View File
@@ -342,10 +342,7 @@
if(cooldown>world.time)
to_chat(owner, "<span class='cultbold'>You aren't ready to place another blood mark yet!</span>")
return
if(owner.orbiting && owner.orbiting.orbiting)
target = owner.orbiting.orbiting
else
target = get_turf(owner)
target = owner.orbiting?.parent || get_turf(owner)
if(!target)
return
C.cult_team.blood_target = target