Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

code/modules/admin/admin.dm

@@ -614,6 +614,19 @@ var/global/nologevent = 0
 	message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1)
 	feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/datum/admins/proc/toggleemoji()
+	set category = "Server"
+	set desc = "Toggle OOC Emoji"
+	set name = "Toggle OOC Emoji"
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	config.disable_ooc_emoji = !(config.disable_ooc_emoji)
+	log_admin("[key_name(usr)] toggled OOC Emoji.")
+	message_admins("[key_name_admin(usr)] toggled OOC Emoji.", 1)
+	feedback_add_details("admin_verb", "TEMOJ")
+
 /datum/admins/proc/startnow()
 	set category = "Server"
 	set desc="Start the round RIGHT NOW"

code/modules/admin/admin_verbs.dm

@@ -48,6 +48,7 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/togglelooc,		/*toggles looc on/off for everyone*/
 	/datum/admins/proc/toggleoocdead,	/*toggles ooc on/off for everyone who is dead*/
 	/datum/admins/proc/toggledsay,		/*toggles dsay on/off for everyone*/
+	/datum/admins/proc/toggleemoji,     /*toggles using emoji in ooc for everyone*/
 	/client/proc/game_panel,			/*game panel, allows to change game-mode etc*/
 	/client/proc/cmd_admin_say,			/*admin-only ooc chat*/
 	/datum/admins/proc/PlayerNotes,

code/modules/admin/buildmode.dm

@@ -446,22 +446,8 @@
 				log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
 				new/obj/machinery/door/airlock(get_turf(object))
 			else if(istype(object,/turf) && ctrl_click && left_click)
-				switch(build_dir)
-					if(NORTH)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.dir = NORTH
-					if(SOUTH)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.dir = SOUTH
-					if(EAST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.dir = EAST
-					if(WEST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.dir = WEST
-					if(NORTHWEST)
-						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-						WIN.dir = NORTHWEST
+				var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+				WIN.set_dir(build_dir)
 				log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
 
 		if(ADV_BUILDMODE)
@@ -472,7 +458,7 @@
 					T.ChangeTurf(objholder)
 				else
 					var/obj/A = new objholder (get_turf(object))
-					A.dir = build_dir
+					A.set_dir(build_dir)
 					log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
 			else if(right_click)
 				if(isobj(object))
@@ -561,7 +547,7 @@
 									T.ChangeTurf(objholder)
 								else
 									var/obj/A = new objholder(T)
-									A.dir = build_dir
+									A.set_dir(build_dir)
 						deselect_region()
 					return
 

code/modules/admin/player_panel.dm

@@ -489,6 +489,11 @@
 
 		if(ticker.mode.cult.len)
 			dat += check_role_table("Cultists", ticker.mode.cult, 0)
+			dat += "<br> use <a href='?src=[UID()];cult_mindspeak=[UID()]'>Cult Mindspeak</a>"
+			if(GAMEMODE_IS_CULT)
+				var/datum/game_mode/cult/cult_round = ticker.mode
+				if(!cult_round.narsie_condition_cleared)
+					dat += "<br><a href='?src=[UID()];cult_nextobj=[UID()]'>complete objective (debug)</a>"
 
 		if(ticker.mode.traitors.len)
 			dat += check_role_table("Traitors", ticker.mode.traitors)

code/modules/admin/topic.dm

@@ -1533,6 +1533,34 @@
 	else if(href_list["check_antagonist"])
 		check_antagonists()
 
+	else if(href_list["cult_nextobj"])
+		if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes")
+			return
+
+		if(!GAMEMODE_IS_CULT)
+			alert("Couldn't locate cult mode datum! This shouldn't ever happen, tell a coder!")
+			return
+
+		var/datum/game_mode/cult/cult_round = ticker.mode
+		cult_round.bypass_phase()
+		message_admins("Admin [key_name_admin(usr)] has unlocked the Cult's next objective.")
+		log_admin("Admin [key_name_admin(usr)] has unlocked the Cult's next objective.")
+
+	else if(href_list["cult_mindspeak"])
+		var/input = stripped_input(usr, "Communicate to all the cultists with the voice of [ticker.mode.cultdat.entity_name]", "Voice of [ticker.mode.cultdat.entity_name]", "")
+		if(!input)
+			return
+
+		for(var/datum/mind/H in ticker.mode.cult)
+			if (H.current)
+				to_chat(H.current, "<span class='danger'>[ticker.mode.cultdat.entity_name]</span> murmurs, <span class='cultlarge'>[input]</span></span>")
+
+		for(var/mob/dead/observer/O in player_list)
+			to_chat(O, "<span class='danger'>[ticker.mode.cultdat.entity_name]</span> murmurs, <span class='cultlarge'>[input]</span></span>")
+
+		message_admins("Admin [key_name_admin(usr)] has talked with the Voice of [ticker.mode.cultdat.entity_name].")
+		log_admin("[key_name(usr)] Voice of [ticker.mode.cultdat.entity_name]: [input]")
+
 	else if(href_list["adminplayerobservecoodjump"])
 		if(!check_rights(R_ADMIN))	return
 
@@ -2278,11 +2306,11 @@
 				if(gravity_is_on)
 					log_admin("[key_name(usr)] toggled gravity on.", 1)
 					message_admins("\blue [key_name_admin(usr)] toggled gravity on.", 1)
-					command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
+					event_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
 				else
 					log_admin("[key_name(usr)] toggled gravity off.", 1)
 					message_admins("\blue [key_name_admin(usr)] toggled gravity off.", 1)
-					command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
+					event_announcement.Announce("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
 
 			if("power")
 				feedback_inc("admin_secrets_fun_used",1)
@@ -2554,7 +2582,7 @@
 					if(is_station_level(W.z) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
 						W.req_access = list()
 				message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
-				command_announcement.Announce("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.", new_sound = 'sound/AI/commandreport.ogg')
+				event_announcement.Announce("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.", new_sound = 'sound/AI/commandreport.ogg')
 			if("onlyone")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","OO")

code/modules/admin/verbs/adminpm.dm

@@ -149,6 +149,9 @@
 						adminhelp(reply)													//sender has left, adminhelp instead
 				return
 
+	// for emoji, we have to define a specific span for jquery to look for
+	msg = "<span class='emoji_enabled'>[msg]</span>"
+
 	recieve_message = "<span class='[recieve_span]'>[type] from-<b>[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]</b>: [msg]</span>"
 	to_chat(C, recieve_message)
 	to_chat(src, "<font color='blue'>[send_pm_type][type] to-<b>[key_name(C, src, holder ? 1 : 0, type)]</b>: [msg]</font>")

code/modules/awaymissions/bluespaceartillery.dm

@@ -58,7 +58,7 @@
 		if(reload_cooldown > delta)
 			return 1
 
-		command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
+		event_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
 		message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
 		var/list/L = list()
 		for(var/turf/T in get_area_turfs(targetarea.type))

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -98,15 +98,15 @@
 	path = /obj/item/clothing/under/rank/head_of_security/skirt
 	allowed_roles = list("Head of Security")
 
-/datum/gear/uniform/job/medical/scrubs
-	subtype_path = /datum/gear/uniform/job/medical/scrubs
+/datum/gear/uniform/medical
+	subtype_path = /datum/gear/uniform/medical
 
-/datum/gear/uniform/job/medical/scrubs/purple
+/datum/gear/uniform/medical/pscrubs
 	display_name = "medical scrubs, purple"
 	path = /obj/item/clothing/under/rank/medical/purple
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor")
 
-/datum/gear/uniform/job/medical/scrubs/green
+/datum/gear/uniform/medical/gscrubs
 	display_name = "medical scrubs, green"
 	path = /obj/item/clothing/under/rank/medical/green
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor")

code/modules/client/preference/preferences.dm

@@ -1963,6 +1963,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 				if("randomslot")
 					randomslot = !randomslot
+					if(isnewplayer(usr))
+						var/mob/new_player/N = usr
+						N.new_player_panel_proc()
 
 				if("hear_midis")
 					sound ^= SOUND_MIDI
@@ -2146,35 +2149,28 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 	if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)
 		character.dna.SetSEState(FATBLOCK,1,1)
-		character.mutations += FAT
-		character.mutations += OBESITY
 		character.overeatduration = 600
 
 	if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
 		character.dna.SetSEState(GLASSESBLOCK,1,1)
-		character.disabilities |= NEARSIGHTED
 
 	if(disabilities & DISABILITY_FLAG_EPILEPTIC)
 		character.dna.SetSEState(EPILEPSYBLOCK,1,1)
-		character.disabilities |= EPILEPSY
 
 	if(disabilities & DISABILITY_FLAG_DEAF)
 		character.dna.SetSEState(DEAFBLOCK,1,1)
-		character.disabilities |= DEAF
 
 	if(disabilities & DISABILITY_FLAG_BLIND)
 		character.dna.SetSEState(BLINDBLOCK,1,1)
-		character.disabilities |= BLIND
 
 	if(disabilities & DISABILITY_FLAG_MUTE)
 		character.dna.SetSEState(MUTEBLOCK,1,1)
-		character.disabilities |= MUTE
 
 	S.handle_dna(character)
 
 	if(character.dna.dirtySE)
 		character.dna.UpdateSE()
-	domutcheck(character, null, MUTCHK_FORCED)
+	domutcheck(character, null, MUTCHK_FORCED) //'Activates' all the above disabilities.
 
 	character.dna.ready_dna(character, flatten_SE = 0)
 	character.sync_organ_dna(assimilate=1)
@@ -2188,26 +2184,26 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 /datum/preferences/proc/open_load_dialog(mob/user)
 
 	var/DBQuery/query = dbcon.NewQuery("SELECT slot,real_name FROM [format_table_name("characters")] WHERE ckey='[user.ckey]' ORDER BY slot")
+	var/list/slotnames[max_save_slots]
+
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
+		return
+	while(query.NextRow())
+		slotnames[text2num(query.item[1])] = query.item[2]
 
 	var/dat = "<body>"
 	dat += "<tt><center>"
 	dat += "<b>Select a character slot to load</b><hr>"
 	var/name
 
-	for(var/i=1, i<=max_save_slots, i++)
-		if(!query.Execute())
-			var/err = query.ErrorMsg()
-			log_game("SQL ERROR during character slot loading. Error : \[[err]\]\n")
-			message_admins("SQL ERROR during character slot loading. Error : \[[err]\]\n")
-			return
-		while(query.NextRow())
-			if(i==text2num(query.item[1]))
-				name =  query.item[2]
-		if(!name)	name = "Character[i]"
-		if(i==default_slot)
+	for(var/i in 1 to max_save_slots)
+		name = slotnames[i] || "Character [i]"
+		if(i == default_slot)
 			name = "<b>[name]</b>"
 		dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
-		name = null
 
 	dat += "<hr>"
 	dat += "<a href='byond://?src=[user.UID()];preference=close_load_dialog'>Close</a><br>"

code/modules/client/preference/preferences_mysql.dm

@@ -500,21 +500,24 @@
 		return
 	return 1
 
-/*
-/datum/preferences/proc/random_character(client/C)
+/datum/preferences/proc/load_random_character_slot(client/C)
 	var/DBQuery/query = dbcon.NewQuery("SELECT slot FROM [format_table_name("characters")] WHERE ckey='[C.ckey]' ORDER BY slot")
+	var/list/saves = list()
+
+	if(!query.Execute())
+		var/err = query.ErrorMsg()
+		log_game("SQL ERROR during random character slot picking. Error : \[[err]\]\n")
+		message_admins("SQL ERROR during random character slot picking. Error : \[[err]\]\n")
+		return
 
 	while(query.NextRow())
-	var/list/saves = list()
-	for(var/i=1, i<=MAX_SAVE_SLOTS, i++)
-		if(i==text2num(query.item[1]))
-			saves += i
+		saves += text2num(query.item[1])
 
 	if(!saves.len)
 		load_character(C)
 		return 0
 	load_character(C,pick(saves))
-	return 1*/
+	return 1
 
 /datum/preferences/proc/SetChangelog(client/C,hash)
 	lastchangelog=hash

code/modules/clothing/masks/miscellaneous.dm

@@ -139,12 +139,6 @@
 	w_class = 2
 	gas_transfer_coefficient = 0.90
 
-/obj/item/clothing/mask/joy
-	name = "joy mask"
-	desc = "Express your happiness or hide your sorrows with this face with tears of joy cutout."
-	icon_state = "joy"
-	flags = MASKCOVERSMOUTH
-	flags_inv = HIDEFACE
 
 /obj/item/clothing/mask/pig
 	name = "pig mask"

code/modules/computer3/computers/communications.dm

@@ -47,7 +47,7 @@
 
 	New()
 		..()
-		crew_announcement.newscast = 1
+		crew_announcement.newscast = 0
 
 	Reset()
 		..()

code/modules/events/alien_infestation.dm

@@ -10,7 +10,7 @@
 
 /datum/event/alien_infestation/announce()
 	if(successSpawn)
-		command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
+		event_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
 
 /datum/event/alien_infestation/start()
 	var/list/vents = list()

code/modules/events/anomaly.dm

@@ -15,7 +15,7 @@
 		setup(safety_loop)
 
 /datum/event/anomaly/announce()
-	command_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/anomaly/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/anomaly_bluespace.dm

@@ -4,7 +4,7 @@
 	endWhen = 160
 
 /datum/event/anomaly/anomaly_bluespace/announce()
-	command_announcement.Announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/anomaly/anomaly_bluespace/start()
 	var/turf/T = pick(get_area_turfs(impact_area))
@@ -33,7 +33,7 @@
 				var/turf/TO = get_turf(chosen)			 // the turf of origin we're travelling TO
 
 				playsound(TO, 'sound/effects/phasein.ogg', 100, 1)
-				command_announcement.Announce("Massive bluespace translocation detected.", "Anomaly Alert")
+				event_announcement.Announce("Massive bluespace translocation detected.", "Anomaly Alert")
 
 				var/list/flashers = list()
 				for(var/mob/living/carbon/C in viewers(TO, null))

code/modules/events/anomaly_flux.dm

@@ -4,7 +4,7 @@
 	endWhen = 180
 
 /datum/event/anomaly/anomaly_flux/announce()
-	command_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/anomaly/anomaly_flux/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/anomaly_grav.dm

@@ -4,7 +4,7 @@
 	endWhen = 70
 
 /datum/event/anomaly/anomaly_grav/announce()
-	command_announcement.Announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/anomaly/anomaly_grav/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/anomaly_pyro.dm

@@ -4,7 +4,7 @@
 	endWhen = 110
 
 /datum/event/anomaly/anomaly_pyro/announce()
-	command_announcement.Announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/anomaly/anomaly_pyro/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/anomaly_vortex.dm

@@ -4,7 +4,7 @@
 	endWhen = 80
 
 /datum/event/anomaly/anomaly_vortex/announce()
-	command_announcement.Announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")
+	event_announcement.Announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")
 
 /datum/event/anomaly/anomaly_vortex/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/blob.dm

@@ -4,7 +4,7 @@
 	var/obj/effect/blob/core/Blob
 
 /datum/event/blob/announce()
-	command_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
+	event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
 
 /datum/event/blob/start()
 	var/turf/T = pick(blobstart)

code/modules/events/brand_intelligence.dm

@@ -14,7 +14,7 @@
 									 "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.")
 
 /datum/event/brand_intelligence/announce()
-	command_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
+	event_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
 
 /datum/event/brand_intelligence/start()
 	for(var/obj/machinery/vending/V in machines)

code/modules/events/cargobonus.dm

@@ -2,7 +2,7 @@
 	announceWhen	= 5
 
 /datum/event/cargo_bonus/announce()
-	command_announcement.Announce("Congratulations! [station_name()] was chosen for a supply limit increase. Please contact the local cargo department for details!", "Supply Alert")
+	event_announcement.Announce("Congratulations! [station_name()] was chosen for a supply limit increase. Please contact the local cargo department for details!", "Supply Alert")
 
 /datum/event/cargo_bonus/start()
 	supply_controller.points += rand(100,500)

code/modules/events/carp_migration.dm

@@ -14,7 +14,7 @@
 		announcement = "Massive migration of unknown biological entities has been detected near [station_name()], please stand-by."
 	else
 		announcement = "Unknown biological [spawned_carp.len == 1 ? "entity has" : "entities have"] been detected near [station_name()], please stand-by."
-	command_announcement.Announce(announcement, "Lifesign Alert")
+	event_announcement.Announce(announcement, "Lifesign Alert")
 
 /datum/event/carp_migration/start()
 	if(severity == EVENT_LEVEL_MAJOR)

code/modules/events/communications_blackout.dm

@@ -12,7 +12,7 @@
 		to_chat(A, "<br>")
 
 	if(prob(30))	//most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
-		command_announcement.Announce(alert)
+		event_announcement.Announce(alert)
 
 /datum/event/communications_blackout/start()
 	for(var/obj/machinery/telecomms/T in telecomms_list)
@@ -20,7 +20,7 @@
 
 /proc/communications_blackout(var/silent = 1)
 	if(!silent)
-		command_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = 'sound/misc/interference.ogg')
+		event_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = 'sound/misc/interference.ogg')
 	else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
 		for(var/mob/living/silicon/ai/A in player_list)
 			to_chat(A, "<br>")

