Merge remote-tracking branch 'citadel/master' into tgsync

2021-01-08 00:33:57 -08:00
parent 16a9361345 76cb637f9d
commit ddad368d6a
231 changed files with 8727 additions and 6166 deletions
@@ -138,6 +138,18 @@
 	name = "White Fly"
 	icon_state = "whitefly"

+/datum/sprite_accessory/deco_wings/oakworm
+	name = "Oak Worm"
+	icon_state = "oakworm"
+
+/datum/sprite_accessory/deco_wings/witchwing
+	name = "Witch Wing"
+	icon_state = "witchwing"
+
+/datum/sprite_accessory/deco_wings/jungle
+	name = "Jungle"
+	icon_state = "jungle"
+
 //INSECT WINGS

 /datum/sprite_accessory/insect_wings
@@ -380,6 +380,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp


 /mob/dead/observer/Move(NewLoc, direct)
+	if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+		return
 	if(updatedir)
 		setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
 	var/oldloc = loc
@@ -68,7 +68,7 @@ Doesn't work on other aliens/AI.*/

 /obj/effect/proc_holder/alien/plant
 	name = "Plant Weeds"
-	desc = "Plants some alien weeds."
+	desc = "Plants Alien weeds which spread resin which heals any alien. These weeds also regenerate plasma faster. Costs 50 Plasma."
 	plasma_cost = 50
 	check_turf = TRUE
 	action_icon_state = "alien_plant"
@@ -83,7 +83,7 @@ Doesn't work on other aliens/AI.*/

 /obj/effect/proc_holder/alien/whisper
 	name = "Whisper"
-	desc = "Whisper to someone."
+	desc = "Whisper to someone through the hivemind. Costs 10 Plasma."
 	plasma_cost = 10
 	action_icon_state = "alien_whisper"

@@ -143,7 +143,7 @@ Doesn't work on other aliens/AI.*/

 /obj/effect/proc_holder/alien/acid
 	name = "Corrosive Acid"
-	desc = "Drench an object in acid, destroying it over time."
+	desc = "Drench an object in acid, destroying it over time. Costs 200 Plasma."
 	plasma_cost = 200
 	action_icon_state = "alien_acid"

@@ -189,7 +189,7 @@ Doesn't work on other aliens/AI.*/

 /obj/effect/proc_holder/alien/neurotoxin
 	name = "Spit Neurotoxin"
-	desc = "Spits neurotoxin at someone, paralyzing them for a short time."
+	desc = "Activates your Neurotoxin glands. You can shoot paralyzing shots. Each shot costs 50 Plasma."
 	action_icon_state = "alien_neurotoxin_0"
 	active = FALSE

@@ -254,7 +254,7 @@ Doesn't work on other aliens/AI.*/

 /obj/effect/proc_holder/alien/resin
 	name = "Secrete Resin"
