July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -1,85 +1,82 @@
-/mob/living/gib(no_brain, no_organs, no_bodyparts)
-	var/prev_lying = lying
-	if(stat != DEAD)
-		death(1)
-
-	if(!prev_lying)
-		gib_animation()
-
-	spill_organs(no_brain, no_organs, no_bodyparts)
-
-	if(!no_bodyparts)
-		spread_bodyparts(no_brain, no_organs)
-
-	spawn_gibs(no_bodyparts)
-	qdel(src)
-
-/mob/living/proc/gib_animation()
-	return
-
-/mob/living/proc/spawn_gibs()
-	new /obj/effect/gibspawner/generic(loc, viruses)
-
-/mob/living/proc/spill_organs()
-	return
-
-/mob/living/proc/spread_bodyparts()
-	return
-
-/mob/living/dust(just_ash = FALSE)
-	death(1)
-
-	if(buckled)
-		buckled.unbuckle_mob(src,force=1)
-
-	dust_animation()
-	spawn_dust(just_ash)
-	qdel(src)
-
-/mob/living/proc/dust_animation()
-	return
-
-/mob/living/proc/spawn_dust(just_ash = FALSE)
-	new /obj/effect/decal/cleanable/ash(loc)
-
-
-/mob/living/death(gibbed)
-	stat = DEAD
-	unset_machine()
-	timeofdeath = world.time
-	tod = worldtime2text()
-	var/turf/T = get_turf(src)
-	var/area/A = get_area(T)
+/mob/living/gib(no_brain, no_organs, no_bodyparts)
+	var/prev_lying = lying
+	if(stat != DEAD)
+		death(1)
+
+	if(!prev_lying)
+		gib_animation()
+
+	spill_organs(no_brain, no_organs, no_bodyparts)
+
+	if(!no_bodyparts)
+		spread_bodyparts(no_brain, no_organs)
+
+	spawn_gibs(no_bodyparts)
+	qdel(src)
+
+/mob/living/proc/gib_animation()
+	return
+
+/mob/living/proc/spawn_gibs()
+	new /obj/effect/gibspawner/generic(loc, viruses)
+
+/mob/living/proc/spill_organs()
+	return
+
+/mob/living/proc/spread_bodyparts()
+	return
+
+/mob/living/dust(just_ash = FALSE)
+	death(1)
+
+	if(buckled)
+		buckled.unbuckle_mob(src,force=1)
+
+	dust_animation()
+	spawn_dust(just_ash)
+	qdel(src)
+
+/mob/living/proc/dust_animation()
+	return
+
+/mob/living/proc/spawn_dust(just_ash = FALSE)
+	new /obj/effect/decal/cleanable/ash(loc)
+
+
+/mob/living/death(gibbed)
+	stat = DEAD
+	unset_machine()
+	timeofdeath = world.time
+	tod = worldtime2text()
+	var/turf/T = get_turf(src)
+	var/area/A = get_area(T)
 	for(var/obj/item/I in contents)
 		I.on_mob_death(src, gibbed)
-	if(mind && mind.name && mind.active && (!(T.flags & NO_DEATHRATTLE)))
-		var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[A.name]</b>.</span>"
-		deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
-	if(mind)
-		mind.store_memory("Time of death: [tod]", 0)
-	GLOB.living_mob_list -= src
-	if(!gibbed)
-		GLOB.dead_mob_list += src
-	paralysis = 0
-	stunned = 0
-	weakened = 0
-	set_drugginess(0)
-	SetSleeping(0, 0)
-	blind_eyes(1)
-	reset_perspective(null)
-	reload_fullscreen()
-	update_action_buttons_icon()
-	update_damage_hud()
-	update_health_hud()
-	update_canmove()
-	med_hud_set_health()
-	med_hud_set_status()
-
-	for(var/s in ownedSoullinks)
-		var/datum/soullink/S = s
-		S.ownerDies(gibbed)
-	for(var/s in sharedSoullinks)
-		var/datum/soullink/S = s
-		S.sharerDies(gibbed)
-
-	return TRUE
+	if(mind && mind.name && mind.active && (!(T.flags & NO_DEATHRATTLE)))
+		var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[A.name]</b>.</span>"
+		deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
+	if(mind)
+		mind.store_memory("Time of death: [tod]", 0)
+	GLOB.living_mob_list -= src
+	if(!gibbed)
+		GLOB.dead_mob_list += src
+	set_drugginess(0)
+	SetSleeping(0, 0)
+	blind_eyes(1)
+	reset_perspective(null)
+	reload_fullscreen()
+	update_action_buttons_icon()
+	update_damage_hud()
+	update_health_hud()
+	update_canmove()
+	med_hud_set_health()
+	med_hud_set_status()
+
+	for(var/s in ownedSoullinks)
+		var/datum/soullink/S = s
+		S.ownerDies(gibbed)
+	for(var/s in sharedSoullinks)
+		var/datum/soullink/S = s
+		S.sharerDies(gibbed)
+
+	return TRUE