Merge remote-tracking branch 'upstream/master' into dryshoes

Conflicts:
	code/__DEFINES/misc.dm

code/modules/admin/admin.dm

@@ -810,19 +810,14 @@ var/global/floorIsLava = 0
 
 	return 1
 
-/client/proc/adminGreet()
+/client/proc/adminGreet(logout)
 	if(ticker && ticker.current_state == GAME_STATE_PLAYING)
-		var/string = pick(
-			"I welcome you to the server [key]!",
-			"Happy to see you [key]!",
-			"Ah, [key] logged, say hello!",
-			"The server welcomes you [key]!",
-			"Exceptional! [key] joined us, what an honour!",
-			"Another amazing day, because [key] logged, say hi!",
-			"Did anyone see? [key] logged, welcome!",
-			"Monday to sunday, the server warmly welcomes you [key]!",
-			"It's a pleasure to see you [key], greetings!",
-			"Not a bad day if [key] joins, welcome, welcome!",
-			"Surely it's nice to see you [key], have a heartly welcome!")
-			//I really do
-		message_admins("[string]")
+		var/string
+		if(logout && config && config.announce_admin_logout)
+			string = pick(
+				"Admin logout: [key_name(src)]")
+		else if(!logout && config && config.announce_admin_login && (prefs.toggles & ANNOUNCE_LOGIN))
+			string = pick(
+				"Admin login: [key_name(src)]")
+		if(string)
+			message_admins("[string]")

code/modules/admin/admin_verbs.dm

@@ -1,6 +1,7 @@
 //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
 var/list/admin_verbs_default = list(
 	/client/proc/toggleadminhelpsound,	/*toggles whether we hear a sound when adminhelps/PMs are used*/
+	/client/proc/toggleannouncelogin, /*toggles if an admin's login is announced during a round*/
 	/client/proc/deadmin_self,			/*destroys our own admin datum so we can play as a regular player*/
 	/client/proc/cmd_admin_say,			/*admin-only ooc chat*/
 	/client/proc/hide_verbs,			/*hides all our adminverbs*/

code/modules/admin/verbs/atmosdebug.dm

@@ -13,12 +13,12 @@
 
 	//Manifolds
 	for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world)
-		if (!pipe.node1 || !pipe.node2 || !pipe.node3)
+		if (!pipe.NODE1 || !pipe.NODE2 || !pipe.NODE3)
 			usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"
 
 	//Pipes
 	for (var/obj/machinery/atmospherics/pipe/simple/pipe in world)
-		if (!pipe.node1 || !pipe.node2)
+		if (!pipe.NODE1 || !pipe.NODE2)
 			usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"
 
 /client/proc/powerdebug()

code/modules/admin/verbs/debug.dm

@@ -120,7 +120,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 /client/proc/get_callproc_args()
 	var/argnum = input("Number of arguments","Number:",0) as num|null
 	if(!argnum && (argnum!=0))	return
-	
+
 	var/list/lst = list()
 	//TODO: make a list to store whether each argument was initialised as null.
 	//Reason: So we can abort the proccall if say, one of our arguments was a mob which no longer exists
@@ -1100,6 +1100,10 @@ var/global/list/g_fancy_list_of_types = null
 	for(var/path in SSgarbage.didntgc)
 		dat += "[path] - [SSgarbage.didntgc[path]] times<BR>"
 
+	dat += "<B>List of paths that did not return a qdel hint in Destroy()</B><BR><BR>"
+	for(var/path in SSgarbage.noqdelhint)
+		dat += "[path]<BR>"
+
 	usr << browse(dat, "window=dellog")
 
 
@@ -1127,7 +1131,7 @@ var/global/list/g_fancy_list_of_types = null
 	M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 
 	M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_in_backpack)
-	M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(M), slot_in_backpack)
+	M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack)
 	M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
 	M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
 

code/modules/assembly/flash.dm