code/modules/events/disease_outbreak.dm

@@ -7,7 +7,7 @@
 	announceWhen = rand(15, 30)
 
 /datum/event/disease_outbreak/announce()
-	command_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+	event_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
 
 /datum/event/disease_outbreak/start()
 	if(!virus_type)

code/modules/events/electrical_storm.dm

@@ -3,7 +3,7 @@
 	var/lightsoutRange	= 25
 
 /datum/event/electrical_storm/announce()
-	command_announcement.Announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert")
+	event_announcement.Announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert")
 	
 /datum/event/electrical_storm/start()
 	var/list/epicentreList = list()

code/modules/events/grid_check.dm

@@ -8,14 +8,14 @@
 	power_failure(0)
 
 /datum/event/grid_check/announce()
-	command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Automated Grid Check", new_sound = 'sound/AI/poweroff.ogg')
+	event_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Automated Grid Check", new_sound = 'sound/AI/poweroff.ogg')
 
 /datum/event/grid_check/end()
 	power_restore()
 
 /proc/power_failure(var/announce = 1)
 	if(announce)
-		command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
+		event_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
 
 	var/list/skipped_areas = list(/area/turret_protected/ai)
 	var/list/skipped_areas_apc = list(/area/engine/engineering)
@@ -45,7 +45,7 @@
 	var/list/skipped_areas_apc = list(/area/engine/engineering)
 
 	if(announce)
-		command_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+		event_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in apcs)
 		var/area/current_area = get_area(C)
 		if(current_area.type in skipped_areas_apc || !is_station_level(C.z))
@@ -64,7 +64,7 @@
 
 /proc/power_restore_quick(var/announce = 1)
 	if(announce)
-		command_announcement.Announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+		event_announcement.Announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/smes/S in machines)
 		if(!is_station_level(S.z))
 			continue

code/modules/events/immovable_rod.dm

@@ -11,7 +11,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	announceWhen = 5
 
 /datum/event/immovable_rod/announce()
-	command_announcement.Announce("What the fuck was that?!", "General Alert")
+	event_announcement.Announce("What the fuck was that?!", "General Alert")
 
 /datum/event/immovable_rod/start()
 	var/startside = pick(cardinal)

code/modules/events/infestation.dm

@@ -97,7 +97,7 @@
 
 
 /datum/event/infestation/announce()
-	command_announcement.Announce("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Lifesign Alert")
+	event_announcement.Announce("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Lifesign Alert")
 
 #undef LOC_KITCHEN
 #undef LOC_ATMOS

code/modules/events/ion_storm.dm

@@ -17,7 +17,7 @@
 
 /datum/event/ion_storm/announce()
 	if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)))
-		command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/AI/ionstorm.ogg')
+		event_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/AI/ionstorm.ogg')
 
 
 /datum/event/ion_storm/start()

code/modules/events/mass_hallucination.dm

@@ -9,4 +9,4 @@
 		H.AdjustHallucinate(rand(50, 100))
 
 /datum/event/mass_hallucination/announce()
-	command_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage")
+	event_announcement.Announce("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage")

code/modules/events/meaty_gore.dm

@@ -1,5 +1,5 @@
 /datum/event/meteor_wave/gore/announce()
-		command_announcement.Announce("Unknown biological debris have been detected near [station_name()], please stand-by.", "Debris Alert")
+		event_announcement.Announce("Unknown biological debris have been detected near [station_name()], please stand-by.", "Debris Alert")
 
 /datum/event/meteor_wave/gore/setup()
 	waves = 3
@@ -14,4 +14,4 @@
 
 
 /datum/event/meteor_wave/gore/end()
-	command_announcement.Announce("The station has cleared the debris.", "Debris Alert")
+	event_announcement.Announce("The station has cleared the debris.", "Debris Alert")

code/modules/events/meaty_ops.dm

@@ -1,6 +1,6 @@
 /datum/event/meteor_wave/goreop/announce()
 	var/meteor_declaration = "MeteorOps have declared their intent to utterly destroy [station_name()] with their own bodies, and dares the crew to try and stop them."
-	command_announcement.Announce(meteor_declaration, "Declaration of 'War'", 'sound/effects/siren.ogg')
+	event_announcement.Announce(meteor_declaration, "Declaration of 'War'", 'sound/effects/siren.ogg')
 
 /datum/event/meteor_wave/goreop/setup()
 	waves = 3
@@ -16,4 +16,4 @@
 
 
 /datum/event/meteor_wave/goreops/end()
-	command_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps")
+	event_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps")

code/modules/events/meaty_ores.dm

@@ -1,8 +1,8 @@
 /datum/event/dust/meaty/announce()
 	if(prob(16))
-		command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
+		event_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
 	else
-		command_announcement.Announce("Meaty ores have been detected on collision course with the station.", "Meaty Ore Alert", new_sound = 'sound/AI/meteors.ogg')
+		event_announcement.Announce("Meaty ores have been detected on collision course with the station.", "Meaty Ore Alert", new_sound = 'sound/AI/meteors.ogg')
 
 /datum/event/dust/meaty/setup()
 	qnty = rand(45,125)

code/modules/events/meteors.dm

@@ -10,9 +10,9 @@
 /datum/event/meteor_wave/announce()
 	switch(severity)
 		if(EVENT_LEVEL_MAJOR)
