Skip to content

Commit

Permalink
virtual mob tweak revert
Browse files Browse the repository at this point in the history
  • Loading branch information
X0-11 committed Jun 3, 2024
1 parent 51026d2 commit f655f4d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions code/modules/mob/observer/virtual/base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ var/list/all_virtual_listeners = list()

/atom/movable/Initialize()
. = ..()
if(shall_have_virtual_mob())
virtual_mob = new virtual_mob(get_turf(src), src)
if(ispath(virtual_mob))
if(shall_have_virtual_mob())
virtual_mob = new virtual_mob(get_turf(src), src)
else
virtual_mob = null

/atom/movable/Destroy()
if(virtual_mob && !ispath(virtual_mob))
Expand All @@ -70,6 +73,4 @@ var/list/all_virtual_listeners = list()
return TRUE

/mob/shall_have_virtual_mob()
var/init_virt = initial(virtual_mob)
if(!isnull(init_virt))
return ispath(init_virt)
return (src in GLOB.mob_list)
2 changes: 1 addition & 1 deletion maps/_gamemodes/firefight/overmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/datum/npc_overmind/firefight/New()
. = ..()
START_PROCESSING(SSobj, src)
START_PROCESSING(SSobj, src)

/datum/npc_overmind/firefight/create_taskpoint_assign()
//intentionally left blank
Expand Down
2 changes: 1 addition & 1 deletion test/check-paths.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

WORLD_LOG_COUNT=40
ANGLE_BRACKET_COUNT=730
ANGLE_BRACKET_COUNT=731

FAILED=0

Expand Down

0 comments on commit f655f4d

Please sign in to comment.