@@ -0,0 +1,197 @@
+/obj/item/device/assembly/flash
+	name = "flash"
+	desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
+	icon_state = "flash"
+	item_state = "flashtool"
+	throwforce = 0
+	w_class = 1
+	origin_tech = "magnets=2;combat=1"
+
+	crit_fail = 0     //Is the flash burnt out?
+	var/times_used = 0 //Number of times it's been used.
+	var/last_used = 0 //last world.time it was used.
+
+
+/obj/item/device/assembly/flash/update_icon(var/flash = 0)
+	overlays.Cut()
+	attached_overlays = list()
+	if(crit_fail)
+		overlays += "flashburnt"
+		attached_overlays += "flashburnt"
+
+	if(flash)
+		overlays += "flash-f"
+		attached_overlays += "flash-f"
+		spawn(5)
+			update_icon()
+	if(holder)
+		holder.update_icon()
+
+/obj/item/device/assembly/flash/proc/clown_check(mob/living/carbon/human/user)
+	if(user.disabilities & CLUMSY && prob(50))
+		flash_carbon(user, user, 15, 0)
+		return 0
+	return 1
+
+/obj/item/device/assembly/flash/activate()
+	if(!try_use_flash())
+		return 0
+	var/turf/T = get_turf(src)
+	T.visible_message("<span class='disarm'>[src] emits a blinding light!</span>")
+	for(var/mob/living/carbon/M in viewers(3, null))
+		flash_carbon(M, null, 2, 0)
+
+
+/obj/item/device/assembly/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
+	crit_fail = 1
+	update_icon()
+	var/turf/T = get_turf(src)
+	T.visible_message("The [src.name] burns out!")
+
+
+/obj/item/device/assembly/flash/proc/flash_recharge(interval=10)
+	if(prob(times_used * 3)) //The more often it's used in a short span of time the more likely it will burn out
+		burn_out()
+		return 0
+
+	var/deciseconds_passed = world.time - last_used
+	for(var/seconds = deciseconds_passed/10, seconds>=interval, seconds-=interval) //get 1 charge every interval
+		times_used--
+
+	last_used = world.time
+	times_used = max(0, times_used) //sanity
+	return 1
+
+/obj/item/device/assembly/flash/proc/try_use_flash(mob/user = null)
+	flash_recharge(10)
+
+	if(crit_fail)
+		return 0
+
+	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
+	update_icon(1)
+	times_used++
+
+	if(user && !clown_check(user))
+		return 0
+
+	return 1
+
+
+/obj/item/device/assembly/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 5, targeted = 1)
+	add_logs(user, M, "flashed", src)
+	if(user && targeted)
+		if(M.weakeyes)
+			M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
+		if(M.flash_eyes(1, 1))
+			M.confused += power
+			terrible_conversion_proc(M, user)
+			M.Stun(1)
+			visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
+			user << "<span class='danger'>You blind [M] with the flash!</span>"
+			M << "<span class='userdanger'>[user] blinds you with the flash!</span>"
+			if(M.weakeyes)
+				M.Stun(2)
+				M.visible_message("<span class='disarm'>[M] gasps and shields their eyes!</span>", "<span class='userdanger'>You gasp and shields your eyes!</span>")
+		else
+			visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
+			user << "<span class='warning'>You fail to blind [M] with the flash!</span>"
+			M << "<span class='danger'>[user] fails to blind you with the flash!</span>"
+	else
+		if(M.flash_eyes())
+			M.confused += power
+
+/obj/item/device/assembly/flash/attack(mob/living/M, mob/user)
+	if(!try_use_flash(user))
+		return 0
+
+	if(iscarbon(M))
+		flash_carbon(M, user, 5, 1)
+		return 1
+
+	else if(issilicon(M))
+		add_logs(user, M, "flashed", src)
+		update_icon(1)
+		M.Weaken(rand(5,10))
+		user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the flash!</span>", "<span class='danger'>You overload [M]'s sensors with the flash!</span>")
+		return 1
+
+	user.visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>", "<span class='warning'>You fail to blind [M] with the flash!</span>")
+
+
+/obj/item/device/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
+	if(holder)
+		return 0
+	if(!try_use_flash(user))
+		return 0
+	user.visible_message("<span class='disarm'>[user]'s flash emits a blinding light!</span>", "<span class='danger'>Your flash emits a blinding light!</span>")
+	for(var/mob/living/carbon/M in oviewers(3, null))
+		flash_carbon(M, user, 1, 0)
+
+
+/obj/item/device/assembly/flash/emp_act(severity)
+	if(!try_use_flash())
+		return 0
+	for(var/mob/living/carbon/M in viewers(3, null))
+		flash_carbon(M, null, 10, 0)
+	burn_out()
+	..()
+
+
+/obj/item/device/assembly/flash/proc/terrible_conversion_proc(mob/M, mob/user)
+	if(ishuman(M) && ishuman(user) && M.stat != DEAD)
+		if(user.mind && (user.mind in ticker.mode.head_revolutionaries))
+			if(M.client)
+				if(M.stat == CONSCIOUS)
+					M.mind_initialize() //give them a mind datum if they don't have one.
+					var/resisted
+					if(!isloyal(M))
+						if(user.mind in ticker.mode.head_revolutionaries)
+							if(ticker.mode.add_revolutionary(M.mind))
+								times_used -- //Flashes less likely to burn out for headrevs when used for conversion
+							else
+								resisted = 1
+					else
+						resisted = 1
+
+					if(resisted)
+						user << "<span class='warning'>This mind seems resistant to the flash!</span>"
+				else
+					user << "<span class='warning'>They must be conscious before you can convert them!</span>"
+			else
+				user << "<span class='warning'>This mind is so vacant that it is not susceptible to influence!</span>"
+
+
+/obj/item/device/assembly/flash/cyborg
+	origin_tech = null
+
+/obj/item/device/assembly/flash/cyborg/attack(mob/living/M, mob/user)
+	..()
+	cyborg_flash_animation(user)
+
+/obj/item/device/assembly/flash/cyborg/attack_self(mob/user)
+	..()
+	cyborg_flash_animation(user)
+
+/obj/item/device/assembly/flash/cyborg/attackby(obj/item/weapon/W, mob/user, params)
+	return
+
+/obj/item/device/assembly/flash/cyborg/proc/cyborg_flash_animation(mob/living/user)
+	var/atom/movable/overlay/animation = new(user.loc)
+	animation.layer = user.layer + 1
+	animation.icon_state = "blank"
+	animation.icon = 'icons/mob/mob.dmi'
+	animation.master = user
+	flick("blspell", animation)
+	sleep(5)
+	qdel(animation)
+
+
+/obj/item/device/assembly/flash/memorizer
+	name = "memorizer"
+	desc = "If you see this, you're not likely to remember it any time soon."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "memorizer"
+	item_state = "nullrod"
+
+/obj/item/device/assembly/flash/handheld //this is now the regular pocket flashes

code/modules/assembly/health.dm

@@ -0,0 +1,105 @@
+/obj/item/device/assembly/health
+	name = "health sensor"
+	desc = "Used for scanning and monitoring health."
+	icon_state = "health"
+	materials = list(MAT_METAL=800, MAT_GLASS=200)
+	origin_tech = "magnets=1;biotech=1"
+	attachable = 1
+	secured = 0
+
+	var/scanning = 0
+	var/health_scan
+	var/alarm_health = 0
+
+
+
+/obj/item/device/assembly/health/activate()
+	if(!..())	return 0//Cooldown check
+	toggle_scan()
+	return 0
+
+/obj/item/device/assembly/health/toggle_secure()
+	secured = !secured
+	if(secured && scanning)
+		SSobj.processing |= src
+	else
+		scanning = 0
+		SSobj.processing.Remove(src)
+	update_icon()
+	return secured
+
+/obj/item/device/assembly/health/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/device/multitool))
+		if(alarm_health == 0)
+			alarm_health = -90
+			user.show_message("You toggle [src] to \"detect death\" mode.")
+		else
+			alarm_health = 0
+			user.show_message("You toggle [src] to \"detect critical state\" mode.")
+		return
+	else
+		return ..()
+
+/obj/item/device/assembly/health/process()
+	if(!scanning || !secured)
+		return
+
+	var/atom/A = src
+	if(connected && connected.holder)
+		A = connected.holder
+
+	for(A, A && !ismob(A), A=A.loc);
+	// like get_turf(), but for mobs.
+	var/mob/living/M = A
+
+	if(M)
+		health_scan = M.health
+		if(health_scan <= alarm_health)
+			pulse()
+			audible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
+			toggle_scan()
+		return
+	return
+
+/obj/item/device/assembly/health/proc/toggle_scan()
+	if(!secured)	return 0
+	scanning = !scanning
+	if(scanning)
+		SSobj.processing |= src
+	else
+		SSobj.processing.Remove(src)
+	return
+
+/obj/item/device/assembly/health/interact(mob/user as mob)//TODO: Change this to the wires thingy
+	if(!secured)
+		user.show_message("<span class='warning'>The [name] is unsecured!</span>")
+		return 0
+	var/dat = text("<TT><B>Health Sensor</B> <A href='?src=\ref[src];scanning=1'>[scanning?"On":"Off"]</A>")
+	if(scanning && health_scan)
+		dat += "<BR>Health: [health_scan]"
+	user << browse(dat, "window=hscan")
+	onclose(user, "hscan")
+	return
+
+
+/obj/item/device/assembly/health/Topic(href, href_list)
+	..()
+	if(!ismob(usr))
+		return
+
+	var/mob/user = usr
+
+	if(!user.canUseTopic(user))
+		usr << browse(null, "window=hscan")
+		onclose(usr, "hscan")
+		return
+
+	if(href_list["scanning"])
+		toggle_scan()
+
+	if(href_list["close"])
+		usr << browse(null, "window=hscan")
+		return
+
+	attack_self(user)
+	return