-	desc = "Secrete tough malleable resin."
+	desc = "Secrete tough malleable resin. Costs 55 Plasma."
 	plasma_cost = 55
 	check_turf = TRUE
 	var/list/structures = list(
@@ -20,7 +20,7 @@

 /obj/effect/proc_holder/alien/royal/praetorian/evolve
 	name = "Evolve"
-	desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time."
+	desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time. Costs 500 Plasma."
 	plasma_cost = 500

 	action_icon_state = "alien_evolve_praetorian"
@@ -57,7 +57,7 @@
 //Queen verbs
 /obj/effect/proc_holder/alien/lay_egg
 	name = "Lay Egg"
-	desc = "Lay an egg to produce huggers to impregnate prey with."
+	desc = "Lay an egg to produce huggers to impregnate prey with. Costs 75 Plasma."
 	plasma_cost = 75
 	check_turf = TRUE
 	action_icon_state = "alien_egg"
@@ -77,7 +77,7 @@
 //Button to let queen choose her praetorian.
 /obj/effect/proc_holder/alien/royal/queen/promote
 	name = "Create Royal Parasite"
-	desc = "Produce a royal parasite to grant one of your children the honor of being your Praetorian."
+	desc = "Produce a royal parasite to grant one of your children the honor of being your Praetorian. Costs 500 Plasma."
 	plasma_cost = 500 //Plasma cost used on promotion, not spawning the parasite.

 	action_icon_state = "alien_queen_promote"
@@ -190,6 +190,11 @@
 	message = "chimes."
 	sound = 'sound/machines/chime.ogg'

+/datum/emote/sound/human/squeak
+	key = "squeak"
+	message = "squeaks."
+	sound = 'sound/effects/mousesqueek.ogg'
+
 //rock paper scissors emote handling
 /mob/living/carbon/human/proc/beginRockPaperScissors(var/chosen_move)
 	GLOB.rockpaperscissors_players[src] = list(chosen_move, ROCKPAPERSCISSORS_NOT_DECIDED)
@@ -15,6 +15,7 @@

 	block_parry_data = /datum/block_parry_data/unarmed/human
 	default_block_parry_data = /datum/block_parry_data/unarmed/human
+	causes_dirt_buildup_on_floor = TRUE

 	//Hair colour and style
 	var/hair_color = "000"
@@ -100,3 +100,8 @@
 	if(dna.species.space_move(src))
 		return TRUE
 	return ..()
+
+/mob/living/carbon/human/dirt_buildup(strength)
+	if(!shoes || !(shoes.body_parts_covered & FEET))
+		return	// barefoot advantage
+	return ..()
@@ -18,3 +18,33 @@
 	species_category = SPECIES_CATEGORY_FURRY

 	allowed_limb_ids = list("mammal","aquatic","avian")
+
+/datum/species/mammal/synthetic
+	name = "Synthetic Anthromorph"
+	id = SPECIES_MAMMAL_SYNTHETIC
+
+	species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,ROBOTIC_LIMBS,HAS_FLESH,HAS_BONE,WINGCOLOR,HORNCOLOR)
+	inherent_traits = list(TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NO_PROCESS_FOOD, TRAIT_ROBOTIC_ORGANISM)
+	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID|MOB_BEAST
+
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
+	//Just robo looking parts.
+	mutant_heart = /obj/item/organ/heart/ipc
+	mutantlungs = /obj/item/organ/lungs/ipc
+	mutantliver = /obj/item/organ/liver/ipc
+	mutantstomach = /obj/item/organ/stomach/ipc
+	mutanteyes = /obj/item/organ/eyes/ipc
+	mutantears = /obj/item/organ/ears/ipc
+	mutanttongue = /obj/item/organ/tongue/robot/ipc
+	mutant_brain = /obj/item/organ/brain/ipc
+
+	//special cybernetic organ for getting power from apcs
+	mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
+
+
+	attack_verb = "claw"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+
+	allowed_limb_ids = list("mammal","aquatic","avian", "human")
@@ -7,7 +7,7 @@
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH)
 	mutantlungs = /obj/item/organ/lungs/slime
 	mutant_heart = /obj/item/organ/heart/slime
-	mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None")
+	mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade")
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
@@ -406,7 +406,7 @@
 	default_color = "00FFFF"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
 	inherent_traits = list(TRAIT_TOXINLOVER)
-	mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
+	mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None", "legs" = "Plantigrade")
 	say_mod = "says"
 	hair_color = "mutcolor"
 	hair_alpha = 160 //a notch brighter so it blends better.
@@ -203,6 +203,15 @@
 		var/obj/item/I = AM
 		if(I.light_range && I.light_power)
 			disintegrate(I)
+	else if (isstructure(AM))
+		var/obj/structure/S = AM
+		if(istype(S, /obj/structure/glowshroom) || istype(S, /obj/structure/marker_beacon))
+			qdel(S)
+			visible_message("<span class='danger'>[S] is disintegrated by [src]!</span>")
+	else if(AM.light_range && AM.light_power  && !(istype(AM, /obj/machinery/power/apc) || istype(AM, /obj/machinery/airalarm)))
+		var/obj/target_object = AM
+		target_object.take_damage(force * 5, BRUTE, "melee", 0)
+

 /obj/item/light_eater/proc/disintegrate(obj/item/O)
 	if(istype(O, /obj/item/pda))
@@ -5,7 +5,7 @@
 	say_mod = "hisses"
 	default_color = "00FF00"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
-	mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
+	mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade","deco_wings"= "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -17,6 +17,9 @@
 /mob/living/proc/initiate_parry_sequence()
 	if(parrying)
 		return		// already parrying
+	if(!(mobility_flags & MOBILITY_USE))
+		to_chat(src, "<span class='warning'>You can't move your arms!</span>")
+		return
 	if(!(combat_flags & COMBAT_FLAG_PARRY_CAPABLE))
 		to_chat(src, "<span class='warning'>You are not something that can parry attacks.</span>")
 		return