-			command_announcement.Announce("Meteors have been detected on collision course with the station.", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
+			event_announcement.Announce("Meteors have been detected on collision course with the station.", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
 		else
-			command_announcement.Announce("The station is now in a meteor shower.", "Meteor Alert")
+			event_announcement.Announce("The station is now in a meteor shower.", "Meteor Alert")
 
 //meteor showers are lighter and more common,
 /datum/event/meteor_wave/tick()
@@ -25,9 +25,9 @@
 /datum/event/meteor_wave/end()
 	switch(severity)
 		if(EVENT_LEVEL_MAJOR)
-			command_announcement.Announce("The station has cleared the meteor storm.", "Meteor Alert")
+			event_announcement.Announce("The station has cleared the meteor storm.", "Meteor Alert")
 		else
-			command_announcement.Announce("The station has cleared the meteor shower", "Meteor Alert")
+			event_announcement.Announce("The station has cleared the meteor shower", "Meteor Alert")
 
 /datum/event/meteor_wave/proc/get_meteors()
 	switch(severity)

code/modules/events/prison_break.dm

@@ -37,7 +37,7 @@
 
 /datum/event/prison_break/announce()
 	if(areas && areas.len > 0)
-		command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert")
+		event_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert")
 
 /datum/event/prison_break/start()
 	for(var/area/A in world)

code/modules/events/radiation_storm.dm

@@ -21,7 +21,7 @@
 
 /datum/event/radiation_storm/start()
 	spawn()
-		command_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
+		event_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
 
 		for(var/area/A in world)
 			if(!is_station_level(A.z) || is_safe_zone(A))
@@ -32,7 +32,7 @@
 
 		sleep(600)
 
-		command_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert")
+		event_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert")
 
 		for(var/i = 0, i < 10, i++)
 			for(var/mob/living/carbon/human/H in living_mob_list)
@@ -58,7 +58,7 @@
 
 			sleep(100)
 
-		command_announcement.Announce("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert")
+		event_announcement.Announce("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert")
 
 		for(var/area/A in world)
 			if(!is_station_level(A.z) || is_safe_zone(A))

code/modules/events/rogue_drones.dm

@@ -30,7 +30,7 @@
 		msg = "Contact has been lost with a combat drone wing operating out of the NSV Icarus. If any are sighted in the area, approach with caution."
 	else
 		msg = "Unidentified hackers have targetted a combat drone wing deployed from the NSV Icarus. If any are sighted in the area, approach with caution."
-	command_announcement.Announce(msg, "Rogue drone alert")
+	event_announcement.Announce(msg, "Rogue drone alert")
 
 /datum/event/rogue_drone/tick()
 	return
@@ -48,6 +48,6 @@
 		num_recovered++
 
 	if(num_recovered > drones_list.len * 0.75)
-		command_announcement.Announce("Icarus drone control reports the malfunctioning wing has been recovered safely.", "Rogue drone alert")
+		event_announcement.Announce("Icarus drone control reports the malfunctioning wing has been recovered safely.", "Rogue drone alert")
 	else
-		command_announcement.Announce("Icarus drone control registers disappointment at the loss of the drones, but the survivors have been recovered.", "Rogue drone alert")
+		event_announcement.Announce("Icarus drone control registers disappointment at the loss of the drones, but the survivors have been recovered.", "Rogue drone alert")

code/modules/events/spacevine.dm

@@ -8,4 +8,4 @@
 	spacevines_spawned = 1
 
 /datum/event/spacevine/announce()
-	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+	event_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')

code/modules/events/spider_infestation.dm

@@ -10,7 +10,7 @@
 	sent_spiders_to_station = 1
 
 /datum/event/spider_infestation/announce()
-	command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
+	event_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
 
 /datum/event/spider_infestation/start()
 

code/modules/events/tear.dm

@@ -5,7 +5,7 @@
 	var/obj/effect/tear/TE
 
 /datum/event/tear/announce()
-	command_announcement.Announce("A tear in the fabric of space and time has opened. Expected location: [impact_area.name].", "Anomaly Alert")
+	event_announcement.Announce("A tear in the fabric of space and time has opened. Expected location: [impact_area.name].", "Anomaly Alert")
 
 /datum/event/tear/start()
 	var/turf/T = pick(get_area_turfs(impact_area))

code/modules/events/vent_clog.dm

@@ -6,7 +6,7 @@
 	var/list/vents  = list()
 
 /datum/event/vent_clog/announce()
-	command_announcement.Announce("The scrubbers network is experiencing a backpressure surge.  Some ejection of contents may occur.", "Atmospherics alert")
+	event_announcement.Announce("The scrubbers network is experiencing a backpressure surge.  Some ejection of contents may occur.", "Atmospherics alert")
 
 /datum/event/vent_clog/setup()
 	endWhen = rand(25, 100)

code/modules/events/wallrot.dm

@@ -3,7 +3,7 @@
 	endWhen = announceWhen + 1
 
 /datum/event/wallrot/announce()
-	command_announcement.Announce("Harmful fungi detected on station. Station structures may be contaminated.", "Biohazard Alert")
+	event_announcement.Announce("Harmful fungi detected on station. Station structures may be contaminated.", "Biohazard Alert")
 
 /datum/event/wallrot/start()
 	spawn()

code/modules/events/wormholes.dm

@@ -21,7 +21,7 @@
 		wormholes += new /obj/effect/portal/wormhole(T, null, null, -1)
 
 /datum/event/wormholes/announce()
-	command_announcement.Announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", new_sound = 'sound/AI/spanomalies.ogg')
+	event_announcement.Announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", new_sound = 'sound/AI/spanomalies.ogg')
 
 /datum/event/wormholes/tick()
 	if(activeFor % shift_frequency == 0)

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -12,8 +12,12 @@
 	var/locked = 0 //Used to prevent mobs from breaking the feedin anim
 
 	var/gib_throw_dir = WEST // Direction to spit meat and gibs in. Defaults to west.
-	var/gibtime = 40 // Time from starting until meat appears
 
+	var/gibtime = 40 // Time from starting until meat appears
+	var/animation_delay = GIBBER_ANIMATION_DELAY
+
+	// For hiding gibs, making an even more devious trap (invisible autogibbers)
+	var/stealthmode = FALSE
 	var/list/victims = list()
 
 	use_power = 1
@@ -110,25 +114,25 @@
 
 /obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim)
 	if(occupant)
-		to_chat(user, "<span class='danger'>The gibber is full, empty it first!</span>")
+		to_chat(user, "<span class='danger'>The [src] is full, empty it first!</span>")
 		return
 
 	if(operating)
-		to_chat(user, "<span class='danger'>The gibber is locked and running, wait for it to finish.</span>")
+		to_chat(user, "<span class='danger'>The [src] is locked and running, wait for it to finish.</span>")
 		return
 
 	if(!ishuman(victim) || issmall(victim))
-		to_chat(user, "<span class='danger'>This is not suitable for the gibber!</span>")
+		to_chat(user, "<span class='danger'>This is not suitable for the [src]]!</span>")
 		return
 
 	if(victim.abiotic(1))
 		to_chat(user, "<span class='danger'>Subject may not have abiotic items on.</span>")
 		return
 
-	user.visible_message("<span class='danger'>[user] starts to put [victim] into the gibber!</span>")
+	user.visible_message("<span class='danger'>[user] starts to put [victim] into the [src]!</span>")
 	add_fingerprint(user)
 	if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
-		user.visible_message("<span class='danger'>[user] stuffs [victim] into the gibber!</span>")
+		user.visible_message("<span class='danger'>[user] stuffs [victim] into the [src]]!</span>")
 
 		victim.forceMove(src)
 		occupant = victim
@@ -195,16 +199,16 @@
 	holder2.layer = MOB_LAYER + 0.1 //3D, it's above the mob, rest of the gibber is behind
 	holder2.anchored = 1
 
-	animate(holder, pixel_y = 16, time = GIBBER_ANIMATION_DELAY) //animate going down
+	animate(holder, pixel_y = 16, time = animation_delay) //animate going down
 
-	sleep(GIBBER_ANIMATION_DELAY)
+	sleep(animation_delay)
 
 	holder.overlays -= feedee //reset static icon
 	feedee.icon += icon('icons/obj/kitchen.dmi', "footicon") //this is some byond magic; += to the icon var with a black and white image will mask it
 	holder.overlays += feedee
-	animate(holder, pixel_y = -3, time = GIBBER_ANIMATION_DELAY) //animate going down further
+	animate(holder, pixel_y = -3, time = animation_delay) //animate going down further
 
-	sleep(GIBBER_ANIMATION_DELAY) //time everything right, animate doesn't prevent proc from continuing
+	sleep(animation_delay) //time everything right, animate doesn't prevent proc from continuing
 
 	qdel(holder) //get rid of holder object
 	qdel(holder2) //get rid of holder object
@@ -231,7 +235,7 @@
 	operating = 1
 	update_icon()
 	var/offset = prob(50) ? -2 : 2
-	animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
+	animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = gibtime * 5) //start shaking
 
 	var/slab_name = occupant.name
 	var/slab_count = 3
@@ -254,8 +258,8 @@
 	new /obj/effect/decal/cleanable/blood/gibs(src)
 
 	if(!UserOverride)
-		occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [key_name(user)]" //One shall not simply gib a mob unnoticed!
-		user.attack_log += "\[[time_stamp()]\] Gibbed [key_name(occupant)]"
+		occupant.create_attack_log("Was gibbed by [key_name(user)]") //One shall not simply gib a mob unnoticed!)
+		user.create_attack_log("Gibbed [key_name(occupant)]")
 
 		if(occupant.ckey)
 			msg_admin_attack("[key_name_admin(user)] gibbed [key_name_admin(occupant)]")
@@ -266,11 +270,10 @@
 			occupant.LAssailant = user
 
 	else //this looks ugly but it's better than a copy-pasted startgibbing proc override
-		occupant.attack_log += "\[[time_stamp()]\] Was gibbed by <b>an autogibber (\the [src])</b>"
+		occupant.create_attack_log("Was gibbed by <b>an autogibber (\the [src])</b>")
 
 	occupant.emote("scream")
 	playsound(get_turf(src), 'sound/goonstation/effects/gib.ogg', 50, 1)
-
 	victims += "\[[time_stamp()]\] [occupant.name] ([occupant.ckey]) killed by [UserOverride ? "Autogibbing" : "[user] ([user.ckey])"]" //have to do this before ghostizing
 	occupant.death(1)
 	occupant.ghostize()
@@ -281,15 +284,20 @@
 		playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
 		operating = 0
 
-		for(var/obj/item/thing in contents) //Meat is spawned inside the gibber and thrown out afterwards.
-			thing.loc = get_turf(thing) // Drop it onto the turf for throwing.
-			thing.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) // Being pelted with bits of meat and bone would hurt.
-			sleep(1)
+		if(stealthmode)
+			for(var/atom/movable/AM in contents)
+				qdel(AM)
+				sleep(1)
+		else
+			for(var/obj/item/thing in contents) //Meat is spawned inside the gibber and thrown out afterwards.
+				thing.loc = get_turf(thing) // Drop it onto the turf for throwing.
+				thing.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) // Being pelted with bits of meat and bone would hurt.
+				sleep(1)
 
-		for(var/obj/effect/gibs in contents) //throw out the gibs too
-			gibs.loc = get_turf(gibs) //drop onto turf for throwing
-			gibs.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
-			sleep(1)
+			for(var/obj/effect/gibs in contents) //throw out the gibs too
+				gibs.loc = get_turf(gibs) //drop onto turf for throwing
+				gibs.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
+				sleep(1)
 
 		pixel_x = initial(pixel_x) //return to it's spot after shaking
 		operating = 0
@@ -306,6 +314,8 @@
 	var/acceptdir = NORTH
 	var/lastacceptdir = NORTH
 	var/turf/lturf
+	var/consumption_delay = 3 SECONDS
+	var/list/victim_targets = list()
 
 /obj/machinery/gibber/autogibber/New()
 	..()
@@ -320,7 +330,7 @@
 	RefreshParts()
 
 /obj/machinery/gibber/autogibber/process()
-	if(!lturf || occupant || locked || dirty || operating)
+	if(!lturf || occupant || locked || dirty || operating || victim_targets.len)
 		return
 
 	if(acceptdir != lastacceptdir)
@@ -331,15 +341,21 @@
 			lturf = T
 
 	for(var/mob/living/carbon/human/H in lturf)
-		if(istype(H) && H.loc == lturf)
-			visible_message({"<span class='danger'>\The [src] states, "Food detected!"</span>"})
-			sleep(30)
+		victim_targets += H
+
+	if(victim_targets.len)
+		visible_message({"<span class='danger'>\The [src] states, "Food detected!"</span>"})
+		sleep(consumption_delay)
+		for(var/mob/living/carbon/H in victim_targets)
 			if(H.loc == lturf) //still standing there
 				if(force_move_into_gibber(H))