code/modules/assembly/holder.dm

@@ -21,7 +21,7 @@
 	attach(A2,user)
 	name = "[A.name]-[A2.name] assembly"
 	update_icon()
-	feedback_add_details("assembly_made","[type]")
+	feedback_add_details("assembly_made","[A.name]-[A2.name]")
 
 /obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
 	if(!A.remove_item_from_storage(src))
@@ -41,10 +41,17 @@
 		overlays += "[a_left.icon_state]_left"
 		for(var/O in a_left.attached_overlays)
 			overlays += "[O]_l"
+
 	if(a_right)
-		src.overlays += "[a_right.icon_state]_right"
+		var/list/images = list()
+		images += image(icon, icon_state = "[a_right.icon_state]_left")
 		for(var/O in a_right.attached_overlays)
-			overlays += "[O]_r"
+			images += image(icon, icon_state = "[O]_l")
+		var/matrix = matrix(-1, 0, 0, 0, 1, 0)
+		for(var/image/I in images)
+			I.transform = matrix
+			overlays += I
+
 	if(master)
 		master.update_icon()
 

code/modules/assembly/mousetrap.dm

@@ -4,6 +4,7 @@
 	icon_state = "mousetrap"
 	materials = list(MAT_METAL=100)
 	origin_tech = "combat=1"
+	attachable = 1
 	var/armed = 0
 
 

code/modules/client/client procs.dm

@@ -184,6 +184,7 @@ var/next_external_rsc = 0
 	//////////////
 /client/Del()
 	if(holder)
+		adminGreet(1)
 		holder.owner = null
 		admins -= src
 	directory -= ckey
@@ -323,20 +324,6 @@ var/next_external_rsc = 0
 		'icons/pda_icons/pda_scanner.png',
 		'icons/pda_icons/pda_signaler.png',
 		'icons/pda_icons/pda_status.png',
-		'icons/spideros_icons/sos_1.png',
-		'icons/spideros_icons/sos_2.png',
-		'icons/spideros_icons/sos_3.png',
-		'icons/spideros_icons/sos_4.png',
-		'icons/spideros_icons/sos_5.png',
-		'icons/spideros_icons/sos_6.png',
-		'icons/spideros_icons/sos_7.png',
-		'icons/spideros_icons/sos_8.png',
-		'icons/spideros_icons/sos_9.png',
-		'icons/spideros_icons/sos_10.png',
-		'icons/spideros_icons/sos_11.png',
-		'icons/spideros_icons/sos_12.png',
-		'icons/spideros_icons/sos_13.png',
-		'icons/spideros_icons/sos_14.png',
 		'icons/stamp_icons/large_stamp-clown.png',
 		'icons/stamp_icons/large_stamp-deny.png',
 		'icons/stamp_icons/large_stamp-ok.png',

code/modules/client/preferences.dm

@@ -345,8 +345,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 
 				if(user.client)
 					if(user.client.holder)
-						dat += "<b>Adminhelp Sound:</b> "
-						dat += "<a href='?_src_=prefs;preference=hear_adminhelps'>[(toggles & SOUND_ADMINHELP)?"On":"Off"]</a><br>"
+						dat += "<b>Adminhelp Sound:</b> <a href='?_src_=prefs;preference=hear_adminhelps'>[(toggles & SOUND_ADMINHELP)?"On":"Off"]</a><br>"
+						dat += "<b>Announce Login:</b> <a href='?_src_=prefs;preference=announce_login'>[(toggles & ANNOUNCE_LOGIN)?"On":"Off"]</a><br>"
 
 					if(unlock_content || check_rights_for(user.client, R_ADMIN))
 						dat += "<b>OOC:</b> <span style='border: 1px solid #161616; background-color: [ooccolor ? ooccolor : normal_ooc_colour];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ooccolor;task=input'>Change</a><br>"
@@ -955,6 +955,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 
 					if("hear_adminhelps")
 						toggles ^= SOUND_ADMINHELP
+					if("announce_login")
+						toggles ^= ANNOUNCE_LOGIN
 
 					if("ui")
 						switch(UI_style)

code/modules/client/preferences_toggles.dm

@@ -64,6 +64,16 @@
 	usr << "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive."
 	feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/toggleannouncelogin()
