Merge pull request #15575 from phil235/ReviveFix1

Fixes mob revival
This commit is contained in:
Cheridan
2016-02-17 20:42:10 -06:00
35 changed files with 193 additions and 215 deletions
+2 -2
View File
@@ -133,7 +133,7 @@
victim.drop_r_hand()
victim.drop_l_hand()
victim.put_in_hands(chainsaw)
victim.reagents.add_reagent("adminordrazine",25)
victim.client.color = pure_red
@@ -154,7 +154,7 @@
if(!victim.client || !istype(victim))
return
victim << "<span class='notice'>You feel great!</span>"
victim.revive()
victim.revive(full_heal = 1, admin_revive = 1)
/obj/effect/mine/pickup/speed
name = "Yellow Orb"
@@ -87,15 +87,7 @@
if(ghost.mind && ghost.mind.current == R)
R.key = ghost.key
R.notify_ai(1)
R.stat = UNCONSCIOUS
R.update_stat()
if(R.camera && !R.wires.is_cut(WIRE_CAMERA))
R.camera.toggle_cam(R,0)
dead_mob_list -= R //please never forget this ever kthx
living_mob_list += R
R.revive()
return 1
+1 -6
View File
@@ -511,12 +511,7 @@
H.adjustBruteLoss((mobhealth - halfwaycritdeath) * (total_brute / overall_damage), 0)
user.visible_message("<span class='notice'>[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful.</span>")
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
H.stat = UNCONSCIOUS
H.updatehealth()
H.update_sight()
H.reload_fullscreen()
dead_mob_list -= H
living_mob_list |= list(H)
H.revive()
H.emote("gasp")
if(tplus > tloss)
H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))