+					locked = 1 // no escape
 					ejectclothes(occupant)
 					cleanbay()
 					startgibbing(null, 1)
+					locked = 0
 			break
+	victim_targets.Cut()
 
 /obj/machinery/gibber/autogibber/proc/force_move_into_gibber(var/mob/living/carbon/human/victim)
 	if(!istype(victim))	return 0
@@ -364,7 +380,7 @@
 				continue
 		if(istype(O,/obj/item/organ))
 			continue
-		if(O.flags & NODROP)
+		if(O.flags & NODROP || stealthmode)
 			qdel(O) //they are already dead by now
 		H.unEquip(O)
 		O.loc = loc
@@ -372,7 +388,7 @@
 		sleep(1)
 
 	for(var/obj/item/clothing/C in H)
-		if(C.flags & NODROP)
+		if(C.flags & NODROP || stealthmode)
 			qdel(C)
 		H.unEquip(C)
 		C.loc = loc
@@ -384,7 +400,9 @@
 /obj/machinery/gibber/autogibber/proc/cleanbay()
 	var/spats = 0 //keeps track of how many items get spit out. Don't show a message if none are found.
 	for(var/obj/O in src)
-		if(istype(O))
+		if(stealthmode)
+			qdel(O)
+		else if(istype(O))
 			O.loc = loc
 			O.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
 			spats++

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -82,7 +82,7 @@
 		return 1
 	if(istype(O,/obj/item/weapon/storage/pill_bottle/))
 		return 1
-	if(istype(O,/obj/item/weapon/reagent_containers/food/pill/))
+	if(ispill(O))
 		return 1
 	return 0
 
@@ -108,7 +108,7 @@
 		return 1
 	if(istype(O,/obj/item/weapon/storage/pill_bottle/))
 		return 1
-	if(istype(O,/obj/item/weapon/reagent_containers/food/pill/))
+	if(ispill(O))
 		return 1
 	return 0
 

code/modules/hydroponics/grown.dm

@@ -310,8 +310,8 @@
 
 		user.lastattacked = M
 		M.lastattacker = user
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>"
-		M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [key_name(user)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>"
+		user.create_attack_log("<font color='red'> Attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>")
+		M.create_attack_log("<font color='orange'> Attacked by [key_name(user)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])</font>")
 		msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" )
 
 		if(istype(M, /mob/living/carbon/human))
@@ -532,4 +532,4 @@
 					batteries_recharged = 1
 			if(batteries_recharged)
 				to_chat(user, "<span class='notice'>Battery has recovered.</span>")
-	..()
+	..()

code/modules/library/computers/checkout.dm

@@ -459,5 +459,5 @@
 		B.title = newbook.title
 		B.author = newbook.author
 		B.dat = newbook.content
-		B.icon_state = "book[rand(1,9)]"
+		B.icon_state = "book[rand(1,16)]"
 	visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")

code/modules/library/lib_machines.dm

@@ -217,8 +217,8 @@ var/global/list/library_section_names = list("Any", "Fiction", "Non-Fiction", "A
 		var/obj/item/weapon/book/b = new(loc)
 		b.dat = P.info
 		b.name = "Print Job #[rand(100, 999)]"
-		b.icon_state = "book[rand(1,7)]"
+		b.icon_state = "book[rand(1,16)]"
 		qdel(P)
 		return 1
 	else
-		return ..()
+		return ..()

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -116,12 +116,6 @@
 	mmi_icon_state = "slime_mmi"
 //	parent_organ = "chest" Hello I am from the ministry of rubber forehead aliens how are you
 
-/obj/item/organ/internal/brain/slime/take_damage(var/amount, var/silent = 1)
-	//Slimes are 150% more vulnerable to brain damage
-	damage = between(0, src.damage + (1.5*amount), max_damage) //Since they take the damage twice, this is +150%
-	return ..()
-
-
 /obj/item/organ/internal/brain/golem
 	name = "Runic mind"
 	desc = "A tightly furled roll of paper, covered with indecipherable runes."

code/modules/mob/living/carbon/carbon.dm

@@ -35,9 +35,9 @@
 	. = ..()
 	if(.)
 		if(nutrition && stat != DEAD)
-			nutrition -= HUNGER_FACTOR/10
+			nutrition -= hunger_drain / 10
 			if(m_intent == "run")
-				nutrition -= HUNGER_FACTOR/10
+				nutrition -= hunger_drain / 10
 		if((FAT in mutations) && m_intent == "run" && bodytemperature <= 360)
 			bodytemperature += 2
 
@@ -942,7 +942,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	var/fullness = nutrition + 10
 	if(istype(toEat, /obj/item/weapon/reagent_containers/food/snacks))
 		for(var/datum/reagent/consumable/C in reagents.reagent_list) //we add the nutrition value of what we're currently digesting
-			fullness += C.nutriment_factor * C.volume / C.metabolization_rate
+			fullness += C.nutriment_factor * C.volume / (C.metabolization_rate * metabolism_efficiency * digestion_ratio)
 	if(user == src)
 		if(istype(toEat, /obj/item/weapon/reagent_containers/food/drinks))
 			if(!selfDrink(toEat))
@@ -958,7 +958,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	return 1
 
 /mob/living/carbon/proc/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness)
-	if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill))
+	if(ispill(toEat))
 		to_chat(src, "<span class='notify'>You [toEat.apply_method] [toEat].</span>")
 	else
 		if(toEat.junkiness && satiety < -150 && nutrition > NUTRITION_LEVEL_STARVING + 50 )
@@ -981,7 +981,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	return 1
 
 /mob/living/carbon/proc/forceFed(var/obj/item/weapon/reagent_containers/food/toEat, mob/user, fullness)
-	if(fullness <= (600 * (1 + overeatduration / 1000)))
+	if(ispill(toEat) || fullness <= (600 * (1 + overeatduration / 1000)))
 		if(!toEat.instant_application)
 			visible_message("<span class='warning'>[user] attempts to force [src] to [toEat.apply_method] [toEat].</span>")
 	else
@@ -995,8 +995,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	return 1
 
 /mob/living/carbon/proc/forceFedAttackLog(var/obj/item/weapon/reagent_containers/food/toEat, mob/user)
-	attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [toEat.name] by [user.name] ([user.ckey]) Reagents: [toEat.reagentlist(toEat)]</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [toEat.name] to [name] ([ckey]) Reagents: [toEat.reagentlist(toEat)]</font>")
+	create_attack_log("<font color='orange'>Has been fed [toEat.name] by [user.name] ([user.ckey]) Reagents: [toEat.reagentlist(toEat)]</font>")
+	user.create_attack_log("<font color='red'>Fed [toEat.name] to [name] ([ckey]) Reagents: [toEat.reagentlist(toEat)]</font>")
 	log_attack("[user.name] ([user.ckey]) fed [name] ([ckey]) with [toEat.name] Reagents: [toEat.reagentlist(toEat)] (INTENT: [uppertext(user.a_intent)])")
 	if(!iscarbon(user))
 		LAssailant = null

code/modules/mob/living/carbon/human/human.dm

@@ -1539,6 +1539,9 @@
 	else
 		see_invisible = SEE_INVISIBLE_LIVING
 
+	hunger_drain = species.hunger_drain
+	digestion_ratio = species.digestion_ratio
+
 	if(species.base_color && default_colour)
 		//Apply colour.
 		r_skin = color2R(species.base_color)

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -182,8 +182,8 @@
 					apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
 					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 					visible_message("<span class='danger'>[M] has pushed [src]!</span>")
-					M.attack_log += text("\[[time_stamp()]\] <font color='red'>Pushed [src.name] ([src.ckey])</font>")
-					src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been pushed by [M.name] ([M.ckey])</font>")
+					M.create_attack_log("<font color='red'>Pushed [src.name] ([src.ckey])</font>")
+					src.create_attack_log("<font color='orange'>Has been pushed by [M.name] ([M.ckey])</font>")
 					if(!iscarbon(M))
 						LAssailant = null
 					else

code/modules/mob/living/carbon/human/human_damage.dm

@@ -28,13 +28,15 @@
 	med_hud_set_status()
 	handle_hud_icons()
 
-/mob/living/carbon/human/adjustBrainLoss(var/amount)
+/mob/living/carbon/human/adjustBrainLoss(amount)
 	if(status_flags & GODMODE)
 		return 0	//godmode
 
 	if(species && species.has_organ["brain"])
 		var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
 		if(sponge)
+			if(species)
+				amount = amount * species.brain_mod
 			sponge.take_damage(amount, 1)
 			brainloss = sponge.damage
 		else
@@ -42,14 +44,16 @@
 	else
 		brainloss = 0
 
-/mob/living/carbon/human/setBrainLoss(var/amount)
+/mob/living/carbon/human/setBrainLoss(amount)
 	if(status_flags & GODMODE)
 		return 0	//godmode
 
 	if(species && species.has_organ["brain"])
 		var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
 		if(sponge)
-			sponge.damage = min(max(amount, 0),(maxHealth*2))
+			if(species)
+				amount = amount * species.brain_mod
+			sponge.damage = min(max(amount, 0), (maxHealth*2))
 			brainloss = sponge.damage
 		else
 			brainloss = 200
@@ -84,25 +88,25 @@
 	return amount
 
 
-/mob/living/carbon/human/adjustBruteLoss(var/amount)
-	if(species && species.brute_mod)
-		amount = amount*species.brute_mod
+/mob/living/carbon/human/adjustBruteLoss(amount)
+	if(species)
+		amount = amount * species.brute_mod
 	if(amount > 0)
 		take_overall_damage(amount, 0)
 	else
 		heal_overall_damage(-amount, 0)
 
-/mob/living/carbon/human/adjustFireLoss(var/amount)
-	if(species && species.burn_mod)
-		amount = amount*species.burn_mod
+/mob/living/carbon/human/adjustFireLoss(amount)
+	if(species)
+		amount = amount * species.burn_mod
 	if(amount > 0)
 		take_overall_damage(0, amount)
 	else
 		heal_overall_damage(0, -amount)
 
-/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
-	if(species && species.brute_mod)
-		amount = amount*species.brute_mod
+/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null)
+	if(species)
+		amount = amount * species.brute_mod
 
 	if(organ_name in organs_by_name)
 		var/obj/item/organ/external/O = get_organ(organ_name)
@@ -114,9 +118,9 @@
 			O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
 
 
-/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
-	if(species && species.burn_mod)
-		amount = amount*species.burn_mod
+/mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null)
+	if(species)
+		amount = amount * species.burn_mod
 
 	if(organ_name in organs_by_name)
 		var/obj/item/organ/external/O = get_organ(organ_name)
@@ -134,13 +138,11 @@
 		wearing_rig.notify_ai("<span class='danger'>Warning: user consciousness failure. Mobility control passed to integrated intelligence system.</span>")
 	..()
 
-/mob/living/carbon/human/adjustCloneLoss(var/amount)
+/mob/living/carbon/human/adjustCloneLoss(amount)
+	if(species)
+		amount = amount * species.clone_mod
 	..()
 
-	if(species.flags & (NO_DNA))
-		cloneloss = 0
-		return
-
 	var/heal_prob = max(0, 80 - getCloneLoss())
 	var/mut_prob = min(80, getCloneLoss() + 10)
 	if(amount > 0) //cloneloss is being added
@@ -176,44 +178,30 @@
 
 
 // Defined here solely to take species flags into account without having to recast at mob/living level.
-/mob/living/carbon/human/getOxyLoss()
-	if(species.flags & NO_BREATHE)
-		oxyloss = 0
-	return ..()
+/mob/living/carbon/human/adjustOxyLoss(amount)
+	if(species)
+		amount = amount * species.oxy_mod
+	..()
 
-/mob/living/carbon/human/adjustOxyLoss(var/amount)
-	if(species.flags & NO_BREATHE)
-		oxyloss = 0
-	else
-		..()
+/mob/living/carbon/human/setOxyLoss(amount)
+	if(species)
+		amount = amount * species.oxy_mod
+	..()
 