+	set name = "Do/Don't Announce Login"
+	set category = "Preferences"
+	set desc = "Toggle if you want an announcement to admins when you login during a round"
+	if(!holder)	return
+	prefs.toggles ^= ANNOUNCE_LOGIN
+	prefs.save_preferences()
+	usr << "You will [(prefs.toggles & ANNOUNCE_LOGIN) ? "now" : "no longer"] have an announcement to other admins when you login."
+	feedback_add_details("admin_verb","TAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/proc/deadchat()
 	set name = "Show/Hide Deadchat"
 	set category = "Preferences"

code/modules/clothing/clothing.dm

@@ -149,6 +149,13 @@ BLIND     // can't see anything
 
 	permeability_coefficient = 0.50
 	slowdown = SHOES_SLOWDOWN
+	var/blood_state = BLOOD_STATE_NOT_BLOODY
+	var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+
+/obj/item/clothing/shoes/clean_blood()
+	..()
+	bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+	blood_state = BLOOD_STATE_NOT_BLOODY
 
 /obj/item/proc/negates_gravity()
 	return 0

code/modules/clothing/head/helmet.dm

@@ -81,7 +81,7 @@
 	can_toggle = 1
 	toggle_cooldown = 20
 	active_sound = 'sound/items/WEEOO1.ogg'
-	
+
 /obj/item/clothing/head/helmet/justice/escape
 	name = "alarm helmet"
 	desc = "WEEEEOOO. WEEEEEOOO. STOP THAT MONKEY. WEEEOOOO."

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -40,7 +40,7 @@ Contains:
 	desc = "That's not red paint. That's real blood."
 	icon_state = "deathsquad"
 	item_state = "deathsquad"
-	armor = list(melee = 50, bullet = 40, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	unacidable = 1
@@ -55,7 +55,7 @@ Contains:
 	icon_state = "deathsquad"
 	item_state = "swat_suit"
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
-	armor = list(melee = 50, bullet = 40, laser = 30,energy = 50, bomb = 50, bio = 100, rad = 100)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	slowdown = 1
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
@@ -68,7 +68,7 @@ Contains:
 	icon_state = "beret_badge"
 	flags = STOPSPRESSUREDMAGE
 	flags_inv = 0
-	armor = list(melee = 50, bullet = 40, laser = 30, energy = 50, bomb = 50, bio = 100, rad = 100)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
 	unacidable = 1
@@ -83,7 +83,7 @@ Contains:
 	flags_inv = 0
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
-	armor = list(melee = 50, bullet = 40, laser = 30,energy = 50, bomb = 50, bio = 100, rad = 100)
+	armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
 	slowdown = 1
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT

code/modules/clothing/suits/jobs.dm

@@ -20,7 +20,7 @@
 	item_state = "bio_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
-	allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/internals/emergency_oxygen)
+	allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/assembly/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/internals/emergency_oxygen)
 
 //Chaplain
 /obj/item/clothing/suit/hooded/chaplain_hoodie

code/modules/detectivework/footprints_and_rag.dm

@@ -28,6 +28,9 @@
 			reagents.reaction(C, INGEST)
 			reagents.trans_to(C, reagents.total_volume)
 			C.visible_message("<span class='danger'>[user] has smothered \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] has smothered you with \the [src]!</span>", "<span class='italics'>You hear some struggling and muffled cries of surprise.</span>")
+			var/reagentlist = pretty_string_from_reagent_list(A.reagents)
+			log_game("[key_name(user)] smothered [key_name(A)] with a damp rag containing [reagentlist]")
+			log_attack("[key_name(user)] smothered [key_name(A)] with a damp rag containing [reagentlist]")
 		else
 			reagents.reaction(C, TOUCH)
 			reagents.clear_reagents()

code/modules/hydroponics/seeds.dm

@@ -1339,21 +1339,29 @@
 	if(parent)
 		mutations = parent.mutations
 
+/obj/item/seeds/kudzuseed/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..</span>")
+	plant(user)
+	return (BRUTELOSS)
+
 /obj/item/seeds/kudzuseed/harvest()
 	var/list/prod = ..()
 	for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod)
 		K.mutations = mutations
 
-/obj/item/seeds/kudzuseed/attack_self(mob/user)
+/obj/item/seeds/kudzuseed/proc/plant(mob/user)
 	if(istype(user.loc,/turf/space))
 		return
 	var/turf/T = get_turf(src)
-	user << "<span class='notice'>You plant the kudzu. You monster.</span>"
 	message_admins("Kudzu planted by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) at ([T.x],[T.y],[T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a>)",0,1)
 	investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu")
 	new /obj/effect/spacevine_controller(user.loc, mutations, potency, production)
 	qdel(src)
 
+/obj/item/seeds/kudzuseed/attack_self(mob/user)
+	plant(user)
+	user << "<span class='notice'>You plant the kudzu. You monster.</span>"
+
 /obj/item/seeds/kudzuseed/get_analyzer_text()
 	var/list/mut_text = list()
 	var/text_string = ""

code/modules/mining/mine_turfs.dm

@@ -602,16 +602,11 @@ var/global/list/rockTurfEdgeCache
 	icon_state = "asteroid_dug"
 	return
 
+/turf/simulated/floor/plating/asteroid/singularity_act()
+	return
+
 /turf/simulated/floor/plating/asteroid/singularity_pull(S, current_size)
-	if(current_size == STAGE_THREE)
-		if(prob(30))
-			gets_dug()
-	else if(current_size == STAGE_FOUR)
-		if(prob(50))
-			gets_dug()
-	else if(current_size >= STAGE_FIVE)
-		if(prob(90))
-			gets_dug()
+	return
 
 /turf/proc/updateMineralOverlays()
 	src.overlays.Cut()

code/modules/mining/ores_coins.dm

@@ -136,7 +136,7 @@
 		return
 
 	if(wires && !primed)
-		if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler))
+		if(wires.IsInteractionTool(I))
 			wires.Interact(user)
 			return
 

code/modules/mob/living/bloodcrawl.dm

@@ -1,94 +1,6 @@
-//Travel through pools of blood. Slaughter Demon powers for everyone!
-
 #define BLOODCRAWL 1
 #define BLOODCRAWL_EAT 2
 
