cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5945 from JJRcop/get_ghost-fix

Browse Source 
Fixes unreported issue with get_ghost
This commit is contained in:
Swag McYolosteinen
2014-12-03 17:45:07 +01:00
parent 1bb3cf4c31 140d368918
commit 501ecb1d2a
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_animal/friendly/drone.dm
View File

@@ -78,7 +78,7 @@
switch(d_input)
if("Reactivate")
var/mob/dead/observer/G = get_ghost()
if(!client && !G)
if(!client && (!G || !G.client))
var/list/faux_gadgets = list("hypertext inflator","failsafe directory","DRM switch","stack initializer",\
"anti-freeze capacitor","data stream diode","TCP bottleneck","supercharged I/O bolt",\
"tradewind stablizer","radiated XML cable","registry fluid tank","open-source debunker")

2
code/modules/mob/mob.dm
View File

@@ -882,7 +882,7 @@ var/list/slot_equipment_priority = list( \
/mob/proc/get_ghost(even_if_they_cant_reenter = 0)
if(mind)
for(var/mob/dead/observer/G in player_list)
for(var/mob/dead/observer/G in dead_mob_list)
if(G.mind == mind)
if(G.can_reenter_corpse || even_if_they_cant_reenter)
return G