@@ -63,6 +63,8 @@
 	//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
 	var/incorporeal_move = FALSE //FALSE is off, INCORPOREAL_MOVE_BASIC is normal, INCORPOREAL_MOVE_SHADOW is for ninjas
 								 //and INCORPOREAL_MOVE_JAUNT is blocked by holy water/salt
+	/// Do we make floors dirty as we move?
+	var/causes_dirt_buildup_on_floor = FALSE

 	var/list/roundstart_quirks = list()

@@ -102,6 +102,38 @@
 	if(lying && !buckled && prob(getBruteLoss()*200/maxHealth))
 		makeTrail(newloc, T, old_direction)

+	if(causes_dirt_buildup_on_floor && (movement_type & GROUND))
+		dirt_buildup()
+
+/**
+ * Attempts to make the floor dirty.
+ */
+/mob/living/proc/dirt_buildup(strength = 1)
+	var/turf/open/T = loc
+	if(!istype(T) || !T.dirt_buildup_allowed)
+		return
+	var/area/A = T.loc
+	if(!A.dirt_buildup_allowed)
+		return
+	var/multiplier = CONFIG_GET(number/turf_dirty_multiplier)
+	strength *= multiplier
+	var/obj/effect/decal/cleanable/dirt/D = locate() in T
+	if(D)
+		D.dirty(strength)
+	else
+		T.dirtyness += strength
+		if(T.dirtyness >= (isnull(T.dirt_spawn_threshold)? CONFIG_GET(number/turf_dirt_threshold) : T.dirt_spawn_threshold))
+			D = new /obj/effect/decal/cleanable/dirt(T)
+			D.dirty(T.dirt_spawn_threshold - T.dirtyness)
+			T.dirtyness = 0		// reset.
+
+/mob/living/Move_Pulled(atom/A)
+	. = ..()
+	if(!. || !isliving(A))
+		return
+	var/mob/living/L = A
+	set_pull_offsets(L, grab_state)
+
 /mob/living/forceMove(atom/destination)
 	stop_pulling()
 	if(buckled)
@@ -1,3 +1,30 @@
+/mob/living/silicon/verb/clear_custom_holoform()
+	set name = "Clear Custom Holoform"
+	set desc = "Clear your current custom holoform"
+	set category = "OOC"
+	if(!client.prefs)
+		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
+		return
+	client.prefs.custom_holoform_icon = null
+	client.prefs.cached_holoform_icons = null
+	to_chat(src, "<span class='boldnotice'>Holoform removed.</span>")
+
+/mob/living/silicon/verb/set_custom_holoform()
+	set name = "Set Custom Holoform"
+	set desc = "Set your custom holoform using your current preferences slot and a specified set of gear."
+	if(!client.prefs)
+		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
+		return
+	if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+		to_chat(src, "<span class='warning'>You are attempting to change custom holoforms too fast!</span>")
+
+	var/icon/new_holoform = user_interface_custom_holoform(client)
+	if(new_holoform)
+		client.prefs.custom_holoform_icon = new_holoform
+		client.prefs.cached_holoform_icons = null
+		client.prefs.last_custom_holoform = world.time
+		to_chat(src, "<span class='boldnotice'>Holoform set.</span>")
+
 /mob/living/silicon/proc/attempt_set_custom_holoform()
 	if(!client.prefs)
 		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
@@ -9,6 +9,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	real_name = "Guardian Spirit"
 	desc = "A mysterious being that stands by its charge, ever vigilant."
 	speak_emote = list("hisses")
+	rad_flags = RAD_NO_CONTAMINATE | RAD_PROTECT_CONTENTS
 	gender = NEUTER
 	mob_biotypes = NONE
 	bubble_icon = "guardian"