-/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
-	var/mob/living/kidnapped = null
-	var/turf/mobloc = get_turf(src.loc)
-	var/turf/bloodloc = get_turf(B.loc)
-	if(Adjacent(bloodloc))
-		src.notransform = TRUE
-		spawn(0)
-			src.visible_message("[src] sinks into the pool of blood.")
-			playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
-			var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,mobloc)
-			src.ExtinguishMob()
-			if(src.buckled)
-				src.buckled.unbuckle_mob()
-			if(src.pulling && src.bloodcrawl == BLOODCRAWL_EAT)
-				if(istype(src.pulling, /mob/living))
-					var/mob/living/victim = src.pulling
-					if(victim.stat == CONSCIOUS)
-						src.visible_message("[victim] kicks free of the [src] at the last second!")
-					else
-						victim.loc = holder
-						src.visible_message("<span class='warning'><B>The [src] drags [victim] into the pool of blood!</B>")
-						kidnapped = victim
-			src.loc = holder
-			src.holder = holder
-			if(kidnapped)
-				src << "<B>You begin to feast on [kidnapped]. You can not move while you are doing this.</B>"
-				playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
-				sleep(30)
-				playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
-				sleep(30)
-				playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
-				sleep(30)
-				if(kidnapped)
-					src << "<B>You devour [kidnapped]. Your health is fully restored.</B>"
-					src.adjustBruteLoss(-1000)
-					src.adjustFireLoss(-1000)
-					src.adjustOxyLoss(-1000)
-					src.adjustToxLoss(-1000)
-					kidnapped.ghostize()
-					qdel(kidnapped)
-				else
-					src << "<B>You happily devour...nothing? Your meal vanished at some point!</B>"	
-			src.notransform = 0
-
-/mob/living/proc/phasein(obj/effect/decal/cleanable/B)
-	if(src.notransform)
-		src << "<B>Finish eating first!</B>"
-	else
-		src.loc = B.loc
-		src.client.eye = src
-		src.visible_message("<span class='warning'><B>The [src] rises out of the pool of blood!</B>")
-		playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
-		qdel(src.holder)
-		src.holder = null
-
-/obj/effect/decal/cleanable/blood/CtrlClick(mob/living/user)
-	..()
-	if(user.bloodcrawl)
-		if(user.holder)
-			user.phasein(src)
-		else
-			user.phaseout(src)
-
-
-/obj/effect/decal/cleanable/trail_holder/CtrlClick(mob/living/user)
-	..()
-	if(user.bloodcrawl)
-		if(user.holder)
-			user.phasein(src)
-		else
-			user.phaseout(src)
-
-
-
-/turf/CtrlClick(var/mob/living/user)
-	..()
-	if(user.bloodcrawl)
-		for(var/obj/effect/decal/cleanable/B in src.contents)
-			if(istype(B, /obj/effect/decal/cleanable/blood) || istype(B, /obj/effect/decal/cleanable/trail_holder))
-				if(user.holder)
-					user.phasein(B)
-					break
-				else
-					user.phaseout(B)
-					break
-
 /obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow
 	name = "water"
 	icon = 'icons/effects/effects.dmi'
@@ -116,3 +28,59 @@ obj/effect/dummy/slaughter/relaymove(mob/user, direction)
 
 /obj/effect/dummy/slaughter/Destroy()
 	return QDEL_HINT_PUTINPOOL
+
+
+/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
+	var/mob/living/kidnapped = null
+	var/turf/mobloc = get_turf(src.loc)
+	src.notransform = TRUE
+	spawn(0)
+		src.visible_message("[src] sinks into the pool of blood.")
+		playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
+		var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,mobloc)
+		src.ExtinguishMob()
+		if(src.buckled)
+			src.buckled.unbuckle_mob()
+		if(src.pulling && src.bloodcrawl == BLOODCRAWL_EAT)
+			if(istype(src.pulling, /mob/living))
+				var/mob/living/victim = src.pulling
+				if(victim.stat == CONSCIOUS)
+					src.visible_message("[victim] kicks free of the [src] at the last second!")
+				else
+					victim.loc = holder
+					src.visible_message("<span class='warning'><B>The [src] drags [victim] into the pool of blood!</B>")
+					kidnapped = victim
+		src.loc = holder
+		src.holder = holder
+		if(kidnapped)
+			src << "<B>You begin to feast on [kidnapped]. You can not move while you are doing this.</B>"
+			playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+			sleep(30)
+			playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+			sleep(30)
+			playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
+			sleep(30)
+			if(kidnapped)
+				src << "<B>You devour [kidnapped]. Your health is fully restored.</B>"
+				src.adjustBruteLoss(-1000)
+				src.adjustFireLoss(-1000)
+				src.adjustOxyLoss(-1000)
+				src.adjustToxLoss(-1000)
+				kidnapped.ghostize()
+				qdel(kidnapped)
+			else
+				src << "<B>You happily devour...nothing? Your meal vanished at some point!</B>"
+		src.notransform = 0
+
+/mob/living/proc/phasein(obj/effect/decal/cleanable/B)
+	if(src.notransform)
+		src << "<B>Finish eating first!</B>"
+		return 0
+
+	src.loc = B.loc
+	src.client.eye = src
+	src.visible_message("<span class='warning'><B>The [src] rises out of the pool of blood!</B>")
+	playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
+	qdel(src.holder)
+	src.holder = null
+	return 1

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

@@ -579,4 +579,7 @@ var/const/GALOSHES_DONT_HELP = 4
 		var/obj/item/organ/internal/alien/plasmavessel/vessel = getorgan(/obj/item/organ/internal/alien/plasmavessel)
 		if(vessel)
 			stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
+		if(locate(/obj/item/device/assembly/health) in src)
+			stat(null, "Health: [health]")
+
 	add_abilities_to_panel()

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

@@ -55,5 +55,23 @@
 				if(!has_gravity(loc))
 					return
 				var/obj/item/clothing/shoes/S = shoes
+
+				//Bloody footprints
+				var/turf/T = get_turf(src)
+				if(S.bloody_shoes && S.bloody_shoes[S.blood_state])
+					var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T
+					if(oldFP && oldFP.blood_state == S.blood_state)
+						return
+					else
+						//No oldFP or it's a different kind of blood
+						S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state]-BLOOD_LOSS_PER_STEP)
+						var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
+						FP.blood_state = S.blood_state
+						FP.entered_dirs |= dir
+						FP.bloodiness = S.bloody_shoes[S.blood_state]
+						FP.update_icon()
+						update_inv_shoes()
+				//End bloody footprints
+
 				S.step_action()
 

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

@@ -8,7 +8,7 @@
 
 #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
 #define HEAT_DAMAGE_LEVEL_2 3 //Amount of damage applied when your body temperature passes the 400K point
-#define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 460K point and you are on fire
+#define HEAT_DAMAGE_LEVEL_3 10 //Amount of damage applied when your body temperature passes the 460K point and you are on fire
 
 #define COLD_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when your body temperature just passes the 260.15k safety point
 #define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
@@ -123,7 +123,7 @@
 		if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT)
 			bodytemperature += 11
 		else
-			bodytemperature += BODYTEMP_HEATING_MAX
+			bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12))
 
 
 /mob/living/carbon/human/IgniteMob()

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

@@ -362,7 +362,15 @@ Please contact me on #coderbus IRC. ~Carnie x
 			standing = image("icon"='icons/mob/feet.dmi', "icon_state"="[shoes.icon_state]", "layer"=-layer2use)
 		overlays_standing[SHOES_LAYER]	= standing
 
+		//Bloody shoes
+		var/obj/item/clothing/shoes/S = shoes
+		var/bloody = 0
 		if(shoes.blood_DNA)
