Merge pull request #7460 from Crazylemon64/soullink_port

Soullink port + Cloning tweak
This commit is contained in:
tigercat2000
2017-06-22 16:30:42 -07:00
committed by GitHub
6 changed files with 265 additions and 13 deletions
@@ -143,9 +143,9 @@
return ..(gibbed)
/mob/living/carbon/human/update_revive()
..()
. = ..()
// Update healthdoll
if(healthdoll)
if(. && healthdoll)
// We're alive again, so re-build the entire healthdoll
healthdoll.cached_healthdoll_overlays.Cut()
+8
View File
@@ -3,4 +3,12 @@
clear_fullscreens()
update_action_buttons_icon()
for(var/s in ownedSoullinks)
var/datum/soullink/S = s
S.ownerDies(gibbed, src)
for(var/s in sharedSoullinks)
var/datum/soullink/S = s
S.sharerDies(gibbed, src)
..(gibbed)
+10 -2
View File
@@ -37,9 +37,9 @@
// handles revival through other means than cloning or adminbus (defib, IPC repair)
/mob/living/proc/update_revive(updating = TRUE)
if(stat != DEAD)
return
return 0
if(!can_be_revived())
return
return 0
add_logs(src, null, "came back to life at [atom_loc_line(get_turf(src))]", admin=0, print_attack_log = 0)
stat = CONSCIOUS
dead_mob_list -= src
@@ -49,3 +49,11 @@
update_canmove()
// update_blind_effects()
updatehealth()
for(var/s in ownedSoullinks)
var/datum/soullink/S = s
S.ownerRevives(src)
for(var/s in sharedSoullinks)
var/datum/soullink/S = s
S.sharerRevives(src)
return 1