-/mob/living/carbon/human/setOxyLoss(var/amount)
-	if(species.flags & NO_BREATHE)
-		oxyloss = 0 //this literally overrides three procs, excessive much?
-	else
-		..()
+/mob/living/carbon/human/adjustToxLoss(amount)
+	if(species)
+		amount = amount * species.tox_mod
+	..()
 
-/mob/living/carbon/human/getToxLoss()
-	if(species.flags & NO_POISON)
-		toxloss = 0
-	return ..()
-
-/mob/living/carbon/human/adjustToxLoss(var/amount)
-	if(species.flags & NO_POISON)
-		toxloss = 0
-	else
-		..()
-
-/mob/living/carbon/human/setToxLoss(var/amount)
-	if(species.flags & NO_POISON)
-		toxloss = 0 //this *also* overrides three procs, definately excessive
-	else
-		..()
+/mob/living/carbon/human/setToxLoss(amount)
+	if(species)
+		amount = amount * species.tox_mod
+	..()
 
 ////////////////////////////////////////////
 
 //Returns a list of damaged organs
-/mob/living/carbon/human/proc/get_damaged_organs(var/brute, var/burn, var/flags = AFFECT_ALL_ORGANS)
+/mob/living/carbon/human/proc/get_damaged_organs(brute, burn, flags = AFFECT_ALL_ORGANS)
 	var/list/obj/item/organ/external/parts = list()
 	for(var/obj/item/organ/external/O in organs)
 		if((brute && O.brute_dam) || (burn && O.burn_dam))
@@ -235,7 +223,7 @@
 //Heals ONE external organ, organ gets randomly selected from damaged ones.
 //It automatically updates damage overlays if necesary
 //It automatically updates health status
-/mob/living/carbon/human/heal_organ_damage(var/brute, var/burn)
+/mob/living/carbon/human/heal_organ_damage(brute, burn)
 	var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
 	if(!parts.len)
 		return
@@ -247,7 +235,7 @@
 //Damages ONE external organ, organ gets randomly selected from damagable ones.
 //It automatically updates damage overlays if necesary
 //It automatically updates health status
-/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0)
+/mob/living/carbon/human/take_organ_damage(brute, burn, sharp = 0, edge = 0)
 	var/list/obj/item/organ/external/parts = get_damageable_organs()
 	if(!parts.len)
 		return
@@ -259,7 +247,7 @@
 
 
 //Heal MANY external organs, in random order
-/mob/living/carbon/human/heal_overall_damage(var/brute, var/burn, var/internal=0, var/robotic=0)
+/mob/living/carbon/human/heal_overall_damage(brute, burn, internal=0, robotic=0)
 	var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
 
 	var/update = 0
@@ -282,7 +270,7 @@
 		UpdateDamageIcon()
 
 // damage MANY external organs, in random order
-/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null)
+/mob/living/carbon/human/take_overall_damage(brute, burn, sharp = 0, edge = 0, used_weapon = null)
 	if(status_flags & GODMODE)
 		return	//godmode
 	var/list/obj/item/organ/external/parts = get_damageable_organs()
@@ -337,7 +325,7 @@ This function restores all organs.
 		return 0
 
 
-/mob/living/carbon/human/proc/get_organ(var/zone)
+/mob/living/carbon/human/proc/get_organ(zone)
 	if(!zone)
 		zone = "chest"
 	if(zone in list("eyes", "mouth"))
@@ -345,7 +333,7 @@ This function restores all organs.
 
 	return organs_by_name[zone]
 
-/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
+/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = 0, edge = 0, obj/used_weapon = null)
 	//Handle other types of damage
 	if((damagetype != BRUTE) && (damagetype != BURN))
 		..(damage, damagetype, def_zone, blocked)
@@ -373,7 +361,7 @@ This function restores all organs.
 	switch(damagetype)
 		if(BRUTE)
 			damageoverlaytemp = 20
-			if(species && species.brute_mod)
+			if(species)
 				damage = damage * species.brute_mod
 
 			if(organ.take_damage(damage, 0, sharp, edge, used_weapon))
@@ -398,7 +386,7 @@ This function restores all organs.
 		if(BURN)
 			damageoverlaytemp = 20
 
-			if(species && species.burn_mod)
+			if(species)
 				damage = damage * species.burn_mod
 
 			if(organ.take_damage(0, damage, sharp, edge, used_weapon))
@@ -406,4 +394,4 @@ This function restores all organs.
 
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
 	updatehealth()
-	return 1
+	return 1

code/modules/mob/living/carbon/human/human_defense.dm

@@ -200,8 +200,8 @@ emp_act
 		--src.meatleft
 		to_chat(user, "\red You hack off a chunk of meat from [src.name]")
 		if(!src.meatleft)
-			src.attack_log += "\[[time_stamp()]\] Was chopped up into meat by <b>[key_name(user)]</b>"
-			user.attack_log += "\[[time_stamp()]\] Chopped up <b>[key_name(src)]</b> into meat</b>"
+			src.create_attack_log("Was chopped up into meat by <b>[key_name(user)]</b>")
+			user.create_attack_log("Chopped up <b>[key_name(src)]</b> into meat</b>")
 			msg_admin_attack("[key_name_admin(user)] chopped up [key_name_admin(src)] into meat")
 			if(!iscarbon(user))
 				LAssailant = null
@@ -449,8 +449,8 @@ emp_act
 		visible_message("<span class='danger'>[src] has been hit by [M.name].</span>", \
 								"<span class='userdanger'>[src] has been hit by [M.name].</span>")
 
-		attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
-		M.occupant.attack_log += text("\[[time_stamp()]\] <font color='red'>Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
+		create_attack_log("<font color='orange'>Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
+		M.occupant.create_attack_log("<font color='red'>Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
 		msg_admin_attack("[key_name_admin(M.occupant)] attacked [key_name_admin(src)] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])")
 
 	else

code/modules/mob/living/carbon/human/life.dm

@@ -675,14 +675,14 @@
 	// nutrition decrease
 	if(nutrition > 0 && stat != DEAD)
 		// THEY HUNGER
-		var/hunger_rate = HUNGER_FACTOR
+		var/hunger_rate = hunger_drain
 		if(satiety > 0)
 			satiety--
 		if(satiety < 0)
 			satiety++
 			if(prob(round(-satiety/40)))
 				Jitter(5)
-			hunger_rate = 3 * HUNGER_FACTOR
+			hunger_rate = 3 * hunger_drain
 		nutrition = max(0, nutrition - hunger_rate)
 
 	if(nutrition > NUTRITION_LEVEL_FULL)

code/modules/mob/living/carbon/human/species/abductor.dm

@@ -11,6 +11,9 @@
 	eyes = "blank_eyes"
 
 	flags = HAS_LIPS | NO_BLOOD | NO_BREATHE
+
+	oxy_mod = 0
+
 	virus_immune = 1
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
 	dietflags = DIET_OMNI

code/modules/mob/living/carbon/human/species/apollo.dm

@@ -37,10 +37,12 @@
 		"antennae" =    /obj/item/organ/internal/wryn/hivenode
 		)
 
-	flags = IS_WHITELISTED | HAS_LIPS | NO_BREATHE | HAS_SKIN_COLOR | NO_SCAN | NO_SCAN | HIVEMIND
+	flags = IS_WHITELISTED | HAS_LIPS | NO_BREATHE | HAS_SKIN_COLOR | NO_SCAN | HIVEMIND
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
 	dietflags = DIET_HERB		//bees feed off nectar, so bee people feed off plants too
 
+	oxy_mod = 0
+
 	reagent_tag = PROCESS_ORG
 	base_color = "#704300"
 	flesh_color = "#704300"
@@ -77,8 +79,8 @@
 				head_organ.h_style = "Bald"
 				H.update_hair()
 
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>removed antennae [H.name] ([H.ckey])</font>")
-				H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their antennae removed by [M.name] ([M.ckey])</font>")
+				M.create_attack_log("<font color='red'>removed antennae [H.name] ([H.ckey])</font>")
+				H.create_attack_log("<font color='orange'>Has had their antennae removed by [M.name] ([M.ckey])</font>")
 				msg_admin_attack("[key_name(M)] removed [key_name(H)]'s antennae")
 			return 0
 
@@ -97,6 +99,7 @@
 	language = "Sol Common"
 	burn_mod = 4 // holy shite, poor guys wont survive half a second cooking smores
 	brute_mod = 2 // damn, double wham, double dam
+	oxy_mod = 0
 	flags = IS_WHITELISTED | NO_BREATHE | NO_BLOOD | NO_PAIN | HAS_LIPS | NO_SCAN
 	dietflags = DIET_OMNI		//still human at their core, so they maintain their eating habits and diet
 

code/modules/mob/living/carbon/human/species/golem.dm

@@ -7,6 +7,9 @@
 
 	default_language = "Galactic Common"
 	flags = NO_BREATHE | NO_BLOOD | RADIMMUNE | NOGUNS
+
+	oxy_mod = 0
+
 	virus_immune = 1
 	dietflags = DIET_OMNI		//golems can eat anything because they are magic or something
 	reagent_tag = PROCESS_ORG

code/modules/mob/living/carbon/human/species/plasmaman.dm

@@ -6,7 +6,7 @@
 	//language = "Clatter"
 	unarmed_type = /datum/unarmed_attack/punch
 
-	flags = IS_WHITELISTED | NO_BLOOD
+	flags = IS_WHITELISTED | NO_BLOOD | NOTRANSSTING
 	dietflags = DIET_OMNI
 	reagent_tag = PROCESS_ORG
 

code/modules/mob/living/carbon/human/species/shadow.dm

@@ -19,6 +19,9 @@
 		)
 
 	flags = NO_BLOOD | NO_BREATHE | RADIMMUNE
+
+	oxy_mod = 0
+
 	virus_immune = 1
 	
 	dietflags = DIET_OMNI		//the mutation process allowed you to now digest all foods regardless of initial race

code/modules/mob/living/carbon/human/species/skeleton.dm

@@ -14,6 +14,9 @@
 	flesh_color = "#E6E6C6"
 
 	flags = NO_BREATHE | NO_BLOOD | RADIMMUNE
+
+	oxy_mod = 0
+
 	virus_immune = 1 //why is this a var and not a flag?
 	dietflags = DIET_OMNI
 	reagent_tag = PROCESS_ORG

code/modules/mob/living/carbon/human/species/species.dm

@@ -43,6 +43,8 @@
 
 	var/body_temperature = 310.15	//non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing)
 	var/reagent_tag                 //Used for metabolizing reagents.
+	var/hunger_drain = HUNGER_FACTOR
+	var/digestion_ratio = 1 //How quickly the species digests/absorbs reagents.
 
 	var/siemens_coeff = 1 //base electrocution coefficient
 
@@ -67,8 +69,13 @@
 		"sa_sleep" = 5
 		)
 
-	var/brute_mod = null    // Physical damage reduction/malus.
-	var/burn_mod = null     // Burn damage reduction/malus.
+	var/brute_mod = 1    // Physical damage reduction/amplification
+	var/burn_mod = 1     // Burn damage reduction/amplification
+	var/tox_mod = 1      // Toxin damage reduction/amplification
+	var/oxy_mod = 1		 // Oxy damage reduction/amplification
+	var/clone_mod = 1	 // Clone damage reduction/amplification
+	var/brain_mod = 1    // Brain damage damage reduction/amplification
+	var/stun_mod = 1	 // If a species is more/less impacated by stuns/weakens/paralysis
 
 	var/total_health = 100
 	var/punchdamagelow = 0       //lowest possible punch damage
@@ -659,4 +666,4 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = SEE_INVISIBLE_MINIMUM
 
 	if(H.see_override)	//Override all
-		H.see_invisible = H.see_override
+		H.see_invisible = H.see_override