+			bloody = 1
+		else
+			bloody = S.bloody_shoes[BLOOD_STATE_HUMAN]
+
+		if(bloody)
 			standing.overlays	+= image("icon"='icons/effects/blood.dmi', "icon_state"="shoeblood")
 
 	apply_overlay(SHOES_LAYER)

code/modules/mob/living/living_defense.dm

@@ -133,7 +133,7 @@
 	if(!on_fire)
 		return 1
 	if(fire_stacks > 0)
-		adjust_fire_stacks(-0.2) //the fire is slowly consumed
+		adjust_fire_stacks(-0.1) //the fire is slowly consumed
 	else
 		ExtinguishMob()
 		return
@@ -145,7 +145,7 @@
 	location.hotspot_expose(700, 50, 1)
 
 /mob/living/fire_act()
-	adjust_fire_stacks(0.5)
+	adjust_fire_stacks(3)
 	IgniteMob()
 
 

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

@@ -473,7 +473,7 @@
 			user << "<span class='notice'>You insert the power cell.</span>"
 		update_icons()
 
-	else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool) || istype(W, /obj/item/device/assembly/signaler))
+	else if (wires.IsInteractionTool(W))
 		if (wiresexposed)
 			wires.Interact(user)
 		else
@@ -1084,7 +1084,7 @@
 		new /obj/item/robot_parts/head(T)
 		var/b
 		for(b=0, b!=2, b++)
-			var/obj/item/device/flash/handheld/F = new /obj/item/device/flash/handheld(T)
+			var/obj/item/device/assembly/flash/handheld/F = new /obj/item/device/assembly/flash/handheld(T)
 			F.burn_out()
 	if (cell) //Sanity check.
 		cell.loc = T

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -40,7 +40,7 @@
 
 
 /obj/item/weapon/robot_module/New()
-	modules += new /obj/item/device/flash/cyborg(src)
+	modules += new /obj/item/device/assembly/flash/cyborg(src)
 	emag = new /obj/item/toy/sword(src)
 	emag.name = "Placeholder Emag Item"
 	return

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

@@ -538,7 +538,7 @@
 					dir = i
 					sleep(1)
 
-/mob/living/simple_animal/pet/pug/Life()
+/mob/living/simple_animal/pet/dog/pug/Life()
 	..()
 
 	if(!stat && !resting && !buckled)

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

@@ -114,6 +114,7 @@
 	set category = "Guardian"
 	set desc = "Communicate telepathically with your summoner."
 	var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
+	if(!input) return
 
 	for(var/mob/M in mob_list)
 		if(M == src.summoner || (M in dead_mob_list))
@@ -125,6 +126,7 @@
 	set category = "Guardian"
 	set desc = "Communicate telepathically with your guardian."
 	var/input = stripped_input(src, "Please enter a message to tell your guardian.", "Message", "")
+	if(!input) return
 
 	for(var/mob/M in mob_list)
 		if(istype (M, /mob/living/simple_animal/hostile/guardian))

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

@@ -155,7 +155,7 @@
 		busy = SPINNING_WEB
 		src.visible_message("<span class='notice'>\the [src] begins to secrete a sticky substance.</span>")
 		stop_automated_movement = 1
-		spawn(40)
+		if(do_after(src, 40, target = T))
 			if(busy == SPINNING_WEB && src.loc == T)
 				new /obj/effect/spider/stickyweb(T)
 			busy = 0
@@ -186,7 +186,7 @@
 		src.visible_message("<span class='notice'>\the [src] begins to secrete a sticky substance around \the [cocoon_target].</span>")
 		stop_automated_movement = 1
 		walk(src,0)
-		spawn(50)
+		if(do_after(src, 50, target = src))
 			if(busy == SPINNING_COCOON)
 				if(cocoon_target && istype(cocoon_target.loc, /turf) && get_dist(src,cocoon_target) <= 1)
 					var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
@@ -236,7 +236,7 @@
 		busy = LAYING_EGGS
 		src.visible_message("<span class='notice'>\the [src] begins to lay a cluster of eggs.</span>")
 		stop_automated_movement = 1
-		spawn(50)
+		if(do_after(src, 50, target = src.loc))
 			if(busy == LAYING_EGGS)
 				E = locate() in get_turf(src)
 				if(!E)

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

@@ -36,6 +36,13 @@
 						Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. \
 						You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. </B>"
 
+/mob/living/simple_animal/slaughter/New()
+	..()
+	var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
+	AddSpell(bloodspell)
+	if(istype(loc, /obj/effect/dummy/slaughter))
+		bloodspell.phased = 1
+
 /mob/living/simple_animal/slaughter/Life()
 	..()
 	if(boost<world.time)
@@ -55,7 +62,7 @@
 
 
 /mob/living/simple_animal/slaughter/phasein()
-	..()
+	. = ..()
 	speed = 0
 	boost = world.time + 30
 
@@ -71,7 +78,12 @@
 
 /obj/item/weapon/demonheart/attack_self(mob/living/user)
 	visible_message("[user] feasts upon the [src].")
+	for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
+		if(knownspell.type == /obj/effect/proc_holder/spell/bloodcrawl)
+			user <<"<span class='notice'>You already know how to blood crawl.</span>"
+			qdel(src)
+			return
 	user << "You absorb some of the demon's power!"
-	user.bloodcrawl = BLOODCRAWL
+	user.mind.AddSpell(new /obj/effect/proc_holder/spell/bloodcrawl)
 	qdel(src)
 

code/modules/mob/living/ventcrawling.dm

@@ -37,7 +37,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary
 
 
 	if(vent_found)
-		var/datum/pipeline/vent_found_parent = vent_found.parents[PARENT1]
+		var/datum/pipeline/vent_found_parent = vent_found.PARENT1
 		if(vent_found_parent && (vent_found_parent.members.len || vent_found_parent.other_atmosmch))
 			visible_message("<span class='notice'>[src] begins climbing into the ventilation system...</span>" ,"<span class='notice'>You begin climbing into the ventilation system...</span>")
 
@@ -70,7 +70,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary
 	if(!istype(starting_machine) || !starting_machine.returnPipenet())
 		return
 	var/list/totalMembers = list()
-	var/datum/pipeline/starting_machine_parent = starting_machine.parents[PARENT1]
+	var/datum/pipeline/starting_machine_parent = starting_machine.PARENT1
 	totalMembers += starting_machine_parent.members
 	totalMembers += starting_machine_parent.other_atmosmch
 

code/modules/mob/logout.dm