@@ -0,0 +1,69 @@
+//funny reference to the video 'Expiration Date'
+
+/mob/living/simple_animal/hostile/bread
+	name = "tumor bread"
+	desc = "I have done nothing but teleport bread for three days."
+	icon_state = "tumorbread"
+	health = 1
+	maxHealth = 1
+	turns_per_move = 5  //this isn't player speed =|
+	speed = 2  //this is player speed
+	melee_damage_lower = 1
+	melee_damage_upper = 2
+	obj_damage = 0
+	loot = list(/obj/item/reagent_containers/food/snacks/store/bread/tumor_bread)
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 270
+	maxbodytemp = INFINITY
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	response_help_continuous  = "pokes"
+	response_help_simple = "poke"
+	response_disarm_continuous = "shoos"
+	response_disarm_simple = "shoo"
+	response_harm_continuous = "punches"
+	response_harm_simple = "punch"
+	speak_emote = list("growls")
+	mouse_opacity = 2
+	density = TRUE
+	ventcrawler = VENTCRAWLER_ALWAYS
+	verb_say = "growls"
+	verb_ask = "growls inquisitively"
+	verb_exclaim = "growls loudly"
+	verb_yell = "growls loudly"
+	del_on_death = TRUE
+
+/mob/living/simple_animal/bread/hostile/Initialize()
+	. = ..()
+	var/area/A = get_area(src)
+	if(A)
+		notify_ghosts("A tumor bread has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)
+
+/mob/living/simple_animal/hostile/bread/attack_ghost(mob/user)
+	if(key)			//please stop using src. without a good reason.
+		return
+	if(CONFIG_GET(flag/use_age_restriction_for_jobs))
+		if(!isnum(user.client.player_age))
+			return
+	if(isobserver(user))
+		var/mob/dead/observer/O = user
+		if(!O.can_reenter_round())
+			return
+	if(!SSticker.mode)
+		to_chat(user, "Can't become a tumor bread before the game has started.")
+		return
+	var/be_bread = alert("Become a tumor bread? (Warning, You can no longer be cloned!)",,"Yes","No")
+	if(be_bread == "No" || QDELETED(src) || !isobserver(user))
+		return
+	if(key)
+		to_chat(user, "<span class='notice'>Someone else already took this tumor bread.</span>")
+		return
+	sentience_act()
+	user.transfer_ckey(src, FALSE)
+	density = TRUE
+
+/mob/living/simple_animal/hostile/bread/ex_act()
+	return
+
+/mob/living/simple_animal/hostile/bread/start_pulling()
+	return FALSE
@@ -1034,3 +1034,159 @@

 /mob/living/simple_animal/parrot/clock_hawk/ratvar_act()
 	return
+
+// Different Parrot Breeds
+
+/mob/living/simple_animal/parrot/kea
+	name = "Kea"
+	icon_state = "kea-flap"
+	icon_living = "kea-flap"
+	icon_dead = "kea-dead"
+	icon_sit = "kea_sit"
+
+/mob/living/simple_animal/parrot/eclectusr
+	name = "Eclectus"
+	icon_state = "eclectusr-flap"
+	icon_living = "eclectusr-flap"
+	icon_dead = "eclectusr-dead"
+	icon_sit = "electusr_sit"
+
+/mob/living/simple_animal/parrot/eclectus
+	name = "Eclectus"
+	icon_state = "eclectus-flap"
+	icon_living = "eclectus-flap"
+	icon_dead = "eclectus-dead"
+	icon_sit = "electus_sit"
+
+/mob/living/simple_animal/parrot/eclectusf
+	name = "Eclectus"
+	icon_state = "eclectusf-flap"
+	icon_living = "eclectusf-flap"
+	icon_dead = "eclectusf-dead"
+	icon_sit = "electusf_sit"
+
+/mob/living/simple_animal/parrot/greybird
+	name = "Grey Bird"
+	icon_state = "agrey-flap"
+	icon_living = "agrey-flap"
+	icon_dead = "agrey-dead"
+	icon_sit = "agrey_sit"
+
+/mob/living/simple_animal/parrot/blue_caique
+	name = "Blue Caique "
+	icon_state = "bcaique-flap"
+	icon_living = "bcaique-flap"
+	icon_dead = "bcaique-dead"
+	icon_sit = "bcaique_sit"
+
+/mob/living/simple_animal/parrot/white_caique
+	name = "White caique"
+	icon_state = "wcaique-flap"
+	icon_living = "wcaique-flap"
+	icon_dead = "wcaique-dead"
+	icon_sit = "wcaique_sit"
+
+/mob/living/simple_animal/parrot/green_budgerigar
+	name = "Green Budgerigar"
+	icon_state = "gbudge-flap"
+	icon_living = "gbudge-flap"
+	icon_dead = "gbudge-dead"
+	icon_sit = "gbudge_sit"
+
+/mob/living/simple_animal/parrot/blue_Budgerigar
+	name = "Blue Budgerigar"
+	icon_state = "bbudge-flap"
+	icon_living = "bbudge-flap"
+	icon_dead = "bbudge-dead"
+	icon_sit = "bbudge_sit"
+
+/mob/living/simple_animal/parrot/bluegreen_Budgerigar
+	name = "Bluegreen Budgerigar"
+	icon_state = "bgbudge-flap"
+	icon_living = "bgbudge-flap"
+	icon_dead = "bgbudge-dead"
+	icon_sit = "bgbudge_sit"
+
+/mob/living/simple_animal/parrot/commonblackbird
+	name = "Black Bird"
+	icon_state = "commonblackbird"
+	icon_living = "commonblackbird"
+	icon_dead = "commonblackbird-dead"
+	icon_sit = "commonblackbird_sit"
+
+/mob/living/simple_animal/parrot/azuretit
+	name = "Azure Tit"
+	icon_state = "azuretit"
+	icon_living = "azuretit"
+	icon_dead = "azuretit-dead"
+	icon_sit = "azuretit_sit"
+
+/mob/living/simple_animal/parrot/europeanrobin
+	name = "European Robin"
+	icon_state = "europeanrobin"
+	icon_living = "europeanrobin"
+	icon_dead = "europeanrobin-dead"
+	icon_sit = "europeanrobin_sit"
+
+/mob/living/simple_animal/parrot/goldcrest
+	name = "Goldcrest"
+	icon_state = "goldcrest"
+	icon_living = "goldcrest"
+	icon_dead = "goldcrest-dead"
+	icon_sit = "goldencrest_sit"
+
+/mob/living/simple_animal/parrot/ringneckdove
+	name = "Ringneck Dove"
+	icon_state = "ringneckdove"
+	icon_living = "ringneckdove"
+	icon_dead = "ringneckdove-dead"
+	icon_sit = "ringneckdove_sit"
+
+/mob/living/simple_animal/parrot/cockatiel
+	name = "Cockatiel"
+	icon_state = "tiel-flap"
+	icon_living = "tiel-flap"
+	icon_dead = "tiel-dead"
+	icon_sit = "tiel_sit"
+
+/mob/living/simple_animal/parrot/white_cockatiel
+	name = "White Cockatiel"
+	icon_state = "wtiel-flap"
+	icon_living = "wtiel-flap"
+	icon_dead = "wtiel-dead"
+	icon_sit = "wtiel_sit"
+
+/mob/living/simple_animal/parrot/yellowish_cockatiel
+	name = "Yellowish Cockatiel"
+	icon_state = "luttiel-flap"
+	icon_living = "luttiel-flap"
+	icon_dead = "luttiel-dead"
+	icon_sit = "luttiel_sit"
+
+/mob/living/simple_animal/parrot/grey_cockatiel
+	name = "Grey Cockatiel"
+	icon_state = "blutiel-flap"
+	icon_living = "blutiel-flap"
+	icon_dead = "blutiel-dead"
+	icon_sit = "blutiel_sit"
+
+/mob/living/simple_animal/parrot/too
+	name = "Too"
+	icon_state = "too-flap"
+	icon_living = "too-flap"
+	icon_dead = "too-dead"
+	icon_sit = "too_sit"
+
+/mob/living/simple_animal/parrot/hooded_too
+	name = "Utoo"
+	icon_state = "utoo-flap"
+	icon_living = "utoo-flap"
+	icon_dead = "utoo-dead"
+	icon_sit = "utoo_sit"
+
+/mob/living/simple_animal/parrot/pink_too
+	name = "Mtoo"
+	icon_state = "mtoo-flap"
+	icon_living = "mtoo-flap"
+	icon_dead = "mtoo-dead"
+	icon_sit = "mtoo_sit"
@@ -354,7 +354,7 @@
 /mob/living/simple_animal/proc/drop_loot()
 	if(loot.len)
 		for(var/i in loot)
-			new i(loc)
+			new i(loc, dir = src.dir)

 /mob/living/simple_animal/death(gibbed)
 	movement_type &= ~FLYING
@@ -508,7 +508,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		if(LOG_EMOTE)
 			colored_message = "(EMOTE) [colored_message]"
 	
-	var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)]" = colored_message)
+	var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)] (Event #[LAZYLEN(logging[smessage_type])])" = colored_message)

 	logging[smessage_type] += timestamped_message

@@ -148,8 +148,8 @@ proc/get_top_level_mob(var/mob/S)
 	var/safety = 25
 	for(var/obj/structure/table/T in range(user, 1))
 		processing |= T
-	for(var/i in processing)
-		var/obj/structure/table/T = i
+	for(var/i = 1; i <= processing.len; ++i)
+		var/obj/structure/table/T = processing[i]
 		if(safety-- <= 0)
 			to_chat(user, "Table scan aborted early, some people might have not received the message (max 25)")
 			break