code/modules/mob/living/carbon/human/species/station.dm

@@ -282,7 +282,7 @@
 	breath_type = "nitrogen"
 	poison_type = "oxygen"
 
-	flags = NO_SCAN | IS_WHITELISTED
+	flags = NO_SCAN | IS_WHITELISTED | NOTRANSSTING
 	clothing_flags = HAS_SOCKS
 	dietflags = DIET_OMNI
 	bodyflags = HAS_ICON_SKIN_TONE | HAS_TAIL | TAIL_WAGGING | TAIL_OVERLAPPED | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS
@@ -506,6 +506,9 @@
 	cold_level_3 = 200
 	cold_env_multiplier = 3
 
+	oxy_mod = 0
+	brain_mod = 2.5
+
 	flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS | NO_SCAN
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
 	bodyflags = HAS_SKIN_COLOR | NO_EYES
@@ -756,6 +759,8 @@
 	clothing_flags = HAS_SOCKS
 	dietflags = 0		//Diona regenerate nutrition in light, no diet necessary
 
+	oxy_mod = 0
+
 	body_temperature = T0C + 15		//make the plant people have a bit lower body temperature, why not
 	blood_color = "#004400"
 	flesh_color = "#907E4A"
@@ -855,9 +860,12 @@
 	eyes = "blank_eyes"
 	brute_mod = 2.5 // 100% * 2.5 * 0.6 (robolimbs) ~= 150%
 	burn_mod = 2.5  // So they take 50% extra damage from brute/burn overall.
+	tox_mod = 0
+	clone_mod = 0
+	oxy_mod = 0
 	death_message = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."
 
-	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | NO_POISON | RADIMMUNE | ALL_RPARTS
+	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | RADIMMUNE | ALL_RPARTS| NOTRANSSTING
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
 	bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY
 	dietflags = 0		//IPCs can't eat, so no diet
@@ -1012,4 +1020,4 @@
 				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
 
 			if(heat_level_3_breathe to INFINITY)
-				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")

code/modules/mob/living/carbon/human/status_procs.dm

@@ -0,0 +1,19 @@
+/mob/living/carbon/human/SetStunned(amount, updating = 1, force = 0)
+	if(species)
+		amount = amount * species.stun_mod
+	..()
+
+/mob/living/carbon/human/SetWeakened(amount, updating = 1, force = 0)
+	if(species)
+		amount = amount * species.stun_mod
+	..()
+
+/mob/living/carbon/human/SetParalysis(amount, updating = 1, force = 0)
+	if(species)
+		amount = amount * species.stun_mod
+	..()
+
+/mob/living/carbon/human/SetSleeping(amount, updating = 1)
+	if(species)
+		amount = amount * species.stun_mod
+	..()

code/modules/mob/living/carbon/slime/slime.dm

@@ -264,8 +264,8 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", \
 				"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		M.create_attack_log("<font color='red'>attacked [src.name] ([src.ckey])</font>")
+		src.create_attack_log("<font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		attacked += 10
 		adjustBruteLoss(damage)

code/modules/mob/living/living_defense.dm

@@ -91,8 +91,8 @@
 		if(ismob(I.thrower))
 			var/mob/M = I.thrower
 			if(M)
-				attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [I], thrown by [key_name(M)]</font>")
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [I]</font>")
+				create_attack_log("<font color='orange'>Has been hit with a [I], thrown by [key_name(M)]</font>")
+				M.create_attack_log("<font color='red'>Hit [key_name(src)] with a thrown [I]</font>")
 				if(!istype(src,/mob/living/simple_animal/mouse))
 					msg_admin_attack("[key_name_admin(src)] was hit by a [I], thrown by [key_name_admin(M)]")
 
@@ -140,8 +140,8 @@
 		M.occupant_message("<span class='danger'>You hit [src].</span>")
 		visible_message("<span class='danger'>[src] has been hit by [M.name].</span>", \
 						"<span class='userdanger'>[src] has been hit by [M.name].</span>")
-		attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
-		M.occupant.attack_log += text("\[[time_stamp()]\] <font color='red'>Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
+		create_attack_log("<font color='orange'>Has been attacked by \the [M] controlled by [key_name(M.occupant)] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
+		M.occupant.create_attack_log("<font color='red'>Attacked [src] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])</font>")
 		msg_admin_attack("[key_name_admin(M.occupant)] attacked [key_name_admin(src)] with \the [M] (INTENT: [uppertext(M.occupant.a_intent)])")
 
 	else

code/modules/mob/living/living_defines.dm

@@ -33,6 +33,7 @@
 	var/floating = 0
 	var/mob_size = MOB_SIZE_HUMAN
 	var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
+	var/digestion_ratio = 1 //controls how quickly reagents metabolize; largely governered by species attributes.
 	var/nightvision = 0
 
 	var/bloodcrawl = 0 //0 No blood crawling, 1 blood crawling, 2 blood crawling+mob devour

code/modules/mob/living/silicon/pai/pai.dm

@@ -219,8 +219,8 @@
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("<span class='danger'>[M]</span> [M.attacktext] [src]!", 1)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
+		M.create_attack_log("<font color='red'>attacked [src.name] ([src.ckey])</font>")
+		src.create_attack_log("<font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
 		updatehealth()

code/modules/mob/living/simple_animal/constructs.dm

@@ -29,10 +29,17 @@
 
 /mob/living/simple_animal/hostile/construct/New()
 	..()
-	name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])"
-	real_name = ticker.mode.cultdat.get_name(const_type)
-	icon_living = ticker.mode.cultdat.get_icon(const_type)
-	icon_state = ticker.mode.cultdat.get_icon(const_type)
+	if(!ticker.mode)//work around for maps with runes and cultdat is not loaded all the way
+		name = "[const_type] ([rand(1, 1000)])"
+		real_name = const_type
+		icon_living = const_type
+		icon_state = const_type
+	else
+		name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])"
+		real_name = ticker.mode.cultdat.get_name(const_type)
+		icon_living = ticker.mode.cultdat.get_icon(const_type)
+		icon_state = ticker.mode.cultdat.get_icon(const_type)
+
 	for(var/spell in construct_spells)
 		AddSpell(new spell(null))
 

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -15,67 +15,13 @@
 	var/colour = "grey"
 	pass_flags = PASSTABLE
 
-/mob/living/simple_animal/slime/Bump(atom/movable/AM as mob|obj, yes)
-
-	spawn( 0 )
-		if((!( yes ) || now_pushing))
-			return
-		now_pushing = 1
-		if(ismob(AM))
-			var/mob/tmob = AM
-			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
-				if(prob(70))
-					to_chat(src, "<span class='danger'>You fail to push [tmob]'s fat ass out of the way.</span>")
-					now_pushing = 0
-					return
-			if(!(tmob.status_flags & CANPUSH))
-				now_pushing = 0
-				return
-
-			tmob.LAssailant = src
-		now_pushing = 0
-		..()
-		if(!( istype(AM, /atom/movable) ))
-			return
-		if(!( now_pushing ))
-			now_pushing = 1
-			if(!( AM.anchored ))
-				var/t = get_dir(src, AM)
-				if(istype(AM, /obj/structure/window/full))
-					for(var/obj/structure/window/win in get_step(AM,t))
-						now_pushing = 0
-						return
-				step(AM, t)
-			now_pushing = null
-		return
-	return
-
-/mob/living/simple_animal/adultslime
-	name = "pet slime"
-	desc = "A lovable, domesticated slime."
-	icon = 'icons/mob/slimes.dmi'
+/mob/living/simple_animal/slime/adult
 	health = 200
 	maxHealth = 200
 	icon_state = "grey adult slime"
 	icon_living = "grey adult slime"
 	icon_dead = "grey baby slime dead"
-	response_help  = "pets"
-	response_disarm = "shoos"
-	response_harm   = "stomps on"
-	emote_see = list("jiggles", "bounces in place")
-	var/colour = "grey"
-	del_on_death = 1
 
-/mob/living/simple_animal/adultslime/New()
+/mob/living/simple_animal/slime/New()
 	..()
 	overlays += "aslime-:33"
-
-
-/mob/living/simple_animal/slime/adult/death(gibbed)
-	for(var/i in 1 to 2)
-		var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime (src.loc)
-		S.icon_state = "[colour] baby slime"
-		S.icon_living = "[colour] baby slime"
-		S.icon_dead = "[colour] baby slime dead"
-		S.colour = "[colour]"
-	..()

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm

@@ -158,7 +158,7 @@ var/global/list/ts_spiderlist = list()
 			var/can_poison = 1
 			if(ishuman(G))
 				var/mob/living/carbon/human/H = G
-				if(!(H.species.reagent_tag & PROCESS_ORG) || (H.species.flags & NO_POISON))
+				if(!(H.species.reagent_tag & PROCESS_ORG) || (!H.species.tox_mod))
 					can_poison = 0
 			spider_specialattack(G,can_poison)
 		else

code/modules/mob/mob.dm

@@ -1309,3 +1309,39 @@ mob/proc/yank_out_object()
 		if(F in target.faction)
 			return 1
 	return 0
+
+/mob/proc/create_attack_log(var/text, var/collapse = 1)//forgive me code gods for this shitcode proc
+	//this proc enables lovely stuff like an attack log that looks like this: "[18:20:29-18:20:45]21x John Smith attacked Andrew Jackson with a crowbar."
+	//That makes the logs easier to read, but because all of this is stored in strings, weird things have to be used to get it all out.
+	var/new_log = "\[[time_stamp()]] [text]"
+
+	if(length(attack_log) > 0)//if there are other logs already present
+		var/previous_log = attack_log[length(attack_log)]//get the latest log
+		var/last_log_is_range = (copytext(previous_log, 10, 11) == "-") //whether the last log is a time range or not. The "-" will be an indicator that it is.
+		var/x_sign_position = findtext(previous_log, "x")
+
+		if(world.timeofday - last_log > 100)//if more than 10 seconds from last log
+			collapse = 0//don't collapse anyway
+
+		//the following checks if the last log has the same contents as the new one
+		if(last_log_is_range)
+			if(!(copytext(previous_log, x_sign_position + 13) == text))//the 13 is there because of span classes; you won't see those normally in-game
+				collapse = 0
+		else
+			if(!(copytext(previous_log, 12) == text))
+				collapse = 0
+
+
+		if(collapse == 1)
+			var/rep = 0
+			var/old_timestamp = copytext(previous_log, 2, 10)//copy the first time value. This one doesn't move when it's a timespan, so no biggie
+			//An attack log entry can either be a time range with multiple occurences of an action or a single one, with just one time stamp
+			if(last_log_is_range)
+
+				rep = text2num(copytext(previous_log, 44, x_sign_position))//get whatever number is right before the 'x'
+
+			new_log = "\[[old_timestamp]-[time_stamp()]]<font color='purple'><b>[rep?rep+1:2]x</b></font> [text]"
+			attack_log -= attack_log[length(attack_log)]//remove the last log
+
+	attack_log += new_log
+	last_log = world.timeofday

code/modules/mob/mob_defines.dm

@@ -30,6 +30,7 @@
 	var/lastattacker = null
 	var/lastattacked = null
 	var/attack_log = list( )
+	var/last_log = 0
 	var/obj/machinery/machine = null
 	var/other_mobs = null
 	var/memory = ""
@@ -69,6 +70,7 @@
 	var/charges = 0.0
 	var/nutrition = NUTRITION_LEVEL_FED + 50 //Carbon
 	var/satiety = 0 //Carbon
+	var/hunger_drain = HUNGER_FACTOR // how quickly the mob gets hungry; largely utilized by species.
 
 	var/overeatduration = 0		// How long this guy is overeating //Carbon
 	var/intent = null//Living

code/modules/mob/mob_grab.dm

@@ -269,8 +269,8 @@
 		state = GRAB_NECK
 		icon_state = "grabbed+1"
 		assailant.set_dir(get_dir(assailant, affecting))