@@ -5,8 +5,6 @@
 	if(admin_datums[src.ckey])
 		if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
 			var/admins_number = admins.len
-
-			message_admins("Admin logout: [key_name(src)]")
 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
 				var/cheesy_message = pick( list(  \
 					"I have no admins online!",\

code/modules/mob/new_player/new_player.dm

@@ -318,7 +318,7 @@
 		if(SHUTTLE_ESCAPE)
 			dat += "<div class='notice red'>The station has been evacuated.</div><br>"
 		if(SHUTTLE_CALL)
-			if(SSshuttle.emergency.timeLeft() < 0.5 * initial(SSshuttle.emergencyCallTime)) //Shuttle is past the point of no recall
+			if(!SSshuttle.canRecall())
 				dat += "<div class='notice red'>The station is currently undergoing evacuation procedures.</div><br>"
 
 	var/available_job_count = 0

code/modules/paperwork/paper.dm

@@ -82,6 +82,9 @@
 		name = "paper[(n_name ? text("- '[n_name]'") : null)]"
 	add_fingerprint(usr)
 
+/obj/item/weapon/paper/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] scratches a grid on their wrist with the paper! It looks like \he's trying to commit sudoku..</span>")
+	return (BRUTELOSS)
 
 /obj/item/weapon/paper/attack_self(mob/user)
 	user.examinate(src)

code/modules/power/apc.dm

@@ -570,9 +570,7 @@
 		else
 			if (istype(user, /mob/living/silicon))
 				return src.attack_hand(user)
-			if (!opened && wiresexposed && \
-				(istype(W, /obj/item/device/multitool) || \
-				istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/assembly/signaler)))
+			if (!opened && wiresexposed && wires.IsInteractionTool(W))
 				return src.attack_hand(user)
 			..()
 

code/modules/power/cable.dm

@@ -466,6 +466,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
 	icon = 'icons/obj/power.dmi'
 	icon_state = "coil_red"
 	item_state = "coil_red"
+	max_amount = MAXCOIL
 	amount = MAXCOIL
 	item_color = "red"
 	desc = "A coil of power cable."
@@ -539,44 +540,16 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
 		icon_state = "coil_[item_color]"
 		name = "cable coil"
 