-		affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has had their neck grabbed by [assailant.name] ([assailant.ckey])</font>"
-		assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Grabbed the neck of [affecting.name] ([affecting.ckey])</font>"
+		affecting.create_attack_log("<font color='orange'>Has had their neck grabbed by [assailant.name] ([assailant.ckey])</font>")
+		assailant.create_attack_log("<font color='red'>Grabbed the neck of [affecting.name] ([affecting.ckey])</font>")
 		log_attack("<font color='red'>[assailant.name] ([assailant.ckey]) grabbed the neck of [affecting.name] ([affecting.ckey])</font>")
 		if(!iscarbon(assailant))
 			affecting.LAssailant = null
@@ -285,8 +285,8 @@
 
 		state = GRAB_KILL
 		assailant.visible_message("<span class='danger'>[assailant] has tightened \his grip on [affecting]'s neck!</span>")
-		affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])</font>"
-		assailant.attack_log += "\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>"
+		affecting.create_attack_log("<font color='orange'>Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])</font>")
+		assailant.create_attack_log("<font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>")
 		msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
 
 		assailant.next_move = world.time + 10
@@ -338,8 +338,8 @@
 							damage += hat.force * 3
 						affecting.apply_damage(damage*rand(90, 110)/100, BRUTE, "head", affected.run_armor_check(affecting, "melee"))
 						playsound(assailant.loc, "swing_hit", 25, 1, -1)
-						assailant.attack_log += text("\[[time_stamp()]\] <font color='red'>Headbutted [affecting.name] ([affecting.ckey])</font>")
-						affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Headbutted by [assailant.name] ([assailant.ckey])</font>")
+						assailant.create_attack_log("<font color='red'>Headbutted [affecting.name] ([affecting.ckey])</font>")
+						affecting.create_attack_log("<font color='orange'>Headbutted by [assailant.name] ([assailant.ckey])</font>")
 						msg_admin_attack("[key_name(assailant)] has headbutted [key_name(affecting)]")
 						return
 
@@ -357,8 +357,8 @@
 							return
 						assailant.visible_message("<span class='danger'>[assailant] presses \his fingers into [affecting]'s eyes!</span>")
 						to_chat(affecting, "<span class='danger'>You feel immense pain as digits are being pressed into your eyes!</span>")
-						assailant.attack_log += text("\[[time_stamp()]\] <font color='red'>Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])</font>")
-						affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])</font>")
+						assailant.create_attack_log("<font color='red'>Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])</font>")
+						affecting.create_attack_log("<font color='orange'>Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])</font>")
 						msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.")
 						var/obj/item/organ/internal/eyes/eyes = affected.get_int_organ(/obj/item/organ/internal/eyes)
 						eyes.damage += rand(3,4)
@@ -396,8 +396,8 @@
 
 			user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
 			if(affecting.mind)
-				affecting.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been devoured by [attacker.name] ([attacker.ckey])</font>"
-				attacker.attack_log += "\[[time_stamp()]\] <font color='red'>Devoured [affecting.name] ([affecting.ckey])</font>"
+				affecting.create_attack_log("<font color='orange'>Has been devoured by [attacker.name] ([attacker.ckey])</font>")
+				attacker.create_attack_log("<font color='red'>Devoured [affecting.name] ([affecting.ckey])</font>")
 				msg_admin_attack("[key_name(attacker)] devoured [key_name(affecting)]")
 
 			affecting.loc = user

code/modules/mob/new_player/new_player.dm

@@ -25,6 +25,8 @@
 
 /mob/new_player/proc/new_player_panel_proc()
 	var/real_name = client.prefs.real_name
+	if(client.prefs.randomslot)
+		real_name = "Random Character Slot"
 	var/output = "<center><p><a href='byond://?src=[UID()];show_preferences=1'>Setup Character</A><br /><i>[real_name]</i></p>"
 
 	if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
@@ -169,6 +171,9 @@
 			to_chat(usr, "\blue There is an administrative lock on entering the game!")
 			return
 
+		if(client.prefs.randomslot)
+			client.prefs.load_random_character_slot(client)
+
 		if(client.prefs.species in whitelisted_species)
 			if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
 				to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))

code/modules/paperwork/paper.dm

@@ -701,7 +701,7 @@
 					to_chat(H, "<span class='userdanger'>You feel surrounded by sadness. Sadness... and HONKS!</span>")
 					H.makeCluwne()
 			else if(myeffect == "Demotion Notice")
-				command_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
+				event_announcement.Announce("[mytarget] is hereby demoted to the rank of Civilian. Process this demotion immediately. Failure to comply with these orders is grounds for termination.","CC Demotion Order")
 			else
 				message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.")
 		used = 1

code/modules/power/apc.dm

@@ -1368,8 +1368,7 @@
 		spawn(0)
 			for(var/obj/machinery/light/L in area)
 				if(prob(chance))
-					L.on = 1
-					L.broken()
+					L.broken(0, 1)
 					stoplag()
 
 /obj/machinery/power/apc/proc/setsubsystem(val)

code/modules/power/generator.dm

@@ -10,23 +10,23 @@
 	var/obj/machinery/atmospherics/binary/circulator/hot_circ
 
 	var/cold_dir = WEST
-	var/hot_dir = EAST	
-	
+	var/hot_dir = EAST
+
 	var/lastgen = 0
 	var/lastgenlev = -1
 	var/lastcirc = "00"
-	
+
 /obj/machinery/power/generator/New()
 	..()
 	update_desc()
-	
+
 /obj/machinery/power/generator/proc/update_desc()
 	desc = initial(desc) + " Its cold circulator is located on the [dir2text(cold_dir)] side, and its heat circulator is located on the [dir2text(hot_dir)] side."
-	
+
 /obj/machinery/power/generator/Destroy()
 	disconnect()
 	return ..()
-	
+
 /obj/machinery/power/generator/proc/disconnect()
 	if(cold_circ)
 		cold_circ.generator = null
@@ -38,10 +38,10 @@
 /obj/machinery/power/generator/initialize()
 	..()
 	connect()
-	
+
 /obj/machinery/power/generator/proc/connect()
 	connect_to_network()
-	
+
 	var/obj/machinery/atmospherics/binary/circulator/circpath = /obj/machinery/atmospherics/binary/circulator
 	cold_circ = locate(circpath) in get_step(src, cold_dir)
 	hot_circ = locate(circpath) in get_step(src, hot_dir)
@@ -61,13 +61,13 @@
 	power_change()
 	update_icon()
 	updateDialog()
-	
+
 /obj/machinery/power/generator/power_change()
 	if(!anchored)
 		stat |= NOPOWER
 	else
 		..()
-	
+
 /obj/machinery/power/generator/update_icon()
 	if(stat & (NOPOWER|BROKEN))
 		overlays.Cut()
@@ -79,7 +79,7 @@
 
 		overlays += image('icons/obj/power.dmi', "teg-oc[lastcirc]")
 
-/obj/machinery/power/generator/process()	
+/obj/machinery/power/generator/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
 
@@ -128,11 +128,11 @@
 		// update icon overlays only if displayed level has changed
 
 		if(hot_air)
-			var/datum/gas_mixture/hot_circ_air1 = hot_circ.air1
+			var/datum/gas_mixture/hot_circ_air1 = hot_circ.get_outlet_air()
 			hot_circ_air1.merge(hot_air)
 
 		if(cold_air)
-			var/datum/gas_mixture/cold_circ_air1 = cold_circ.air1
+			var/datum/gas_mixture/cold_circ_air1 = cold_circ.get_outlet_air()
 			cold_circ_air1.merge(cold_air)
 
 	var/genlev = max(0, min( round(11 * lastgen / 100000), 11))
@@ -146,12 +146,12 @@
 
 /obj/machinery/power/generator/attack_ai(mob/user)
 	return attack_hand(user)
-	
+
 /obj/machinery/power/generator/attack_ghost(mob/user)
 	if(stat & (NOPOWER|BROKEN))
 		return
-	interact(user)	
-	
+	interact(user)
+
 /obj/machinery/power/generator/attack_hand(mob/user)
 	if(..())
 		user << browse(null, "window=teg")
@@ -168,29 +168,35 @@
 			connect()
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.</span>")
-	else if(istype(W, /obj/item/device/multitool))
+	else if(ismultitool(W))
 		if(cold_dir == WEST)
 			cold_dir = EAST
 			hot_dir = WEST
-		else
+		else if(cold_dir == NORTH)
+			cold_dir = SOUTH
+			hot_dir = NORTH
+		else if(cold_dir == EAST)
 			cold_dir = WEST
 			hot_dir = EAST
+		else
+			cold_dir = NORTH
+			hot_dir = SOUTH
 		connect()
 		to_chat(user, "<span class='notice'>You reverse the generator's circulator settings. The cold circulator is now on the [dir2text(cold_dir)] side, and the heat circulator is now on the [dir2text(hot_dir)] side.</span>")
 		update_desc()
 	else
-		..()	
-	
+		..()
+
 /obj/machinery/power/generator/proc/get_menu(include_link = 1)
 	var/t = ""
 	if(!powernet)
 		t += "<span class='bad'>Unable to connect to the power network!</span>"
 		t += "<BR><A href='?src=[UID()];check=1'>Retry</A>"
 	else if(cold_circ && hot_circ)
-		var/datum/gas_mixture/cold_circ_air1 = cold_circ.air1
-		var/datum/gas_mixture/cold_circ_air2 = cold_circ.air2
-		var/datum/gas_mixture/hot_circ_air1 = hot_circ.air1
-		var/datum/gas_mixture/hot_circ_air2 = hot_circ.air2
+		var/datum/gas_mixture/cold_circ_air1 = cold_circ.get_outlet_air()
+		var/datum/gas_mixture/cold_circ_air2 = cold_circ.get_inlet_air()
+		var/datum/gas_mixture/hot_circ_air1 = hot_circ.get_outlet_air()
+		var/datum/gas_mixture/hot_circ_air2 = hot_circ.get_inlet_air()
 
 		t += "<div class='statusDisplay'>"
 

code/modules/power/lighting.dm

@@ -514,14 +514,14 @@
 	status = LIGHT_EMPTY
 	update()
 
-/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0)
+/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0, overloaded = 0)
 	if(status == LIGHT_EMPTY || status == LIGHT_BROKEN)
 		return
 
 	if(!skip_sound_and_sparks)
 		if(status == LIGHT_OK || status == LIGHT_BURNED)
 			playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
-		if(on)
+		if(on || overloaded)
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(3, 1, src)
 			s.start()

code/modules/projectiles/guns/dartgun.dm

@@ -173,8 +173,8 @@
 							R += A.id + " ("
 							R += num2text(A.volume) + "),"
 					if(istype(M, /mob))
-						M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
-						user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
+						M.create_attack_log("<b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])")
+						user.create_attack_log("<b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])")
 						if(M.ckey)
 							msg_admin_attack("[key_name_admin(user)] shot [M] ([M.ckey]) with a dartgun ([R]).")
 						if(!iscarbon(user))
@@ -183,7 +183,7 @@
 							M.LAssailant = user
 
 					else
-						M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[key_name_admin(M)]</b> with a <b>dartgun</b> ([R])"
+						M.create_attack_log("<b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[key_name_admin(M)]</b> with a <b>dartgun</b> ([R])")
 						msg_admin_attack("UNKNOWN shot [key_name(M)] with a <b>dartgun</b> ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 					if(D.reagents)

code/modules/projectiles/guns/magic/wand.dm

@@ -50,7 +50,7 @@
 /obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user)
 	user.visible_message("<span class='danger'>[user] zaps \himself with [src].</span>")
 	playsound(user, fire_sound, 50, 1)
-	user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> zapped \himself with a <b>[src]</b>"
+	user.create_attack_log("<b>[user]/[user.ckey]</b> zapped \himself with a <b>[src]</b>")
 
 /////////////////////////////////////
 //WAND OF DEATH