-
-// Items usable on a cable coil :
-//   - Cable coil : merge cables
-/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user, params)
-	..()
-	if(istype(W, /obj/item/stack/cable_coil/cyborg))
-		var/obj/item/stack/cable_coil/cyborg/C = W
-		var/to_transfer = min(src.amount, round((C.source.max_energy - C.source.energy) / C.cost))
-		C.add(to_transfer)
-		src.use(to_transfer)
-	else if(istype(W, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = W
-		if(C.amount >= MAXCOIL)
-			user << "<span class='warning'>The coil is too long, you cannot add any more cable to it!</span>"
-			return
-
-		if( (C.amount + src.amount <= MAXCOIL) )
-			user << "<span class='notice'>You join the cable coils together.</span>"
-			C.give(src.amount) // give it cable
-			src.use(src.amount) // make sure this one cleans up right
-			return
-
-		else
-			var/amt = MAXCOIL - C.amount
-			user << "<span class='notice'>You transfer [amt] length\s of cable from one coil to the other.</span>"
-			C.give(amt)
-			src.use(amt)
-			return
-
-/obj/item/stack/cable_coil/use(used)
-	. = ..()
-	update_icon()
-	return
+/obj/item/stack/cable_coil/attack_hand(mob/user)
+	var/obj/item/stack/cable_coil/new_cable = ..()
+	if(istype(new_cable))
+		new_cable.item_color = item_color
+		new_cable.update_icon()
 
 //add cables to the stack
 /obj/item/stack/cable_coil/proc/give(extra)
-	if(amount + extra > MAXCOIL)
-		amount = MAXCOIL
+	if(amount + extra > max_amount)
+		amount = max_amount
 	else
 		amount += extra
 	update_icon()

code/modules/power/cell.dm

@@ -165,9 +165,9 @@
 	..()
 	charge = 0
 
-/obj/item/weapon/stock_parts/cell/pulse //80 pulse shots
+/obj/item/weapon/stock_parts/cell/pulse //200 pulse shots
 	name = "pulse rifle power cell"
-	maxcharge = 16000
+	maxcharge = 40000
 	rating = 3
 	chargerate = 1500
 

code/modules/power/generator.dm

@@ -106,11 +106,11 @@
 		// update icon overlays only if displayed level has changed
 
 		if(hot_air)
-			var/datum/gas_mixture/circ2_air1 = circ2.airs["a1"]
+			var/datum/gas_mixture/circ2_air1 = circ2.AIR1
 			circ2_air1.merge(hot_air)
 
 		if(cold_air)
-			var/datum/gas_mixture/circ1_air1 = circ1.airs["a1"]
+			var/datum/gas_mixture/circ1_air1 = circ1.AIR1
 			circ1_air1.merge(cold_air)
 
 	var/genlev = max(0, min( round(11*lastgen / 100000), 11))
@@ -133,10 +133,10 @@
 	if(!powernet)
 		t += "<span class='bad'>Unable to connect to the power network!</span>"
 	else if(circ1 && circ2)
-		var/datum/gas_mixture/circ1_air1 = circ1.airs["a1"]
-		var/datum/gas_mixture/circ1_air2 = circ1.airs["a2"]
-		var/datum/gas_mixture/circ2_air1 = circ2.airs["a1"]
-		var/datum/gas_mixture/circ2_air2 = circ2.airs["a2"]
+		var/datum/gas_mixture/circ1_air1 = circ1.AIR1
+		var/datum/gas_mixture/circ1_air2 = circ1.AIR2
+		var/datum/gas_mixture/circ2_air1 = circ2.AIR1
+		var/datum/gas_mixture/circ2_air2 = circ2.AIR2
 
 		t += "<div class='statusDisplay'>"
 

code/modules/power/turbine.dm

@@ -84,10 +84,9 @@
 
 /obj/machinery/power/compressor/initialize()
 	..()
-	spawn(10)
-		locate_machinery()
-		if(!turbine)
-			stat |= BROKEN
+	locate_machinery()
+	if(!turbine)
+		stat |= BROKEN
 
 
 #define COMPFRICTION 5e5
@@ -206,10 +205,9 @@
 
 /obj/machinery/power/turbine/initialize()
 	..()
-	spawn(10)
-		locate_machinery()
-		if(!compressor)
-			stat |= BROKEN
+	locate_machinery()
+	if(!compressor)
+		stat |= BROKEN
 
 /obj/machinery/power/turbine/RefreshParts()
 	var/P = 0
@@ -350,7 +348,7 @@
 		locate_machinery()
 
 /obj/machinery/computer/turbine_computer/locate_machinery()
-	compressor = locate(/obj/machinery/power/compressor) in range(5)
+	compressor = locate(/obj/machinery/power/compressor) in range(5, src)
 
 /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
 	if(..())

code/modules/projectiles/guns/magic.dm

@@ -74,6 +74,6 @@
 	return
 
 /obj/item/weapon/gun/magic/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is casting a spell on themself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is twisting the [src.name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.</span>")
 	playsound(loc, fire_sound, 50, 1, -1)
 	return (FIRELOSS)

code/modules/projectiles/projectile/magic.dm

@@ -202,7 +202,7 @@
 							if("parrot")	new_mob = new /mob/living/simple_animal/parrot(M.loc)
 							if("corgi")		new_mob = new /mob/living/simple_animal/pet/dog/corgi(M.loc)
 							if("crab")		new_mob = new /mob/living/simple_animal/crab(M.loc)
-							if("pug")		new_mob = new /mob/living/simple_animal/pet/pug(M.loc)
+							if("pug")		new_mob = new /mob/living/simple_animal/pet/dog/pug(M.loc)
 							if("cat")		new_mob = new /mob/living/simple_animal/pet/cat(M.loc)
 							if("mouse")		new_mob = new /mob/living/simple_animal/mouse(M.loc)
 							if("chicken")	new_mob = new /mob/living/simple_animal/chicken(M.loc)

code/modules/reagents/Chemistry-Reagents.dm

@@ -108,3 +108,10 @@
 		M << "<span class='boldannounce'>You're not feeling good at all! You really need some [name].</span>"
 	return
 
+/proc/pretty_string_from_reagent_list(var/list/reagent_list)
+	//Convert reagent list to a printable string for logging etc
+	var/result = "| "
+	for (var/datum/reagent/R in reagent_list)
+		result += "[R.name], [R.volume] | "
+
+	return result

code/modules/reagents/reagent_containers/syringes.dm

@@ -180,7 +180,7 @@
 					C.inject_blood(src,5)
 				else
 					src.reagents.trans_to(target, amount_per_transfer_from_this)
-				user << "<span class='notice'>You inject 5 units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
+				user << "<span class='notice'>You inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
 				if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
 					mode = SYRINGE_DRAW
 					update_icon()

code/modules/recycling/disposal-unit.dm

@@ -275,6 +275,9 @@
 //How disposal handles getting a storage dump from a storage object
 /obj/machinery/disposal/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
 	for(var/obj/item/I in src_object)
+		if(user.s_active != src_object)
+			if(I.on_found(user))
+				return
 		src_object.remove_from_storage(I, src)
 	return 1
 

code/modules/research/designs/autolathe_designs.dm

@@ -354,6 +354,14 @@
 	build_path = /obj/item/device/assembly/infra
 	category = list("initial", "Misc")
 
+/datum/design/health_sensor
+	name = "Health sensor"
+	id = "health_sensor"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 800, MAT_GLASS = 200)
+	build_path = /obj/item/device/assembly/health
+	category = list("initial", "Medical")
+
 /datum/design/timer
 	name = "Timer"
 	id = "timer"

code/modules/research/designs/medical_designs.dm

@@ -71,7 +71,7 @@
 	materials = list(MAT_METAL = 750, MAT_GLASS = 750)
 	construction_time = 100
 	reliability = 76
-	build_path = /obj/item/device/flash/handheld
+	build_path = /obj/item/device/assembly/flash/handheld
 	category = list("Misc")
 
 /datum/design/bluespacebeaker

code/modules/research/experimentor.dm

@@ -680,7 +680,7 @@
 	user << message
 	var/animals = rand(1,25)
 	var/counter
-	var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
+	var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/dog/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
 	for(counter = 1; counter < animals; counter++)
 		var/mobType = pick(valid_animals)
 		new mobType(get_turf(src))

code/modules/scripting/Errors.dm

@@ -81,7 +81,7 @@
 	A basic description as to what went wrong.
 */
 		message
-		stack/stack
+		datum/stack/stack
 
 	proc
 /*

code/modules/scripting/Interpreter/Interpreter.dm

@@ -21,7 +21,7 @@
 		node
 			BlockDefinition/program
 			statement/FunctionDefinition/curFunction
-		stack
+		datum/stack
 			scopes		= new()
 			functions	= new()
 

code/modules/scripting/Parser/Expressions.dm

@@ -56,7 +56,7 @@
 					var
 						token/accessor/A=T
 						node/expression/value/variable/E//=new(A.member)
-						stack/S=new()
+						datum/stack/S = new()
 					while(istype(A.object, /token/accessor))
 						S.Push(A)
 						A=A.object
@@ -130,7 +130,7 @@
 	Takes the operator on top of the opr stack and assigns its operand(s). Then this proc pushes the value of that operation to the top
 	of the val stack.
 */
-		Reduce(stack/opr, stack/val)
+		Reduce(datum/stack/opr, datum/stack/val)
 			var/node/expression/operator/O=opr.Pop()
 			if(!O) return
 			if(!istype(O))
@@ -181,7 +181,7 @@
 	- <ParseParamExpression()>
 */
 		ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"), check_functions = 0)
-			var/stack
+			var/datum/stack
 				opr=new
 				val=new
 			src.expecting=VALUE

code/modules/scripting/Parser/Parser.dm

@@ -37,7 +37,7 @@
 	The token at <index> in <tokens>.
 */
 			curToken
-		stack
+		datum/stack
 			blocks=new
 		node/BlockDefinition
 			GlobalBlock/global_block=new

code/modules/scripting/stack.dm

@@ -1,23 +0,0 @@
-/stack
-	var/list
-		contents=new
-	proc
-		Push(value)
-			contents+=value
-
-		Pop()
-			if(!contents.len) return null
-			. = contents[contents.len]
-			contents.len--
-
-		Top() //returns the item on the top of the stack without removing it
-			if(!contents.len) return null
-			return contents[contents.len]
-
-		Copy()
-			var/stack/S=new()
-			S.contents=src.contents.Copy()
-			return S
-
-		Clear()
-			contents.Cut()