code/modules/projectiles/projectile/magic.dm

@@ -240,7 +240,7 @@ proc/wabbajack(mob/living/M)
 				else
 					return
 
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
+			M.create_attack_log("<font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
 			new_mob.attack_log = M.attack_log
 
 			new_mob.a_intent = I_HARM

code/modules/reagents/chemistry/reagents.dm

@@ -73,7 +73,7 @@
 
 /datum/reagent/proc/on_mob_life(mob/living/M)
 	current_cycle++
-	holder.remove_reagent(id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+	holder.remove_reagent(id, metabolization_rate * M.metabolism_efficiency * M.digestion_ratio) //By default it slowly disappears.
 
 /datum/reagent/proc/on_mob_death(mob/living/M)	//use this to have chems have a "death-triggered" effect
 	return

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -4,7 +4,7 @@
 
 /datum/reagent/medicine/on_mob_life(mob/living/M)
 	current_cycle++
-	holder.remove_reagent(id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+	holder.remove_reagent(id, (metabolization_rate / M.metabolism_efficiency) * M.digestion_ratio) //medicine reagents stay longer if you have a better metabolism
 
 /datum/reagent/medicine/hydrocodone
 	name = "Hydrocodone"

code/modules/reagents/reagent_containers/borghydro.dm

@@ -84,8 +84,8 @@
 		if(M.reagents)
 			var/datum/reagent/injected = chemical_reagents_list[reagent_ids[mode]]
 			var/contained = injected.name
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [key_name(user)]. Reagents: [contained]</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to inject [key_name(M)]. Reagents: [contained]</font>")
+			M.create_attack_log("<font color='orange'>Has been injected with [name] by [key_name(user)]. Reagents: [contained]</font>")
+			user.create_attack_log("<font color='red'>Used the [name] to inject [key_name(M)]. Reagents: [contained]</font>")
 			if(M.ckey)
 				msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
 			M.LAssailant = user

code/modules/reagents/reagent_containers/dropper.dm

@@ -69,8 +69,8 @@
 			for(var/datum/reagent/R in reagents.reagent_list)
 				injected += R.name
 			var/contained = english_list(injected)
-			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [name] by [key_name(user)]. Reagents: [contained]</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to squirt [key_name(M)]. Reagents: [contained]</font>")
+			M.create_attack_log("<font color='orange'>Has been squirted with [name] by [key_name(user)]. Reagents: [contained]</font>")
+			user.create_attack_log("<font color='red'>Used the [name] to squirt [key_name(M)]. Reagents: [contained]</font>")
 			if(M.ckey)
 				msg_admin_attack("[key_name_admin(user)] squirted [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
 			if(!iscarbon(user))

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -78,8 +78,8 @@
 		for(var/datum/reagent/R in reagents.reagent_list)
 			injected += R.name
 		var/contained = english_list(injected)
-		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been splashed with [name] by [key_name(user)]. Reagents: [contained]</font>")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to splash [key_name(M)]. Reagents: [contained]</font>")
+		M.create_attack_log("<font color='orange'>Has been splashed with [name] by [key_name(user)]. Reagents: [contained]</font>")
+		user.create_attack_log("<font color='red'>Used the [name] to splash [key_name(M)]. Reagents: [contained]</font>")
 		if(M.ckey)
 			msg_admin_attack("[key_name_admin(user)] splashed [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
 		if(!iscarbon(user))

code/modules/reagents/reagent_containers/syringes.dm

@@ -196,8 +196,8 @@
 					for(var/datum/reagent/R in reagents.reagent_list)
 						injected += R.name
 					var/contained = english_list(injected)
-					M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [key_name(user)]. Reagents: [contained]</font>")
-					user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to inject [key_name(M)]. Reagents: [contained]</font>")
+					M.create_attack_log("<font color='orange'>Has been injected with [name] by [key_name(user)]. Reagents: [contained]</font>")
+					user.create_attack_log("<font color='red'>Used the [name] to inject [key_name(M)]. Reagents: [contained]</font>")
 					if(M.ckey)
 						msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
 					if(!iscarbon(user))

code/modules/recycling/conveyor2.dm

@@ -50,6 +50,10 @@
 		dir = newdir
 	update_move_direction()
 
+/obj/machinery/conveyor/set_dir(newdir)
+	. = ..()
+	update_move_direction()
+
 
 /obj/machinery/conveyor/proc/update_move_direction()
 	switch(dir)

code/modules/recycling/disposal.dm

@@ -132,8 +132,8 @@
 				for(var/mob/C in viewers(src))
 					C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
 				qdel(G)
-				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [key_name(GM)] in disposals.</font>")
-				GM.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been placed in disposals by [key_name(user)]</font>")
+				usr.create_attack_log("<font color='red'>Has placed [key_name(GM)] in disposals.</font>")
+				GM.create_attack_log("<font color='orange'>Has been placed in disposals by [key_name(user)]</font>")
 				if(GM.ckey)
 					msg_admin_attack("[key_name_admin(user)] placed [key_name_admin(GM)] in a disposals unit. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
 		return
@@ -180,8 +180,8 @@
 		msg = "[user.name] stuffs [target.name] into the [src]!"
 		to_chat(user, "You stuff [target.name] into the [src]!")
 
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has placed [key_name(target)] in disposals.</font>")
-		target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been placed in disposals by [key_name(user)]</font>")
+		user.create_attack_log("<font color='red'>Has placed [key_name(target)] in disposals.</font>")
+		target.create_attack_log("<font color='orange'>Has been placed in disposals by [key_name(user)]</font>")
 		if(target.ckey)
 			msg_admin_attack("[key_name_admin(user)] placed [key_name_admin(target)] in a disposals unit")
 	else

code/modules/recycling/sortingmachinery.dm

@@ -182,7 +182,7 @@
 		return
 
 	user.visible_message("<span class='notice'>[user] wraps [target].</span>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='blue'>Has used [name] on [target]</font>")
+	user.create_attack_log("<font color='blue'>Has used [name] on [target]</font>")
 
 	if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube
 		new /obj/item/weapon/c_tube( get_turf(user) )

code/modules/research/xenoarchaeology/tools/ano_device_battery.dm

@@ -210,6 +210,6 @@
 	M.lastattacker = user
 
 	if(inserted_battery.battery_effect)
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Tapped [key_name(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])</font>"
-		M.attack_log += "\[[time_stamp()]\]<font color='orange'> Tapped by [key_name(user)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])</font>"
+		user.create_attack_log("<font color='red'> Tapped [key_name(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])</font>")
+		M.create_attack_log("<font color='orange'> Tapped by [key_name(user)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])</font>")
 		msg_admin_attack("[key_name_admin(user)] tapped [key_name_admin(M)] with [name] (EFFECT: [inserted_battery.battery_effect.effecttype])" )

code/modules/research/xenobiology/xenobiology.dm

@@ -134,45 +134,42 @@
 	desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle19"
+	var/being_used = 0
 
 /obj/item/slimepotion/docility/attack(mob/living/carbon/slime/M, mob/user)
 	if(!isslime(M))
 		to_chat(user, "<span class='warning'> The potion only works on slimes!</span>")
-		return ..()
+		return
 	if(M.stat)
 		to_chat(user, "<span class='warning'> The slime is dead!</span>")
-		return..()
+		return
 	if(M.mind)
 		to_chat(user, "<span class='warning'> The slime resists!</span>")
-		return ..()
+		return
+	if(being_used)
+		to_chat(user, "<span class='warning'> You're already using this on another slime!</span>")
+		return
+
+	var/mob/living/simple_animal/slime/pet
 	if(M.is_adult)
-		var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
+		pet = new /mob/living/simple_animal/slime/adult(M.loc)
 		pet.icon_state = "[M.colour] adult slime"
 		pet.icon_living = "[M.colour] adult slime"
-		pet.icon_dead = "[M.colour] baby slime dead"
-		pet.colour = "[M.colour]"
-		qdel(M)
-		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
-
-		if(!newname)
-			newname = "pet slime"
-		pet.name = newname
-		pet.real_name = newname
-		qdel(src)
 	else
-		var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc)
+		pet = new /mob/living/simple_animal/slime(M.loc)
 		pet.icon_state = "[M.colour] baby slime"
 		pet.icon_living = "[M.colour] baby slime"
-		pet.icon_dead = "[M.colour] baby slime dead"
-		pet.colour = "[M.colour]"
-		qdel(M)
-		var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
+	pet.icon_dead = "[M.colour] baby slime dead"
+	pet.colour = "[M.colour]"
+	qdel(M)
+	being_used = 1
+	var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
 
-		if(!newname)
-			newname = "pet slime"
-		pet.name = newname
-		pet.real_name = newname
-		qdel(src)
+	if(!newname)
+		newname = "pet slime"
+	pet.name = newname
+	pet.real_name = newname
+	qdel(src)
 	to_chat(user, "You feed the slime the potion, removing it's powers and calming it.")
 
 /obj/item/slimepotion/sentience

code/modules/security_levels/security levels.dm

@@ -7,8 +7,8 @@
 //5 = code delta
 
 //config.alert_desc_blue_downto
-/var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/notice1.ogg'))
-/var/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1)
+/var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 0, new_sound = sound('sound/misc/notice1.ogg'))
+/var/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 0)
 
 /proc/set_security_level(var/level)
 	switch(level)

code/modules/shuttle/shuttle.dm

@@ -836,7 +836,7 @@ var/global/trade_dockrequest_timelimit = 0
 		if(world.time < trade_dockrequest_timelimit || world.time < trade_dock_timelimit)
 			return
 		to_chat(usr, "<span class='notice'>Request sent.</span>")
-		command_announcement.Announce(docking_request_message, "Docking Request")
+		event_announcement.Announce(docking_request_message, "Docking Request")
 		trade_dockrequest_timelimit = world.time + 1200 // They have 2 minutes to approve the request.
 
 /obj/machinery/computer/shuttle/trade/sol

code/modules/spacepods/spacepod.dm

@@ -213,7 +213,7 @@
 		var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
 		deal_damage(damage)
 		visible_message("<span class='danger'>[user]</span> [user.attacktext] [src]!")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name]</font>")
+		user.create_attack_log("<font color='red'>attacked [src.name]</font>")
 	return
 
 /obj/spacepod/attack_alien(mob/user as mob)

code/modules/surgery/organs/organ.dm

@@ -309,8 +309,8 @@ var/list/organ_cache = list()
 
 	if(owner && vital && is_primary_organ()) // I'd do another check for species or whatever so that you couldn't "kill" an IPC by removing a human head from them, but it doesn't matter since they'll come right back from the dead
 		if(user)
-			user.attack_log += "\[[time_stamp()]\]<font color='red'> removed a vital organ ([src]) from [key_name(owner)] (INTENT: [uppertext(user.a_intent)])</font>"
-			owner.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [key_name(user)] (INTENT: [uppertext(user.a_intent)])</font>"
+			user.create_attack_log("<font color='red'> removed a vital organ ([src]) from [key_name(owner)] (INTENT: [uppertext(user.a_intent)])</font>")
+			owner.create_attack_log("<font color='orange'> had a vital organ ([src]) removed by [key_name(user)] (INTENT: [uppertext(user.a_intent)])</font>")
 			msg_admin_attack("[key_name_admin(user)] removed a vital organ ([src]) from [key_name_admin(owner)]")
 		owner.death()
 	owner = null

code/modules/tram/tram.dm

@@ -255,7 +255,7 @@
 	if(prob(M.melee_damage_upper))
 		qdel(src)
 	src.visible_message("<span class='danger'>[M] has [M.attacktext] [src]!</span>")
-	M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name]</font>")
+	M.create_attack_log("<font color='red'>attacked [src.name]</font>")
 
 /obj/tram/bullet_act(var/obj/item/projectile/proj)
 	if(prob(proj.damage))