Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00
parent 988baf6781 b66e664f11
commit 7179547be4
205 changed files with 2604 additions and 1534 deletions
@@ -393,6 +393,8 @@
 		log_admin("[key_name(usr)] [msg]")
 		message_admins("[key_name_admin(usr)] [msg]")
 		href_list["secrets"] = "check_antagonist"
+		if(SSticker.ready_for_reboot && !SSticker.delay_end) //we undelayed after standard reboot would occur
+			SSticker.standard_reboot()

 	else if(href_list["end_round"])
 		if(!check_rights(R_ADMIN))
@@ -1,6 +1,9 @@
 /proc/machine_upgrade(obj/machinery/M in world)
 	set name = "Tweak Component Ratings"
 	set category = "Debug"
+	if (!istype(M))
+		return
+
 	var/new_rating = input("Enter new rating:","Num") as num
 	if(new_rating && M.component_parts)
 		for(var/obj/item/stock_parts/P in M.component_parts)
@@ -651,10 +651,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"

-	if(view == world.view)
+	if(view == CONFIG_GET(string/default_view))
 		change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128))
 	else
-		change_view(world.view)
+		change_view(CONFIG_GET(string/default_view))

 	log_admin("[key_name(usr)] changed their view range to [view].")
 	//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].")	//why? removed by order of XSI
@@ -7,7 +7,7 @@
 	//list of open turfs adjacent to us
 	var/list/atmos_adjacent_turfs
 	//bitfield of dirs in which we are superconducitng
-	var/atmos_supeconductivity = 0
+	var/atmos_supeconductivity = NONE

 	//used to determine whether we should archive
 	var/archived_cycle = 0
@@ -25,8 +25,7 @@
 	var/pressure_direction = 0

 	var/datum/excited_group/excited_group
-	var/excited = 0
-	var/recently_active = 0
+	var/excited = FALSE
 	var/datum/gas_mixture/turf/air

 	var/obj/effect/hotspot/active_hotspot
@@ -54,10 +53,10 @@

 /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
 	if(!giver)
-		return 0
+		return FALSE
 	air.merge(giver)
 	update_visuals()
-	return 1
+	return TRUE

 /turf/open/remove_air(amount)
 	var/datum/gas_mixture/ours = return_air()
@@ -83,7 +82,7 @@

 /turf/temperature_expose()
 	if(temperature > heat_capacity)
-		to_be_destroyed = 1
+		to_be_destroyed = TRUE

 /turf/proc/archive()
 	temperature_archived = temperature
@@ -102,7 +101,7 @@
 	#if DM_VERSION >= 513
 	#warning 512 is stable now for sure, remove the old code
 	#endif
-	
+
 	#if DM_VERSION >= 512
 	if (atmos_overlay_types)
 		for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
@@ -175,64 +174,48 @@
 	for(var/t in adjacent_turfs)
 		var/turf/open/enemy_tile = t

-		if(fire_count > enemy_tile.current_cycle)
-			enemy_tile.archive()
+		if(fire_count <= enemy_tile.current_cycle)
+			continue
+		enemy_tile.archive()

-		/******************* GROUP HANDLING START *****************************************************************/
+	/******************* GROUP HANDLING START *****************************************************************/

-			var/should_share_air = FALSE
-			var/datum/gas_mixture/enemy_air = enemy_tile.air
-			if(enemy_tile.excited)
-				//cache for sanic speed
-				var/datum/excited_group/enemy_excited_group = enemy_tile.excited_group
-				if(our_excited_group)
-					if(enemy_excited_group)
-						if(our_excited_group != enemy_excited_group)
-							//combine groups (this also handles updating the excited_group var of all involved turfs)
-							our_excited_group.merge_groups(enemy_excited_group)
-							our_excited_group = excited_group //update our cache
-						should_share_air = TRUE
-					else
-						if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
-							our_excited_group.add_turf(enemy_tile) //add enemy to our group
-							should_share_air = TRUE
+		var/should_share_air = FALSE
+		var/datum/gas_mixture/enemy_air = enemy_tile.air
+
+		//cache for sanic speed
+		var/datum/excited_group/enemy_excited_group = enemy_tile.excited_group
+
+		if(our_excited_group && enemy_excited_group)
+			if(our_excited_group != enemy_excited_group)
+				//combine groups (this also handles updating the excited_group var of all involved turfs)
+				our_excited_group.merge_groups(enemy_excited_group)
+				our_excited_group = excited_group //update our cache
+			should_share_air = TRUE
+
+		else if(our_air.compare(enemy_air))
+			if(!enemy_tile.excited)
+				SSair.add_to_active(enemy_tile)
+			var/datum/excited_group/EG = our_excited_group || enemy_excited_group || new
+			if(!our_excited_group)
+				EG.add_turf(src)
+			if(!enemy_excited_group)
+				EG.add_turf(enemy_tile)
+			our_excited_group = excited_group
+			should_share_air = TRUE
+
+		//air sharing
+		if(should_share_air)
+			var/difference = our_air.share(enemy_air, adjacent_turfs_length)
+			if(difference)
+				if(difference > 0)
+					consider_pressure_difference(enemy_tile, difference)
 				else
-					if(enemy_excited_group)
-						if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
-							enemy_excited_group.add_turf(src) //join self to enemy group
-							our_excited_group = excited_group //update our cache
-							should_share_air = TRUE
-					else
-						if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
-							var/datum/excited_group/EG = new //generate new group
-							EG.add_turf(src)
-							EG.add_turf(enemy_tile)
-							our_excited_group = excited_group //update our cache
-							should_share_air = TRUE
-			else
-				if(our_air.compare(enemy_air)) //compare if
-					SSair.add_to_active(enemy_tile) //excite enemy
-					if(our_excited_group)
-						our_excited_group.add_turf(enemy_tile) //add enemy to group
-					else
-						var/datum/excited_group/EG = new //generate new group
-						EG.add_turf(src)
-						EG.add_turf(enemy_tile)
-						our_excited_group = excited_group //update our cache
-					should_share_air = TRUE
-
-			//air sharing
-			if(should_share_air)
-				var/difference = our_air.share(enemy_air, adjacent_turfs_length)
-				if(difference)
-					if(difference > 0)
-						consider_pressure_difference(enemy_tile, difference)
-					else
-						enemy_tile.consider_pressure_difference(src, -difference)
-				LAST_SHARE_CHECK
+					enemy_tile.consider_pressure_difference(src, -difference)
+			LAST_SHARE_CHECK


-		/******************* GROUP HANDLING FINISH *********************************************************************/
+	/******************* GROUP HANDLING FINISH *********************************************************************/

 	if (planet_atmos) //share our air with the "atmosphere" "above" the turf
 		var/datum/gas_mixture/G = new
@@ -250,12 +233,8 @@

 	update_visuals()

-	var/remove = TRUE
-	if(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION)
-		if(consider_superconductivity(starting = 1))
-			remove = FALSE
-
-	if ((!our_excited_group && remove) || (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
+	if((!our_excited_group && !(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION && consider_superconductivity(starting = TRUE))) \
+	  || (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
 		SSair.remove_from_active(src)

 	atmos_cooldown = cached_atmos_cooldown
@@ -279,9 +258,9 @@
 	var/const/PROBABILITY_OFFSET = 25
 	var/const/PROBABILITY_BASE_PRECENT = 75
 	set waitfor = 0
-	. = 0
+	. = FALSE
 	if (!anchored && !pulledby)
-		. = 1
+		. = TRUE
 		if (last_high_pressure_movement_air_cycle < SSair.times_fired)
 			var/move_prob = 100
 			if (pressure_resistance > 0)
@@ -304,7 +283,6 @@
 /datum/excited_group/proc/add_turf(turf/open/T)
 	turf_list += T
 	T.excited_group = src
-	T.recently_active = 1
 	reset_cooldowns()

 /datum/excited_group/proc/merge_groups(datum/excited_group/E)
@@ -328,25 +306,27 @@
 	dismantle_cooldown = 0

 //argument is so world start can clear out any turf differences quickly.
-/datum/excited_group/proc/self_breakdown(space_is_all_consuming = 0)
+/datum/excited_group/proc/self_breakdown(space_is_all_consuming = FALSE)
 	var/datum/gas_mixture/A = new

 	//make local for sanic speed
 	var/list/A_gases = A.gases
 	var/list/turf_list = src.turf_list
 	var/turflen = turf_list.len
-	var/space_in_group = 0
+	var/space_in_group = FALSE

 	for(var/t in turf_list)
 		var/turf/open/T = t
 		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/immutable/space))
-			space_in_group = 1
+			space_in_group = TRUE
 			qdel(A)
-			A = new/datum/gas_mixture/immutable/space()
+			A = new /datum/gas_mixture/immutable/space()
+			A_gases = A.gases //update the cache
+			break
 		A.merge(T.air)

 	for(var/id in A_gases)
-		A_gases[id][MOLES] = A_gases[id][MOLES]/turflen
+		A_gases[id][MOLES] /= turflen

 	for(var/t in turf_list)
 		var/turf/open/T = t
@@ -359,8 +339,7 @@
 /datum/excited_group/proc/dismantle()
 	for(var/t in turf_list)
 		var/turf/open/T = t
-		T.excited = 0
-		T.recently_active = 0
+		T.excited = FALSE
 		T.excited_group = null
 		SSair.active_turfs -= T
 	garbage_collect()
@@ -432,7 +411,7 @@
 	//Make sure still hot enough to continue conducting heat
 	if(temp < MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION)
 		SSair.active_super_conductivity -= src
-		return 0
+		return FALSE

 /turf/open/finish_superconduction()
 	//Conduct with air on my tile if I have it
@@ -442,21 +421,21 @@

 /turf/proc/consider_superconductivity()
 	if(!thermal_conductivity)
-		return 0
+		return FALSE

 	SSair.active_super_conductivity |= src
-	return 1
+	return TRUE

 /turf/open/consider_superconductivity(starting)
 	if(air.temperature < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION))
-		return 0
+		return FALSE
 	if(air.heat_capacity() < M_CELL_WITH_RATIO) // Was: MOLES_CELLSTANDARD*0.1*0.05 Since there are no variables here we can make this a constant.
-		return 0
+		return FALSE
 	return ..()

 /turf/closed/consider_superconductivity(starting)
 	if(temperature < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION))
-		return 0
+		return FALSE
 	return ..()

 /turf/proc/radiate_to_spess() //Radiate excess tile heat to space
@@ -465,7 +444,7 @@
 		if((heat_capacity > 0) && (abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER))

 			var/heat = thermal_conductivity*delta_temperature* \
-				(heat_capacity*700000/(heat_capacity+700000)) //700000 is the heat_capacity from a space turf, hardcoded here
+				(heat_capacity*HEAT_CAPACITY_VACUUM/(heat_capacity+HEAT_CAPACITY_VACUUM))
 			temperature -= heat/heat_capacity

 /turf/open/proc/temperature_share_open_to_solid(turf/sharer)
@@ -1,5 +1,3 @@
-#define NO_REACTION	0
-#define REACTING	1
 //Plasma fire properties
 #define OXYGEN_BURN_RATE_BASE				1.4
 #define PLASMA_BURN_RATE_DELTA				9
@@ -359,9 +357,6 @@
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)

-
-#undef REACTING
-#undef NO_REACTION
 #undef OXYGEN_BURN_RATE_BASE
 #undef PLASMA_BURN_RATE_DELTA
 #undef PLASMA_UPPER_TEMPERATURE
@@ -386,4 +381,4 @@
 #undef CATALYST_COEFFICENT
 #undef FUSION_PURITY_THRESHOLD
 #undef FUSION_HEAT_DROPOFF
-#undef NOBLIUM_FORMATION_ENERGY
+#undef NOBLIUM_FORMATION_ENERGY
@@ -356,6 +356,9 @@
 			. = TRUE
 		if("threshold")
 			var/env = params["env"]
+			if(text2path(env))
+				env = text2path(env)
+
 			var/name = params["var"]
 			var/datum/tlv/tlv = TLV[env]
 			if(isnull(tlv))
@@ -17,6 +17,8 @@
 	var/list/json = json_decode(file2text(json_file))
 	shenanigans = json["phrases"]

+#define TIMEWASTE_MEDAL "Overextended The Joke"
+
 /obj/structure/speaking_tile/interact(mob/user)
 	if(!isliving(user) || speaking)
 		return
@@ -45,11 +47,11 @@
 			SpeakPeace(list("Alright maybe that's <b>too</b> boring.", "I can't keep manually typing these lines out though.", "It's hard to explain but the code structure I'm using is kind of terrible."))
 		if(10)
 			SpeakPeace(list("Oh I have an idea!", "Lets outsource this endless banter to Poly!", "Then you'll be able to keep listening to this without getting bored!"))
-			if(isnull(shenanigans))
+			if(isnull(shenanigans) || !shenanigans.len)
 				shenanigans = list("Except the poly file is missing...")
 		if(11 to 14, 16 to 50, 52 to 99, 103 to 107, 109 to 203, 205 to 249, 252 to 665, 667 to 999, 1001 to 5642)
 			SpeakPeace(list(pick(shenanigans),pick(shenanigans),pick(shenanigans)))
-			if(times_spoken_to * 0.1 == round(times_spoken_to * 0.1))
+			if(times_spoken_to % 10 == 0)
 				SpeakPeace(list("That's [times_spoken_to] times you've spoken to me by the way."))
 		if(15)
 			SpeakPeace(list("See? Isn't this fun?","Now you can mash this for hours without getting bored.","Anyway I'll leave you it."))
@@ -79,6 +81,7 @@
 		if(1000)
 			SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me."))
 		if(5643)
+			UnlockMedal(TIMEWASTE_MEDAL,user.client)
 			var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
 			never_ends.name = "Overextending The Joke: First Place"
 			never_ends.desc = "And so we are left alone with our regrets."
@@ -87,7 +90,7 @@

 	speaking = FALSE
 	times_spoken_to++
-
+#undef TIMEWASTE_MEDAL
 /obj/structure/speaking_tile/proc/SpeakPeace(list/statements)
 	for(var/i in 1 to statements.len)
 		say("<span class='deadsay'>[statements[i]]</span>")
@@ -442,7 +442,7 @@ GLOBAL_LIST(external_rsc_urls)
 			message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect during panic bunker</span>")
 			to_chat(src, "Sorry but the server is currently not accepting connections from never before seen players.")
 			var/list/connectiontopic_a = params2list(connectiontopic)
-			var/list/panic_addr = CONFIG_GET(string/panic_address)
+			var/list/panic_addr = CONFIG_GET(string/panic_server_address)
 			if(panic_addr && !connectiontopic_a["redirect"])
 				var/panic_name = CONFIG_GET(string/panic_server_name)
 				to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")
@@ -119,11 +119,9 @@
 		death(0)

 /mob/living/silicon/pai/verb/suicide()
-	set category = "pAI Commands"
-	set desc = "Kill yourself and become a ghost (You will receive a confirmation prompt)"
-	set name = "pAI Suicide"
-	var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No")
-	if(answer == "Yes")
+	set hidden = 1
+	var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
+	if(confirm == "Yes")
 		var/turf/T = get_turf(src.loc)
 		T.visible_message("<span class='notice'>[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"</span>", null, \
 		 "<span class='notice'>[src] bleeps electronically.</span>")
@@ -8,7 +8,8 @@
 /obj/item/clothing/glasses/meson/engine
 	name = "engineering scanner goggles"
 	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation."
-	icon_state = "trayson"
+	icon_state = "trayson-meson"
+	item_state = "trayson-meson"
 	actions_types = list(/datum/action/item_action/toggle_mode)
 	origin_tech = "materials=3;magnets=3;engineering=3;plasmatech=3"

@@ -117,14 +118,22 @@
 		flick_overlay(pic, list(user.client), 8)

 /obj/item/clothing/glasses/meson/engine/update_icon()
-	icon_state = "[initial(icon_state)]-[mode]"
-	if(istype(loc, /mob/living/carbon/human/))
-		var/mob/living/carbon/human/user = loc
-		if(user.glasses == src)
+	icon_state = "trayson-[mode]"
+	update_mob()
+
+/obj/item/clothing/glasses/meson/engine/proc/update_mob()
+	item_state = icon_state
+	if(isliving(loc))
+		var/mob/living/user = loc
+		if(user.get_item_by_slot(slot_glasses) == src)
 			user.update_inv_glasses()
+		else
+			user.update_inv_hands()

 /obj/item/clothing/glasses/meson/engine/tray //atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves
 	name = "optical t-ray scanner"
+	icon_state = "trayson-t-ray"
+	item_state = "trayson-t-ray"
 	desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
 	origin_tech = "materials=3;magnets=2;engineering=2"

@@ -188,7 +188,7 @@
 /obj/item/clothing/gloves/color/random
 	name = "random gloves"
 	desc = "These gloves are supposed to be a random color..."
-	icon_state = "white"
+	icon_state = "random_gloves"
 	item_state = "wgloves"
 	item_color = "mime"

@@ -856,21 +856,22 @@
 	return TRUE

 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/unlock_suit(mob/wearer)
-	if(suittoggled)
-		usermessage("You must retract the helmet before unlocking your suit!", "boldwarning")
-		return FALSE
-	if(pack && pack.flight)
-		usermessage("You must shut off the flight-pack before unlocking your suit!", "boldwarning")
-		return FALSE
-	if(deployedpack)
-		usermessage("Your flightpack must be fully retracted first!", "boldwarning")
-		return FALSE
-	if(deployedshoes)
-		usermessage("Your flight shoes must be fully retracted first!", "boldwarning")
-		return FALSE
-	if(wearer)
-		user.visible_message("<span class='notice'>[wearer]'s flight suit detaches from their body, becoming nothing more then a bulky metal skeleton.</span>")
-	playsound(src.loc, 'sound/items/rped.ogg', 65, 1)
+	if(user)
+		if(suittoggled)
+			usermessage("You must retract the helmet before unlocking your suit!", "boldwarning")
+			return FALSE
+		if(pack && pack.flight)
+			usermessage("You must shut off the flight-pack before unlocking your suit!", "boldwarning")
+			return FALSE
+		if(deployedpack)
+			usermessage("Your flightpack must be fully retracted first!", "boldwarning")
+			return FALSE
+		if(deployedshoes)
+			usermessage("Your flight shoes must be fully retracted first!", "boldwarning")
+			return FALSE
+		if(wearer)
+			user.visible_message("<span class='notice'>[wearer]'s flight suit detaches from their body, becoming nothing more then a bulky metal skeleton.</span>")
+	playsound(src, 'sound/items/rped.ogg', 65, 1)
 	resync()
 	strip_delay = initial(strip_delay)
 	locked = FALSE
@@ -911,7 +912,7 @@
 			user.update_inv_wear_suit()
 			user.visible_message("<span class='notice'>[user]'s [pack.name] detaches from their back and retracts into their [src]!</span>")
 	pack.forceMove(src)
-	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
+	playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1)
 	deployedpack = FALSE

 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/extend_flightshoes(forced = FALSE)
@@ -936,7 +937,7 @@

 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE)
 	shoes.flags_1 &= ~NODROP_1
-	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
+	playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1)
 	if(user)
 		user.transferItemToLoc(shoes, src, TRUE)
 		user.update_inv_wear_suit()
@@ -1092,15 +1093,16 @@

 /obj/item/clothing/head/helmet/space/hardsuit/flightsuit/dropped(mob/living/carbon/human/wearer)
 	..()
-	for(var/hudtype in datahuds)
-		var/datum/atom_hud/H = GLOB.huds[hudtype]
-		H.remove_hud_from(wearer)
-	if(zoom)
-		toggle_zoom(wearer, TRUE)
+	if(wearer)
+		for(var/hudtype in datahuds)
+			var/datum/atom_hud/H = GLOB.huds[hudtype]
+			H.remove_hud_from(wearer)
+		if(zoom)
+			toggle_zoom(wearer, TRUE)

 /obj/item/clothing/head/helmet/space/hardsuit/flightsuit/proc/toggle_zoom(mob/living/user, force_off = FALSE)
 	if(zoom || force_off)
-		user.client.change_view(world.view)
+		user.client.change_view(CONFIG_GET(string/default_view))
 		to_chat(user, "<span class='boldnotice'>Disabling smart zooming image enhancement...</span>")
 		zoom = FALSE
 		return FALSE
@@ -6,11 +6,9 @@
 	alertadmins = 0

 /datum/round_event/camera_failure
-	startWhen = 1
-	endWhen = 2
 	fakeable = FALSE

-/datum/round_event/camera_failure/tick()
+/datum/round_event/camera_failure/start()
 	var/iterations = 1
 	var/obj/machinery/camera/C = pick(GLOB.cameranet.cameras)
 	while(prob(round(100/iterations)))
@@ -11,29 +11,29 @@

 /datum/round_event/wizard/cursed_items/start()
 	var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "catgirls2015")
-	var/list/wearslots	= list(slot_wear_suit, slot_shoes, slot_head, slot_wear_mask, slot_gloves, slot_ears)
-	var/list/loadout = list()
+	var/list/loadout[slots_amt]
 	var/ruins_spaceworthiness
 	var/ruins_wizard_loadout
-	loadout.len = 7

 	switch(item_set)
 		if("wizardmimic")
-			loadout = list(/obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal/magic, /obj/item/clothing/head/wizard)
+			loadout[slot_wear_suit] = /obj/item/clothing/suit/wizrobe
+			loadout[slot_shoes] = /obj/item/clothing/shoes/sandal/magic
+			loadout[slot_head] = /obj/item/clothing/head/wizard
 			ruins_spaceworthiness = 1
 		if("swords")
-			loadout[5] = /obj/item/katana/cursed
+			loadout[slot_hands] = /obj/item/katana/cursed
 		if("bigfatdoobie")
-			loadout[4] = /obj/item/clothing/mask/cigarette/rollie/trippy
+			loadout[slot_wear_mask] = /obj/item/clothing/mask/cigarette/rollie/trippy
 			ruins_spaceworthiness = 1
 		if("boxing")
-			loadout[4] = /obj/item/clothing/mask/luchador
-			loadout[6] = /obj/item/clothing/gloves/boxing
+			loadout[slot_wear_mask] = /obj/item/clothing/mask/luchador
+			loadout[slot_gloves] = /obj/item/clothing/gloves/boxing
 			ruins_spaceworthiness = 1
 		if("voicemodulators")
-			loadout[4] = /obj/item/clothing/mask/chameleon
+			loadout[slot_wear_mask] = /obj/item/clothing/mask/chameleon
 		if("catgirls2015")
-			loadout[3] = /obj/item/clothing/head/kitty
+			loadout[slot_head] = /obj/item/clothing/head/kitty
 			ruins_spaceworthiness = 1
 			ruins_wizard_loadout = 1

@@ -44,14 +44,13 @@
 			continue
 		if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
 			H.gender = FEMALE
-		var/list/slots		= list(H.wear_suit, H.shoes, H.head, H.wear_mask, H.gloves, H.ears) //add new slots as needed to back
 		for(var/i in 1 to loadout.len)
 			if(loadout[i])
 				var/obj/item/J = loadout[i]
 				var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
-				H.temporarilyRemoveItemFromInventory(slots[i], TRUE)
-				H.equip_to_slot_or_del(I, wearslots[i])
-				I.flags_1 |= NODROP_1
+				H.dropItemToGround(H.get_item_by_slot(i), TRUE)
+				H.equip_to_slot_or_del(I, i)
+				I.flags_1 |= NODROP_1 | DROPDEL_1
 				I.name = "cursed " + I.name

 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
@@ -6,12 +6,11 @@
 	earliest_start = 0

 /datum/round_event/wizard/imposter/start()
-
 	for(var/datum/mind/M in SSticker.mode.wizards)
 		if(!ishuman(M.current))
 			continue
 		var/mob/living/carbon/human/W = M.current
-		var/list/candidates = get_candidates(ROLE_WIZARD)
+		var/list/candidates = pollGhostCandidates("Would you like to be an imposter wizard?", ROLE_WIZARD)
 		if(!candidates)
 			return //Sad Trombone
 		var/client/C = pick(candidates)
@@ -28,10 +27,10 @@
 		var/datum/antagonist/wizard/master = M.has_antag_datum(/datum/antagonist/wizard)
 		if(!master.wiz_team)
 			master.create_wiz_team()
-		var/datum/antagonist/wizard/apprentice/imposter = new(I.mind)
+		var/datum/antagonist/wizard/apprentice/imposter/imposter = new(I.mind)
 		imposter.master = M
 		imposter.wiz_team = master.wiz_team
-		master.wiz_team += imposter
+		master.wiz_team.add_member(imposter)
 		I.mind.add_antag_datum(imposter)
 		//Remove if possible
 		SSticker.mode.apprentices += I.mind
@@ -22,7 +22,7 @@

 	for(var/mob/living/carbon/human/H in GLOB.carbon_list) //yes, even the dead
 		H.set_species(new_species)
-		H.real_name = new_species.random_name(H.gender,1)
+		H.real_name = H.dna.species.random_name(H.gender,1)
 		H.dna.unique_enzymes = H.dna.generate_unique_enzymes()
 		to_chat(H, "<span class='notice'>You feel somehow... different?</span>")
 		if(!all_the_same)
@@ -115,6 +115,7 @@
 	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
 	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
 	B.icon = I
+	B.name = "broken [name]"
 	if(prob(33))
 		new/obj/item/shard(drop_location())
 	playsound(src, "shatter", 70, 1)
@@ -186,7 +187,7 @@
 //	Formatting is the same as food.

 /obj/item/reagent_containers/food/drinks/coffee
-	name = "Robust Coffee"
+	name = "robust coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."
 	icon_state = "coffee"
 	list_reagents = list("coffee" = 30)
@@ -195,7 +196,7 @@
 	isGlass = FALSE

 /obj/item/reagent_containers/food/drinks/ice
-	name = "Ice Cup"
+	name = "ice cup"
 	desc = "Careful, cold ice, do not chew."
 	icon_state = "coffee"
 	list_reagents = list("ice" = 30)
@@ -216,12 +217,12 @@
 		icon_state = "tea_empty"

 /obj/item/reagent_containers/food/drinks/mug/tea
-	name = "Duke Purple Tea"
+	name = "Duke Purple tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	list_reagents = list("tea" = 30)

 /obj/item/reagent_containers/food/drinks/mug/coco
-	name = "Dutch Hot Coco"
+	name = "Dutch hot coco"
 	desc = "Made in Space South America."
 	list_reagents = list("hot_coco" = 30, "sugar" = 5)
 	foodtype = SUGAR
@@ -230,7 +231,7 @@


 /obj/item/reagent_containers/food/drinks/dry_ramen
-	name = "Cup Ramen"
+	name = "cup ramen"
 	desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
 	icon_state = "ramen"
 	list_reagents = list("dry_ramen" = 30)
@@ -238,7 +239,7 @@
 	isGlass = FALSE

 /obj/item/reagent_containers/food/drinks/beer
-	name = "Space Beer"
+	name = "space beer"
 	desc = "Beer. In space."
 	icon_state = "beer"
 	list_reagents = list("beer" = 30)
@@ -282,7 +283,7 @@
 	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
 	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
 	B.icon = I
-	B.name = "broken carton"
+	B.name = "broken [name]"
 	B.force = 0
 	B.throwforce = 0
 	B.desc = "A carton with the bottom half burst open. Might give you a papercut."
@@ -420,28 +421,28 @@
 	foodtype = SUGAR

 /obj/item/reagent_containers/food/drinks/soda_cans/tonic
-	name = "T-Borg's Tonic Water"
+	name = "T-Borg's tonic water"
 	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 	icon_state = "tonic"
 	list_reagents = list("tonic" = 50)
 	foodtype = ALCOHOL

 /obj/item/reagent_containers/food/drinks/soda_cans/sodawater
-	name = "Soda Water"
+	name = "soda water"
 	desc = "A can of soda water. Why not make a scotch and soda?"
 	icon_state = "sodawater"
 	list_reagents = list("sodawater" = 50)

 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime
-	name = "Orange Soda"
+	name = "orange soda"
 	desc = "You wanted ORANGE. It gave you Lemon Lime."
 	icon_state = "lemon-lime"
 	list_reagents = list("lemon_lime" = 30)
 	foodtype = FRUIT

-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
-	..()
-	name = "Lemon-Lime Soda"
+/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
+	. = ..()
+	name = "lemon-lime soda"

 /obj/item/reagent_containers/food/drinks/soda_cans/space_up
 	name = "Space-Up!"
@@ -485,14 +486,14 @@
 	list_reagents = list("pwr_game" = 30)

 /obj/item/reagent_containers/food/drinks/soda_cans/shamblers
-	name = "Shambler's Juice"
+	name = "Shambler's juice"
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon_state = "shamblers"
 	list_reagents = list("shamblers" = 30)
 	foodtype = SUGAR | JUNKFOOD

 /obj/item/reagent_containers/food/drinks/soda_cans/air
-	name = "Canned Air"
+	name = "canned air"
 	desc = "There is no air shortage. Do not drink."
 	icon_state = "air"
 	list_reagents = list("nitrogen" = 24, "oxygen" = 6)
@@ -35,10 +35,10 @@
 			new/obj/item/shard(drop_location())
 		playsound(src, "shatter", 70, 1)
 	else
-		B.name = "broken carton"
 		B.force = 0
 		B.throwforce = 0
 		B.desc = "A carton with the bottom half burst open. Might give you a papercut."
+	B.name = "broken [name]"
 	transfer_fingerprints_to(B)

 	qdel(src)
@@ -119,7 +119,7 @@

 //Keeping this here for now, I'll ask if I should keep it here.
 /obj/item/broken_bottle
-	name = "Broken Bottle"
+	name = "broken bottle"
 	desc = "A bottle with a sharp broken bottom."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "broken_bottle"
@@ -135,37 +135,37 @@
 	sharpness = IS_SHARP

 /obj/item/reagent_containers/food/drinks/bottle/gin
-	name = "Griffeater Gin"
+	name = "Griffeater gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."
 	icon_state = "ginbottle"
 	list_reagents = list("gin" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/whiskey
-	name = "Uncle Git's Special Reserve"
+	name = "Uncle Git's special reserve"
 	desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
 	icon_state = "whiskeybottle"
 	list_reagents = list("whiskey" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/vodka
-	name = "Tunguska Triple Distilled"
+	name = "Tunguska triple distilled"
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
 	icon_state = "vodkabottle"
 	list_reagents = list("vodka" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
-	name = "Badminka Vodka"
+	name = "Badminka vodka"
 	desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
 	icon_state = "badminka"
 	list_reagents = list("vodka" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/tequila
-	name = "Caccavo Guaranteed Quality Tequila"
+	name = "Caccavo guaranteed quality tequila"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequilabottle"
 	list_reagents = list("tequila" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
-	name = "Bottle of Nothing"
+	name = "bottle of nothing"
 	desc = "A bottle filled with nothing."
 	icon_state = "bottleofnothing"
 	list_reagents = list("nothing" = 100)
@@ -178,13 +178,13 @@
 	list_reagents = list("patron" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/rum
-	name = "Captain Pete's Cuban Spiced Rum"
+	name = "Captain Pete's Cuban spiced rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
 	icon_state = "rumbottle"
 	list_reagents = list("rum" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/holywater
-	name = "Flask of Holy Water"
+	name = "flask of holy water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
 	list_reagents = list("holywater" = 100)
@@ -195,39 +195,39 @@
 	list_reagents = list("hell_water" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/vermouth
-	name = "Goldeneye Vermouth"
+	name = "Goldeneye vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
 	list_reagents = list("vermouth" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/kahlua
-	name = "Robert Robust's Coffee Liqueur"
+	name = "Robert Robust's coffee liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
 	icon_state = "kahluabottle"
 	list_reagents = list("kahlua" = 100)
 	foodtype = VEGETABLES

 /obj/item/reagent_containers/food/drinks/bottle/goldschlager
-	name = "College Girl Goldschlager"
+	name = "College Girl goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
 	list_reagents = list("goldschlager" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/cognac
-	name = "Chateau De Baton Premium Cognac"
+	name = "Chateau de Baton premium cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
 	icon_state = "cognacbottle"
 	list_reagents = list("cognac" = 100)

 /obj/item/reagent_containers/food/drinks/bottle/wine
-	name = "Doublebeard Bearded Special Wine"
+	name = "Doublebeard's bearded special wine"
 	desc = "A faint aura of unease and asspainery surrounds the bottle."
 	icon_state = "winebottle"
 	list_reagents = list("wine" = 100)
 	foodtype = FRUIT | ALCOHOL

 /obj/item/reagent_containers/food/drinks/bottle/absinthe
-	name = "Extra-Strong Absinthe"
+	name = "extra-strong absinthe"
 	desc = "An strong alcoholic drink brewed and distributed by"
 	icon_state = "absinthebottle"
 	list_reagents = list("absinthe" = 100)
@@ -272,7 +272,7 @@


 /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
-	name = "Gwyn's Premium Absinthe"
+	name = "Gwyn's premium absinthe"
 	desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs."
 	icon_state = "absinthepremium"

@@ -280,7 +280,7 @@
 	return

 /obj/item/reagent_containers/food/drinks/bottle/lizardwine
-	name = "Bottle of lizard wine"
+	name = "bottle of lizard wine"
 	desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
 	icon_state = "lizardwine"
 	list_reagents = list("lizardwine" = 100)
@@ -302,7 +302,7 @@
 //////////////////////////JUICES AND STUFF ///////////////////////

 /obj/item/reagent_containers/food/drinks/bottle/orangejuice
-	name = "Orange Juice"
+	name = "orange juice"
 	desc = "Full of vitamins and deliciousness!"
 	icon_state = "orangejuice"
 	item_state = "carton"
@@ -313,7 +313,7 @@
 	foodtype = FRUIT

 /obj/item/reagent_containers/food/drinks/bottle/cream
-	name = "Milk Cream"
+	name = "milk cream"
 	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
 	icon_state = "cream"
 	item_state = "carton"
@@ -324,7 +324,7 @@
 	foodtype = DAIRY

 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
-	name = "Tomato Juice"
+	name = "tomato juice"
 	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
 	icon_state = "tomatojuice"
 	item_state = "carton"
@@ -335,7 +335,7 @@
 	foodtype = VEGETABLES

 /obj/item/reagent_containers/food/drinks/bottle/limejuice
-	name = "Lime Juice"
+	name = "lime juice"
 	desc = "Sweet-sour goodness."
 	icon_state = "limejuice"
 	item_state = "carton"
@@ -380,7 +380,7 @@
 	foodtype = VEGETABLES | FRIED | DAIRY

 /obj/item/reagent_containers/food/snacks/cubannachos
-	name = "cuban nachos"
+	name = "Cuban nachos"
 	desc = "That's some dangerously spicy nachos."
 	icon_state = "cubannachos"
 	bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
@@ -4,7 +4,7 @@

 /obj/item/reagent_containers/food/snacks/donut
 	name = "donut"
-	desc = "Goes great with Robust Coffee."
+	desc = "Goes great with robust coffee."
 	icon_state = "donut1"
 	bitesize = 5
 	bonus_reagents = list("sugar" = 1)
@@ -58,6 +58,7 @@
 /obj/structure/beebox/premade/New()
 	..()

+	icon_state = "beebox"
 	var/datum/reagent/R = null
 	if(random_reagent)
 		R = pick(subtypesof(/datum/reagent))
@@ -80,6 +81,7 @@


 /obj/structure/beebox/premade/random
+	icon_state = "random_beebox"
 	random_reagent = TRUE


@@ -14,6 +14,13 @@
 	mutatelist = list(/obj/item/seeds/watermelon/holy)
 	reagents_add = list("water" = 0.2, "vitamin" = 0.04, "nutriment" = 0.2)

+/obj/item/seeds/watermelon/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.gib()
+	new product(drop_location())
+	qdel(src)
+	return MANUAL_SUICIDE
+
 /obj/item/reagent_containers/food/snacks/grown/watermelon
 	seed = /obj/item/seeds/watermelon
 	name = "watermelon"
@@ -16,9 +16,9 @@
 	randomize_stats()
 	..()
 	if(prob(60))
-		add_random_reagents()
+		add_random_reagents(1, 3)
 	if(prob(50))
-		add_random_traits()
+		add_random_traits(1, 2)
 	add_random_plant_type(35)

 /obj/item/reagent_containers/food/snacks/grown/random
@@ -207,6 +207,15 @@
 	spawn_flags = IC_SPAWN_RESEARCH
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 1)

+/obj/item/integrated_circuit/output/sound/vox
+	name = "ai vox sound circuit"
+	desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in AI announcement systems."
+	spawn_flags = IC_SPAWN_RESEARCH
+
+/obj/item/integrated_circuit/output/sound/vox/Initialize()
+	.= ..()
+	sounds = GLOB.vox_sounds
+	extended_desc = "The first input pin determines which sound is used. It uses the AI Vox Broadcast word list. So either experiment to find words that work, or ask the AI to help in figuring them out. The second pin determines the volume of sound that is played, and the third determines if the frequency of the sound will vary with each activation."

 /obj/item/integrated_circuit/output/text_to_speech
 	name = "text-to-speech circuit"
@@ -1,3 +1,6 @@
+/obj/item/book/manual/random
+	icon_state = "random_book"
+
 /obj/item/book/manual/random/Initialize()
 	..()
 	var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
@@ -6,6 +9,7 @@
 	return INITIALIZE_HINT_QDEL

 /obj/item/book/random
+	icon_state = "random_book"
 	var/amount = 1
 	var/category = null

@@ -20,6 +24,7 @@
 /obj/structure/bookcase/random
 	var/category = null
 	var/book_count = 2
+	icon_state = "random_bookcase"
 	anchored = TRUE
 	state = 2

@@ -137,18 +137,10 @@
 	regrowth_time_low = 4800
 	regrowth_time_high = 7200

-/obj/structure/flora/ash/cacti/Crossed(mob/AM)
-	if(ishuman(AM) && has_gravity(loc) && prob(70))
-		var/mob/living/carbon/human/H = AM
-		if(!H.shoes && !H.lying) //ouch, my feet.
-			var/picked_def_zone = pick("l_leg", "r_leg")
-			var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
-			if(!istype(O) || (PIERCEIMMUNE in H.dna.species.species_traits))
-				return
-			H.apply_damage(rand(3, 6), BRUTE, picked_def_zone)
-			H.Knockdown(40)
-			H.visible_message("<span class='danger'>[H] steps on a cactus!</span>", \
-				"<span class='userdanger'>You step on a cactus!</span>")
+/obj/structure/flora/ash/cacti/Initialize(mapload)
+	. = ..()
+	// min dmg 3, max dmg 6, prob(70)
+	AddComponent(/datum/component/caltrop, 3, 6, 70)

 /obj/item/reagent_containers/food/snacks/grown/ash_flora
 	name = "mushroom shavings"
@@ -320,7 +320,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(mind.current.key && copytext(mind.current.key,1,2)!="@")	//makes sure we don't accidentally kick any clients
 		to_chat(usr, "<span class='warning'>Another consciousness is in your body...It is resisting you.</span>")
 		return
-	client.change_view(world.view)
+	client.change_view(CONFIG_GET(string/default_view))
 	SStgui.on_transfer(src, mind.current) // Transfer NanoUIs.
 	mind.current.key = key
 	return 1
@@ -456,7 +456,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Change your view range."

 	var/max_view = client.prefs.unlock_content ? GHOST_MAX_VIEW_RANGE_MEMBER : GHOST_MAX_VIEW_RANGE_DEFAULT
-	if(client.view == world.view)
+	if(client.view == CONFIG_GET(string/default_view))
 		var/list/views = list()
 		for(var/i in 7 to max_view)
 			views |= i
@@ -464,7 +464,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(new_view)
 			client.change_view(Clamp(new_view, 7, max_view))
 	else
-		client.change_view(world.view)
+		client.change_view(CONFIG_GET(string/default_view))

 /mob/dead/observer/verb/add_view_range(input as num)
 	set name = "Add View Range"
@@ -817,7 +817,8 @@
 		return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(get_turf_pixel(A))) || apc_override
 	//AI is carded/shunted
 	//view(src) returns nothing for carded/shunted AIs and they have x-ray vision so just use get_dist
-	return get_dist(src, A) <= client.view
+	var/list/viewscale = getviewsize(client.view)
+	return get_dist(src, A) <= max(viewscale[1]*0.5,viewscale[2]*0.5)

 /mob/living/silicon/ai/proc/relay_speech(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
 	raw_message = lang_treat(speaker, message_language, raw_message, spans, message_mode)
@@ -114,12 +114,14 @@

 	. = ..()

+	var/datum/action/innate/pai/software/SW = new
 	var/datum/action/innate/pai/shell/AS = new /datum/action/innate/pai/shell
 	var/datum/action/innate/pai/chassis/AC = new /datum/action/innate/pai/chassis
 	var/datum/action/innate/pai/rest/AR = new /datum/action/innate/pai/rest
 	var/datum/action/innate/pai/light/AL = new /datum/action/innate/pai/light

 	var/datum/action/language_menu/ALM = new
+	SW.Grant(src)
 	AS.Grant(src)
 	AC.Grant(src)
 	AR.Grant(src)
@@ -200,6 +202,15 @@
 		return 0
 	P = owner

+/datum/action/innate/pai/software
+	name = "Software Interface"
+	button_icon_state = "pai"
+	background_icon_state = "bg_tech"
+
+/datum/action/innate/pai/software/Trigger()
+	..()
+	P.paiInterface()
+
 /datum/action/innate/pai/shell
 	name = "Toggle Holoform"
 	button_icon_state = "pai_holoform"
@@ -22,9 +22,7 @@
 															"remote signaller" = 5,
 															)

-/mob/living/silicon/pai/verb/paiInterface()
-	set category = "pAI Commands"
-	set name = "Software Interface"
+/mob/living/silicon/pai/proc/paiInterface()
 	var/dat = ""
 	var/left_part = ""
 	var/right_part = softwareMenu()
@@ -1,21 +1,21 @@
-/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0)
-	if(ionpulse())
-		return 1
-	return ..()
-
-/mob/living/silicon/robot/movement_delay()
-	. = ..()
-	var/static/config_robot_delay
-	if(isnull(config_robot_delay))
-		config_robot_delay = CONFIG_GET(number/robot_delay)
-	. += speed + config_robot_delay
-
-/mob/living/silicon/robot/mob_negates_gravity()
-	return magpulse
-
-/mob/living/silicon/robot/mob_has_gravity()
-	return ..() || mob_negates_gravity()
-
-/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
-	if(!magpulse)
-		return ..()
+/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0)
+	if(ionpulse())
+		return 1
+	return ..()
+
+/mob/living/silicon/robot/movement_delay()
+	. = ..()
+	var/static/config_robot_delay
+	if(isnull(config_robot_delay))
+		config_robot_delay = CONFIG_GET(number/robot_delay)
+	. += speed + config_robot_delay
+
+/mob/living/silicon/robot/mob_negates_gravity()
+	return magpulse
+
+/mob/living/silicon/robot/mob_has_gravity()
+	return ..() || mob_negates_gravity()
+
+/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
+	if(!magpulse)
+		return ..()
@@ -10,14 +10,14 @@
 		var/mob/living/silicon/S = src
 		desig = trim_left(S.designation + " " + S.job)
 	var/message_a = say_quote(message, get_spans())
-	var/rendered = "<span class='binarysay'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
+	var/rendered = "Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span>"
 	for(var/mob/M in GLOB.player_list)
 		if(M.binarycheck())
 			if(isAI(M))
 				var/renderedAI = "<span class='binarysay'>Robotic Talk, <a href='?src=[REF(M)];track=[html_encode(name)]'><span class='name'>[name] ([desig])</span></a> <span class='message'>[message_a]</span></span>"
 				to_chat(M, renderedAI)
 			else
-				to_chat(M, rendered)
+				to_chat(M, "<span class='binarysay'>[rendered]</span>")
 		if(isobserver(M))
 			var/following = src
 			// If the AI talks on binary chat, we still want to follow
@@ -26,7 +26,7 @@
 				var/mob/living/silicon/ai/ai = src
 				following = ai.eyeobj
 			var/link = FOLLOW_LINK(M, following)
-			to_chat(M, "[link] [rendered]")
+			to_chat(M, "<span class='binarysay'>[link] [rendered]</span>")

 /mob/living/silicon/binarycheck()
 	return 1
@@ -9,8 +9,8 @@
 	gender = MALE
 	speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
 	speak_emote = list("purrs", "meows")
-	emote_hear = list("meows", "mews")
-	emote_see = list("shakes its head", "shivers")
+	emote_hear = list("meows.", "mews.")
+	emote_see = list("shakes its head.", "shivers.")
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
@@ -22,7 +22,7 @@
 	unsuitable_atmos_damage = 1
 	animal_species = /mob/living/simple_animal/pet/cat
 	childtype = list(/mob/living/simple_animal/pet/cat/kitten)
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/item/organ/ears/cat = 1, /obj/item/organ/tail/cat = 1)
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -46,7 +46,7 @@
 	if(client)
 		client.click_intercept = null

-		client.change_view(world.view) // Resets the client.view in case it was changed.
+		client.change_view(CONFIG_GET(string/default_view)) // Resets the client.view in case it was changed.

 	if(!GLOB.individual_log_list[ckey])
 		GLOB.individual_log_list[ckey] = logging
@@ -2,7 +2,7 @@
 //
 // consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/light)

-
+#define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick
 // status values shared between lighting fixtures and items
 #define LIGHT_OK 0
 #define LIGHT_EMPTY 1
@@ -284,7 +284,6 @@
 	return ..()

 /obj/machinery/light/update_icon()
-
 	switch(status)		// set icon_states
 		if(LIGHT_OK)
 			if(emergency_mode)
@@ -293,18 +292,17 @@
 				icon_state = "[base_state][on]"
 		if(LIGHT_EMPTY)
 			icon_state = "[base_state]-empty"
-			on = FALSE
 		if(LIGHT_BURNED)
 			icon_state = "[base_state]-burned"
-			on = FALSE
 		if(LIGHT_BROKEN)
 			icon_state = "[base_state]-broken"
-			on = FALSE
 	return

 // update the icon_state and luminosity of the light depending on its state
 /obj/machinery/light/proc/update(trigger = 1)
-
+	switch(status)
+		if(LIGHT_BROKEN,LIGHT_BURNED,LIGHT_EMPTY)
+			on = FALSE
 	emergency_mode = FALSE
 	if(on)
 		if(!light || light.light_range != brightness)
@@ -318,7 +316,7 @@
 			else
 				use_power = ACTIVE_POWER_USE
 				set_light(brightness, 1, "#FFFFFF")
-	else if(has_emergency_power() && !turned_off())
+	else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off())
 		use_power = IDLE_POWER_USE
 		emergency_mode = TRUE
 	else
@@ -338,8 +336,8 @@

 /obj/machinery/light/process()
 	if(has_power() && cell)
-		cell.charge = min(cell.maxcharge, cell.charge + 0.2) //Recharge emergency power automatically while not using it
-	if(emergency_mode && !use_emergency_power(0.2))
+		cell.charge = min(cell.maxcharge, cell.charge + LIGHT_EMERGENCY_POWER_USE) //Recharge emergency power automatically while not using it
+	if(emergency_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE))
 		update(FALSE) //Disables emergency mode and sets the color to normal

 /obj/machinery/light/proc/burn_out()
@@ -494,7 +492,7 @@
 // if a light is turned off, it won't activate emergency power
 /obj/machinery/light/proc/turned_off()
 	var/area/A = get_area(src)
-	return !A.lightswitch && A.power_light
+	return !A.lightswitch && A.power_light || !flickering

 // returns whether this light has power
 // true if area has power and lightswitch is on
@@ -511,7 +509,7 @@
 		return status == LIGHT_OK

 // attempts to use power from the installed emergency cell, returns true if it does and false if it doesn't
-/obj/machinery/light/proc/use_emergency_power(pwr = 0.2)
+/obj/machinery/light/proc/use_emergency_power(pwr = LIGHT_EMERGENCY_POWER_USE)
 	if(!has_emergency_power(pwr))
 		return FALSE
 	if(cell.charge > 300) //it's meant to handle 120 W, ya doofus
@@ -678,7 +676,7 @@
 	force = 2
 	throwforce = 5
 	w_class = WEIGHT_CLASS_TINY
-	var/status = 0		// LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
+	var/status = LIGHT_OK		// LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
 	var/base_state
 	var/switchcount = 0	// number of times switched
 	materials = list(MAT_GLASS=100)
@@ -761,7 +759,7 @@

 /obj/item/light/proc/shatter()
 	if(status == LIGHT_OK || status == LIGHT_BURNED)
-		src.visible_message("<span class='danger'>[name] shatters.</span>","<span class='italics'>You hear a small glass object shatter.</span>")
+		visible_message("<span class='danger'>[name] shatters.</span>","<span class='italics'>You hear a small glass object shatter.</span>")
 		status = LIGHT_BROKEN
 		force = 5
 		playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
@@ -335,7 +335,7 @@
 		buckled_mob.pixel_x = 0
 		buckled_mob.pixel_y = 0
 		if(buckled_mob.client)
-			buckled_mob.client.change_view(world.view)
+			buckled_mob.client.change_view(CONFIG_GET(string/default_view))
 	auto.Remove(buckled_mob)
 	. = ..()

@@ -500,7 +500,7 @@
 		user.client.pixel_x = world.icon_size*_x
 		user.client.pixel_y = world.icon_size*_y
 	else
-		user.client.change_view(world.view)
+		user.client.change_view(CONFIG_GET(string/default_view))
 		user.client.pixel_x = 0
 		user.client.pixel_y = 0
 	return zoomed
@@ -223,7 +223,7 @@

 /obj/item/gun/ballistic/automatic/ar
 	name = "\improper NT-ARG 'Boarder'"
-	desc = "A robust assault rile used by Nanotrasen fighting forces."
+	desc = "A robust assault rifle used by Nanotrasen fighting forces."
 	icon_state = "arg"
 	item_state = "arg"
 	slot_flags = 0
@@ -179,7 +179,7 @@
 	zoom_animating = 0
 	animate(current_user.client, pixel_x = 0, pixel_y = 0, 0, FALSE, LINEAR_EASING, ANIMATION_END_NOW)
 	zoom_current_view_increase = 0
-	current_user.client.change_view(world.view)
+	current_user.client.change_view(CONFIG_GET(string/default_view))
 	zooming_angle = 0
 	current_zoom_x = 0
 	current_zoom_y = 0
@@ -358,8 +358,8 @@
 	if(lastfire > world.time + delay)
 		return
 	lastfire = world.time
+	. = ..()
 	stop_aiming()
-	return ..()

 /obj/item/gun/energy/beam_rifle/proc/sync_ammo()
 	for(var/obj/item/ammo_casing/energy/beam_rifle/AC in contents)
@@ -59,6 +59,11 @@
 	recharge()
 	dispensable_reagents = sortList(dispensable_reagents)

+/obj/machinery/chem_dispenser/Destroy()
+	QDEL_NULL(beaker)
+	QDEL_NULL(cell)
+	return ..()
+
 /obj/machinery/chem_dispenser/process()

 	if(recharged < 0)
@@ -303,6 +308,7 @@
 	if(beaker)
 		beaker.forceMove(drop_location())
 		beaker = null
+	return ..()

 /obj/machinery/chem_dispenser/drinks
 	name = "soda dispenser"
@@ -13,6 +13,28 @@
 	var/heater_coefficient = 0.1
 	var/on = FALSE

+/obj/machinery/chem_heater/Destroy()
+	QDEL_NULL(beaker)
+	return ..()
+
+/obj/machinery/chem_heater/handle_atom_del(atom/A)
+	. = ..()
+	if(A == beaker)
+		beaker = null
+		update_icon()
+
+/obj/machinery/chem_heater/update_icon()
+	if(beaker)
+		icon_state = "mixer1b"
+	else
+		icon_state = "mixer0b"
+
+/obj/machinery/chem_heater/proc/eject_beaker()
+	if(beaker)
+		beaker.forceMove(drop_location())
+		beaker = null
+		update_icon()
+
 /obj/machinery/chem_heater/RefreshParts()
 	heater_coefficient = 0.1
 	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
@@ -52,12 +74,13 @@
 			return
 		beaker = I
 		to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
-		icon_state = "mixer1b"
+		update_icon()
 		return
 	return ..()

 /obj/machinery/chem_heater/on_deconstruction()
 	eject_beaker()
+	return ..()

 /obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
@@ -108,10 +131,3 @@
 			on = FALSE
 			eject_beaker()
 			. = TRUE
-
-/obj/machinery/chem_heater/proc/eject_beaker()
-	if(beaker)
-		beaker.forceMove(drop_location())
-		beaker.reagents.handle_reactions()
-		beaker = null
-		icon_state = "mixer0b"
@@ -13,7 +13,7 @@
 	var/obj/item/reagent_containers/beaker = null
 	var/obj/item/storage/pill_bottle/bottle = null
 	var/mode = 1
-	var/condi = 0
+	var/condi = FALSE
 	var/screen = "home"
 	var/analyzeVars[0]
 	var/useramount = 30 // Last used amount
@@ -23,6 +23,11 @@
 	add_overlay("waitlight")
 	. = ..()

+/obj/machinery/chem_master/Destroy()
+	QDEL_NULL(beaker)
+	QDEL_NULL(bottle)
+	return ..()
+
 /obj/machinery/chem_master/RefreshParts()
 	reagents.maximum_volume = 0
 	for(var/obj/item/reagent_containers/glass/beaker/B in component_parts)
@@ -44,10 +49,22 @@
 	if(A == beaker)
 		beaker = null
 		reagents.clear_reagents()
-		icon_state = "mixer0"
+		update_icon()
 	else if(A == bottle)
 		bottle = null

+/obj/machinery/chem_master/update_icon()
+	if(beaker)
+		icon_state = "mixer1"
+	else
+		icon_state = "mixer0"
+
+/obj/machinery/chem_master/proc/eject_beaker()
+	if(beaker)
+		beaker.forceMove(drop_location())
+		adjust_item_drop_location(beaker)
+		beaker = null
+		update_icon()

 /obj/machinery/chem_master/blob_act(obj/structure/blob/B)
 	if (prob(50))
@@ -61,15 +78,6 @@

 /obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
-		if(beaker)
-			beaker.forceMove(drop_location())
-			adjust_item_drop_location(beaker)
-			beaker = null
-			reagents.clear_reagents()
-		if(bottle)
-			bottle.forceMove(drop_location())
-			adjust_item_drop_location(bottle)
-			bottle = null
 		return

 	else if(exchange_parts(user, I))
@@ -94,7 +102,7 @@
 		beaker = I
 		to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
 		src.updateUsrDialog()
-		icon_state = "mixer1"
+		update_icon()

 	else if(!condi && istype(I, /obj/item/storage/pill_bottle))
 		if(bottle)
@@ -109,6 +117,13 @@
 	else
 		return ..()

+/obj/machinery/chem_master/on_deconstruction()
+	eject_beaker()
+	if(bottle)
+		bottle.forceMove(drop_location())
+		adjust_item_drop_location(bottle)
+		bottle = null
+	return ..()

 /obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
@@ -154,13 +169,8 @@
 		return
 	switch(action)
 		if("eject")
-			if(beaker)
-				beaker.forceMove(drop_location())
-				adjust_item_drop_location(beaker)
-				beaker = null
-				reagents.clear_reagents()
-				icon_state = "mixer0"
-				. = TRUE
+			eject_beaker()
+			. = TRUE

 		if("ejectp")
 			if(bottle)
@@ -348,7 +358,7 @@
 			#if DM_VERSION >= 513
 			#warning 512 is definitely stable now, remove the old code
 			#endif
-			
+
 			#if DM_VERSION >= 512
 			. += hex2num(md5[i])
 			#else
@@ -361,4 +371,4 @@
 /obj/machinery/chem_master/condimaster
 	name = "CondiMaster 3000"
 	desc = "Used to create condiments and other cooking supplies."
-	condi = 1
+	condi = TRUE
@@ -25,6 +25,12 @@
 	QDEL_NULL(beaker)
 	return ..()

+/obj/machinery/computer/pandemic/handle_atom_del(atom/A)
+	. = ..()
+	if(A == beaker)
+		beaker = null
+		update_icon()
+
 /obj/machinery/computer/pandemic/proc/get_by_index(thing, index)
 	if(!beaker || !beaker.reagents)
 		return
@@ -121,9 +127,10 @@
 		add_overlay("waitlight")

 /obj/machinery/computer/pandemic/proc/eject_beaker()
-	beaker.forceMove(drop_location())
-	beaker = null
-	update_icon()
+	if(beaker)
+		beaker.forceMove(drop_location())
+		beaker = null
+		update_icon()

 /obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -159,8 +166,7 @@
 		return
 	switch(action)
 		if("eject_beaker")
-			if(beaker)
-				eject_beaker()
+			eject_beaker()
 			. = TRUE
 		if("empty_beaker")
 			if(beaker)
@@ -236,7 +242,5 @@
 		return ..()

 /obj/machinery/computer/pandemic/on_deconstruction()
-	if(beaker)
-		beaker.forceMove(drop_location())
-		beaker = null
+	eject_beaker()
 	. = ..()
@@ -109,7 +109,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
 	glass_icon_state = "kahluaglass"
-	glass_name = "glass of RR Coffee Liquor"
+	glass_name = "glass of RR coffee liquor"
 	glass_desc = "DAMN, THIS THING LOOKS ROBUST!"
 	shot_glass_icon_state = "shotglasscream"

@@ -341,7 +341,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 25
 	taste_description = "burning cinnamon"
 	glass_icon_state = "goldschlagerglass"
-	glass_name = "glass of Goldschlager"
+	glass_name = "glass of goldschlager"
 	glass_desc = "100% proof that teen girls will drink anything with gold in it."
 	shot_glass_icon_state = "shotglassgold"

@@ -396,7 +396,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 70
 	taste_description = "cola"
 	glass_icon_state = "whiskeycolaglass"
-	glass_name = "Whiskey Cola"
+	glass_name = "whiskey cola"
 	glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."

 /datum/reagent/consumable/ethanol/martini
@@ -706,7 +706,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 70
 	taste_description = "soda"
 	glass_icon_state = "whiskeysodaglass2"
-	glass_name = "Whiskey Soda"
+	glass_name = "whiskey soda"
 	glass_desc = "Ultimate refreshment."

 /datum/reagent/consumable/ethanol/antifreeze
@@ -785,7 +785,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 70
 	taste_description = "tart bitterness"
 	glass_icon_state = "vodkatonicglass"
-	glass_name = "Vodka and Tonic"
+	glass_name = "vodka and tonic"
 	glass_desc = "For when a gin and tonic isn't Russian enough."


@@ -797,7 +797,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 45
 	taste_description = "dry, tart lemons"
 	glass_icon_state = "ginfizzglass"
-	glass_name = "Gin Fizz"
+	glass_name = "gin fizz"
 	glass_desc = "Refreshingly lemony, deliciously dry."


@@ -870,7 +870,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 15
 	taste_description = "refreshingly cold"
 	glass_icon_state = "iced_beerglass"
-	glass_name = "Iced Beer"
+	glass_name = "iced beer"
 	glass_desc = "A beer so frosty, the air around it freezes."

 /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
@@ -1069,7 +1069,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 35
 	taste_description = "sour lemons"
 	glass_icon_state = "whiskey_sour"
-	glass_name = "Whiskey Sour"
+	glass_name = "whiskey sour"
 	glass_desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying."

 /datum/reagent/consumable/ethanol/hcider
@@ -1081,7 +1081,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 25
 	taste_description = "apples"
 	glass_icon_state = "whiskeyglass"
-	glass_name = "Hard Cider"
+	glass_name = "hard cider"
 	glass_desc = "Tastes like autumn."
 	shot_glass_icon_state = "shotglassbrown"

@@ -1279,5 +1279,5 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 1
 	taste_description = "custard and alcohol"
 	glass_icon_state = "glass_yellow"
-	glass_name = "Eggnog"
+	glass_name = "eggnog"
 	glass_desc = "For enjoying the most wonderful time of the year."
@@ -148,7 +148,7 @@
 	description = "Absolutely nothing."
 	taste_description = "nothing"
 	glass_icon_state = "nothing"
-	glass_name = "Nothing"
+	glass_name = "nothing"
 	glass_desc = "Absolutely nothing."
 	shot_glass_icon_state = "shotglass"

@@ -319,7 +319,7 @@
 	nutriment_factor = 0
 	taste_description = "bitter coldness"
 	glass_icon_state = "icedcoffeeglass"
-	glass_name = "Iced Coffee"
+	glass_name = "iced coffee"
 	glass_desc = "A drink to perk you up and refresh you!"

 /datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M)
@@ -340,7 +340,7 @@
 	nutriment_factor = 0
 	taste_description = "sweet tea"
 	glass_icon_state = "icedteaglass"
-	glass_name = "Iced Tea"
+	glass_name = "iced tea"
 	glass_desc = "All natural, antioxidant-rich flavour sensation."

 /datum/reagent/consumable/icetea/on_mob_life(mob/living/M)
@@ -361,7 +361,7 @@
 	color = "#100800" // rgb: 16, 8, 0
 	taste_description = "cola"
 	glass_icon_state  = "glass_brown"
-	glass_name = "glass of space Cola"
+	glass_name = "glass of Space Cola"
 	glass_desc = "A glass of refreshing Space Cola."

 /datum/reagent/consumable/space_cola/on_mob_life(mob/living/M)
@@ -377,7 +377,7 @@
 	color = "#100800" // rgb: 16, 8, 0
 	taste_description = "the future"
 	glass_icon_state = "nuka_colaglass"
-	glass_name = "Nuka Cola"
+	glass_name = "glass of Nuka Cola"
 	glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."

 /datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M)
@@ -434,7 +434,7 @@
 	color = "#00FF00" // rgb: 0, 255, 0
 	taste_description = "cherry soda"
 	glass_icon_state = "space-up_glass"
-	glass_name = "glass of Space-up"
+	glass_name = "glass of Space-Up"
 	glass_desc = "Space-up. It helps you keep your cool."


@@ -450,7 +450,7 @@
 	color = "#8CFF00" // rgb: 135, 255, 0
 	taste_description = "tangy lime and lemon soda"
 	glass_icon_state = "glass_yellow"
-	glass_name = "glass of Lemon-Lime"
+	glass_name = "glass of lemon-lime"
 	glass_desc = "You're pretty certain a real fruit has never actually touched this."


@@ -481,7 +481,7 @@
 	color = "#f00060" // rgb: 94, 0, 38
 	taste_description = "carbonated metallic soda"
 	glass_icon_state = "glass_red"
-	glass_name = "glass of Shambler's Juice"
+	glass_name = "glass of Shambler's juice"
 	glass_desc = "Mmm mm, shambly."

 /datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
@@ -495,7 +495,7 @@
 	color = "#619494" // rgb: 97, 148, 148
 	taste_description = "carbonated water"
 	glass_icon_state = "glass_clear"
-	glass_name = "glass of Soda Water"
+	glass_name = "glass of soda water"
 	glass_desc = "Soda water. Why not make a scotch and soda?"

 /datum/reagent/consumable/sodawater/on_mob_life(mob/living/M)
@@ -512,7 +512,7 @@
 	color = "#0064C8" // rgb: 0, 100, 200
 	taste_description = "tart and fresh"
 	glass_icon_state = "glass_clear"
-	glass_name = "glass of Tonic Water"
+	glass_name = "glass of tonic water"
 	glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."

 /datum/reagent/consumable/tonic/on_mob_life(mob/living/M)
@@ -546,7 +546,7 @@
 	color = "#664300" // rgb: 102, 67, 0
 	taste_description = "creamy coffee"
 	glass_icon_state = "soy_latte"
-	glass_name = "Soy Latte"
+	glass_name = "soy latte"
 	glass_desc = "A nice and refreshing beverage while you're reading."

 /datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M)
@@ -568,7 +568,7 @@
 	color = "#664300" // rgb: 102, 67, 0
 	taste_description = "bitter cream"
 	glass_icon_state = "cafe_latte"
-	glass_name = "Cafe Latte"
+	glass_name = "cafe latte"
 	glass_desc = "A nice, strong and refreshing beverage while you're reading."

 /datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M)
@@ -612,7 +612,7 @@
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "sweet chocolate"
 	glass_icon_state = "chocolatepudding"
-	glass_name = "Chocolate Pudding"
+	glass_name = "chocolate pudding"
 	glass_desc = "Tasty."

 /datum/reagent/consumable/vanillapudding
@@ -623,7 +623,7 @@
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "sweet vanilla"
 	glass_icon_state = "vanillapudding"
-	glass_name = "Vanilla Pudding"
+	glass_name = "vanilla pudding"
 	glass_desc = "Tasty."

 /datum/reagent/consumable/cherryshake
@@ -634,7 +634,7 @@
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "creamy cherry"
 	glass_icon_state = "cherryshake"
-	glass_name = "Cherry Shake"
+	glass_name = "cherry shake"
 	glass_desc = "A cherry flavored milkshake."

 /datum/reagent/consumable/bluecherryshake
@@ -645,7 +645,7 @@
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "creamy blue cherry"
 	glass_icon_state = "bluecherryshake"
-	glass_name = "Blue Cherry Shake"
+	glass_name = "blue cherry shake"
 	glass_desc = "An exotic blue milkshake."

 /datum/reagent/consumable/pumpkin_latte
@@ -656,7 +656,7 @@
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	taste_description = "creamy pumpkin"
 	glass_icon_state = "pumpkin_latte"
-	glass_name = "Pumpkin Latte"
+	glass_name = "pumpkin latte"
 	glass_desc = "A mix of coffee and pumpkin juice."

 /datum/reagent/consumable/gibbfloats
@@ -117,7 +117,7 @@
 	taste_description = "water"
 	var/cooling_temperature = 2
 	glass_icon_state = "glass_clear"
-	glass_name = "glass of Water"
+	glass_name = "glass of water"
 	glass_desc = "The father of all refreshments."
 	shot_glass_icon_state = "shotglassclear"

@@ -188,7 +188,7 @@
 	description = "Water blessed by some deity."
 	color = "#E0E8EF" // rgb: 224, 232, 239
 	glass_icon_state  = "glass_clear"
-	glass_name = "glass of Holy Water"
+	glass_name = "glass of holy water"
 	glass_desc = "A glass of holy water."

 /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -139,7 +139,6 @@
 /datum/chemical_reaction/reagent_explosion/methsplosion
 	name = "Meth explosion"
 	id = "methboom1"
-	results = list("methboom1" = 1)
 	required_temp = 380 //slightly above the meth mix time.
 	required_reagents = list("methamphetamine" = 1)
 	strengthdiv = 6
@@ -154,9 +153,9 @@
 	..()

 /datum/chemical_reaction/reagent_explosion/methsplosion/methboom2
+	id = "methboom2"
 	required_reagents = list("diethylamine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1) //diethylamine is often left over from mixing the ephedrine.
-	required_temp = 300 //room temperature, chilling it even a little will prevent the explosion 
-	results = list("methboom1" = 4) // this is ugly. Sorry goof.
+	required_temp = 300 //room temperature, chilling it even a little will prevent the explosion

 /datum/chemical_reaction/sorium
 	name = "Sorium"
@@ -40,6 +40,9 @@
 		if(51 to INFINITY)
 			icon_state = "full"

+/obj/item/reagent_containers/blood/random
+	icon_state = "random_bloodpack"
+
 /obj/item/reagent_containers/blood/random/Initialize()
 	blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
 	. = ..()
@@ -30,7 +30,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	var/datum/component/material_container/materials

 /obj/machinery/r_n_d/circuit_imprinter/Initialize()
-	materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE),
+	materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), 0,
 		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
 	materials.precise_insertion = TRUE
 	create_reagents(0)
@@ -800,6 +800,13 @@
 	build_path = /obj/item/device/slime_scanner
 	category = list("initial", "Misc")

+/datum/design/pet_carrier
+	name = "Pet Carrier"
+	id = "pet_carrier"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 7500, MAT_GLASS = 100)
+	build_path = /obj/item/pet_carrier
+
 /datum/design/miniature_power_cell
 	name = "Light Fixture Battery"
 	id = "miniature_power_cell"
@@ -30,11 +30,13 @@ Note: Must be placed west/left of and R&D console to function.
 								"Computer Parts"
 								)

+	var/datum/component/material_container/materials
+

 /obj/machinery/r_n_d/protolathe/Initialize()
 	create_reagents(0)
-	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
-		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
+	materials = AddComponent(/datum/component/material_container,
+		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0,
 		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
 	materials.precise_insertion = TRUE
 	return ..()
@@ -12,7 +12,7 @@

 /mob/camera/aiEye/remote/xenobio/setLoc(var/t)
 	var/area/new_area = get_area(t)
-	if(new_area && new_area.name == allowed_area || istype(new_area, /area/science/xenobiology ))
+	if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible)
 		return ..()
 	else
 		return
@@ -508,14 +508,14 @@

 /obj/item/areaeditor/blueprints/slime
 	name = "cerulean prints"
-	desc = "A one use yet of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console."
+	desc = "A one use yet of blueprints made of jelly like organic material. Extends the reach of the management console."
 	color = "#2956B2"

 /obj/item/areaeditor/blueprints/slime/edit_area()
-	var/success = ..()
+	..()
 	var/area/A = get_area(src)
-	if(success)
-		for(var/turf/T in A)
-			T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			T.add_atom_colour("#2956B2", FIXED_COLOUR_PRIORITY)
-		qdel(src)
+	for(var/turf/T in A)
+		T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+		T.add_atom_colour("#2956B2", FIXED_COLOUR_PRIORITY)
+	A.xenobiology_compatible = TRUE
+	qdel(src)
@@ -69,7 +69,7 @@
 		var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
 		user.client.images -= the_eye.placement_images
 		user.client.images -= the_eye.placed_images
-		user.client.change_view(world.view)
+		user.client.change_view(CONFIG_GET(string/default_view))

 /obj/machinery/computer/camera_advanced/shuttle_docker/proc/placeLandingSpot()
 	if(!checkLandingSpot())
@@ -92,7 +92,7 @@ All ShuttleMove procs go here
 	return TRUE

 // Called on atoms after everything has been moved
-/atom/movable/proc/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/atom/movable/proc/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	if(light)
 		update_light()
 	if(rotation)
@@ -148,7 +148,7 @@ All ShuttleMove procs go here
 		A.air_tight = TRUE
 		INVOKE_ASYNC(A, /obj/machinery/door/.proc/close)

-/obj/machinery/door/airlock/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	shuttledocked =  1
 	for(var/obj/machinery/door/airlock/A in range(1, src))
@@ -160,24 +160,24 @@ All ShuttleMove procs go here
 		. |= MOVE_CONTENTS
 		GLOB.cameranet.removeCamera(src)

-/obj/machinery/camera/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/camera/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	GLOB.cameranet.addCamera(src)

-/obj/machinery/telecomms/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/telecomms/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	listening_level = z // Update listening Z, just in case you have telecomm relay on a shuttle

-/obj/machinery/mech_bay_recharge_port/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/mech_bay_recharge_port/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
 	. = ..()
 	recharging_turf = get_step(loc, dir)

-/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	if(pipe_vision_img)
 		pipe_vision_img.loc = loc

-/obj/machinery/computer/auxillary_base/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/computer/auxillary_base/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery
 		SSblackbox.record_feedback("associative", "colonies_dropped", 1, list("x" = x, "y" = y, "z" = z))
@@ -187,7 +187,7 @@ All ShuttleMove procs go here
 	on = FALSE
 	update_list()

-/obj/machinery/gravity_generator/main/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/gravity_generator/main/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	if(charge_count != 0 && charging_state != POWER_UP)
 		on = TRUE
@@ -198,7 +198,7 @@ All ShuttleMove procs go here
 	if(. & MOVE_AREA)
 		. |= MOVE_CONTENTS

-/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	var/missing_nodes = FALSE
 	for(DEVICE_TYPE_LOOP)
@@ -227,7 +227,7 @@ All ShuttleMove procs go here
 		// atmosinit() calls update_icon(), so we don't need to call it
 		update_icon()

-/obj/machinery/atmospherics/pipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/atmospherics/pipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	var/turf/T = loc
 	hide(T.intact)
@@ -237,7 +237,7 @@ All ShuttleMove procs go here
 	GLOB.navbeacons["[z]"] -= src
 	GLOB.deliverybeacons -= src

-/obj/machinery/navbeacon/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/navbeacon/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	var/turf/T = loc
 	hide(T.intact)
@@ -249,7 +249,7 @@ All ShuttleMove procs go here
 		GLOB.deliverybeacons += src
 		GLOB.deliverybeacontags += location

-/obj/machinery/power/terminal/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/machinery/power/terminal/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	var/turf/T = src.loc
 	if(level==1)
@@ -257,7 +257,7 @@ All ShuttleMove procs go here

 /************************************Item move procs************************************/

-/obj/item/storage/pod/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/item/storage/pod/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	unlocked = TRUE
 	// If the pod was launched, the storage will always open.
@@ -269,7 +269,7 @@ All ShuttleMove procs go here
 		return
 	. = ..()

-/mob/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/mob/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	if(!move_on_shuttle)
 		return
 	. = ..()
@@ -279,7 +279,7 @@ All ShuttleMove procs go here
 			shake_force *= 0.25
 		shake_camera(src, shake_force, 1)

-/mob/living/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/mob/living/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	if(movement_force && !buckled)
 		if(movement_force["THROW"])
@@ -307,11 +307,11 @@ All ShuttleMove procs go here
 	if(. & MOVE_AREA)
 		. |= MOVE_CONTENTS

-/obj/structure/disposalpipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/structure/disposalpipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	update()

-/obj/structure/cable/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/obj/structure/cable/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	var/turf/T = loc
 	if(level==1)
@@ -631,7 +631,7 @@
 				if(moving_atom.loc != oldT) //fix for multi-tile objects
 					continue
 				moving_atom.onShuttleMove(newT, oldT, movement_force, movement_direction, old_dock, src)	//atoms
-				moved_atoms += moving_atom
+				moved_atoms[moving_atom] = oldT
 		
 		if(move_mode & MOVE_TURF)
 			oldT.onShuttleMove(newT, movement_force, movement_direction)									//turfs
@@ -665,7 +665,10 @@
 	for(var/i in 1 to moved_atoms.len)
 		CHECK_TICK
 		var/atom/movable/moved_object = moved_atoms[i]
-		moved_object.afterShuttleMove(movement_force, dir, preferred_direction, movement_direction, rotation)//atoms
+		if(QDELETED(moved_object))
+			continue
+		var/turf/oldT = moved_atoms[moved_object]
+		moved_object.afterShuttleMove(oldT, movement_force, dir, preferred_direction, movement_direction, rotation)//atoms

 	for(var/i in 1 to old_turfs.len)
 		CHECK_TICK
@@ -28,7 +28,8 @@
 	var/safe_toxins_max = 0.05
 	var/SA_para_min = 1 //Sleeping agent
 	var/SA_sleep_min = 5 //Sleeping agent
-	var/BZ_trip_balls_min = 1 //BZ gas.
+	var/BZ_trip_balls_min = 1 //BZ gas
+	var/gas_stimulation_min = 0.002 //Nitryl and Stimulum

 	var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
 	var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
@@ -274,14 +275,14 @@
 		else
 			H.adjustFireLoss(nitryl_pp/4)
 		gas_breathed = breath_gases[/datum/gas/nitryl][MOLES]
-		if (gas_breathed > GAS_STIM_MINIMUM)
+		if (gas_breathed > gas_stimulation_min)
 			H.reagents.add_reagent("nitryl_gas",1)

 		breath_gases[/datum/gas/nitryl][MOLES]-=gas_breathed
 		gas_breathed = 0
 	// Stimulum
 		gas_breathed = breath_gases[/datum/gas/stimulum][MOLES]
-		if (gas_breathed > GAS_STIM_MINIMUM)
+		if (gas_breathed > gas_stimulation_min)
 			H.reagents.add_reagent("stimulum",1)
 		breath_gases[/datum/gas/stimulum][MOLES]-=gas_breathed
 		handle_breath_temperature(breath, H)
@@ -41,21 +41,21 @@ Notes:

 /datum/tooltip/New(client/C)
 	if (C)
-		src.owner = C
-		src.owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[src.control]")
+		owner = C
+		owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]")

 	..()


 /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none")
-	if (!thing || !params || (!title && !content) || !src.owner || !isnum(world.icon_size))
+	if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size))
 		return 0
-	if (!src.init)
+	if (!init)
 		//Initialize some vars
-		src.init = 1
-		src.owner << output(list2params(list(world.icon_size, src.control)), "[src.control]:tooltip.init")
+		init = 1
+		owner << output(list2params(list(world.icon_size, control)), "[control]:tooltip.init")

-	src.showing = 1
+	showing = 1

 	if (title && content)
 		title = "<h1>[title]</h1>"
@@ -73,18 +73,19 @@ Notes:
 	params = {"{ "cursor": "[params]", "screenLoc": "[thing.screen_loc]" }"}

 	//Send stuff to the tooltip
-	src.owner << output(list2params(list(params, src.owner.view, "[title][content]", theme, special)), "[src.control]:tooltip.update")
+	var/view_size = getviewsize(owner.view)
+	owner << output(list2params(list(params, view_size[1] , view_size[2], "[title][content]", theme, special)), "[control]:tooltip.update")

 	//If a hide() was hit while we were showing, run hide() again to avoid stuck tooltips
-	src.showing = 0
-	if (src.queueHide)
-		src.hide()
+	showing = 0
+	if (queueHide)
+		hide()

 	return 1


 /datum/tooltip/proc/hide()
-	if (src.queueHide)
+	if (queueHide)
 		addtimer(CALLBACK(src, .proc/do_hide), 1)
 	else
 		do_hide()
@@ -99,7 +99,8 @@
 			'tileSize': 32,
 			'control': '',
 			'params': {},
-			'clientView': 0,
+			'client_view_w': 0,
+			'client_view_h': 0,
 			'text': '',
 			'theme': '',
 			'padding': 2,
@@ -121,7 +122,7 @@
 				//Get the real icon size according to the client view
 				var mapWidth 		= map['view-size'].x,
 					mapHeight 		= map['view-size'].y,
-					tilesShown 		= (tooltip.clientView * 2) + 1,
+					tilesShown 		= tooltip.client_view_w
 					realIconSize 	= mapWidth / tilesShown,
 					resizeRatio		= realIconSize / tooltip.tileSize,
 					//Calculate letterboxing offsets	
@@ -230,10 +231,11 @@
 					tooltip.hide();
 				});
 			},
-			update: function(params, clientView, text, theme, special) {
+			update: function(params, client_vw , clien_vh , text, theme, special) {
 				//Assign our global object
 				tooltip.params = $.parseJSON(params);
-				tooltip.clientView = parseInt(clientView);
+				tooltip.client_view_w = parseInt(client_vw);
+				tooltip.client_view_h = parseInt(clien_vh);
 				tooltip.text = text;
 				tooltip.theme = theme;
 				tooltip.special = special;
@@ -1,76 +1,76 @@
-/obj/vehicle/ridden
-	name = "ridden vehicle"
-	can_buckle = TRUE
-	max_buckled_mobs = 1
-	buckle_lying = FALSE
-	default_driver_move = FALSE
-	var/legs_required = 2
-	var/arms_requires = 0	//why not?
-
-/obj/vehicle/ridden/Initialize()
-	. = ..()
-	LoadComponent(/datum/component/riding)
-
-/obj/vehicle/ridden/examine(mob/user)
-	. = ..()
-	to_chat(user, "<span class='notice'>Put a key inside it by clicking it with the key. If there's a key inside, you can remove it via Alt-Click!</span>")
-
-/obj/vehicle/ridden/generate_action_type(actiontype)
-	var/datum/action/vehicle/ridden/A = ..()
-	. = A
-	if(istype(A))
-		A.vehicle_ridden_target = src
-
-/obj/vehicle/ridden/post_unbuckle_mob(mob/living/M)
-	remove_occupant(M)
-	return ..()
-
-/obj/vehicle/ridden/post_buckle_mob(mob/living/M)
-	add_occupant(M)
-	return ..()
-
-/obj/vehicle/ridden/attackby(obj/item/I, mob/user, params)
-	if(key_type && !is_key(inserted_key) && is_key(I))
-		if(user.transferItemToLoc(I, src))
-			to_chat(user, "<span class='notice'>You insert \the [I] into \the [src].</span>")
-			if(inserted_key)	//just in case there's an invalid key
-				inserted_key.forceMove(drop_location())
-			inserted_key = I
-		else
-			to_chat(user, "<span class='notice'>[I] seems to be stuck to your hand!</span>")
-		return
-	return ..()
-
-/obj/vehicle/ridden/AltClick(mob/user)
-	if(user.Adjacent(src) && inserted_key)
-		if(!is_occupant(user))
-			to_chat(user, "<span class='notice'>You must be riding the [src] to remove [src]'s key!</span>")
-			return
-		to_chat(user, "<span class='notice'>You remove \the [inserted_key] from \the [src].</span>")
-		inserted_key.forceMove(drop_location())
-		user.put_in_hands(inserted_key)
-		inserted_key = null
-	return ..()
-
-/obj/vehicle/ridden/driver_move(mob/user, direction)
-	if(key_type && !is_key(inserted_key))
-		to_chat(user, "<span class='warning'>[src] has no key inserted!</span>")
-		return FALSE
-	var/datum/component/riding/R = GetComponent(/datum/component/riding)
-	R.handle_ride(user, direction)
-	return ..()
-
-/obj/vehicle/ridden/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
-	if(user.incapacitated())
-		return
-	for(var/atom/movable/A in get_turf(src))
-		if(A.density)
-			if(A != src && A != M)
-				return
-	M.forceMove(get_turf(src))
-	. = ..()
-
-/obj/vehicle/ridden/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
-	if(!force && occupant_amount() >= max_occupants)
-		return FALSE
-	return ..()
+/obj/vehicle/ridden
+	name = "ridden vehicle"
+	can_buckle = TRUE
+	max_buckled_mobs = 1
+	buckle_lying = FALSE
+	default_driver_move = FALSE
+	var/legs_required = 2
+	var/arms_requires = 0	//why not?
+
+/obj/vehicle/ridden/Initialize()
+	. = ..()
+	LoadComponent(/datum/component/riding)
+
+/obj/vehicle/ridden/examine(mob/user)
+	. = ..()
+	to_chat(user, "<span class='notice'>Put a key inside it by clicking it with the key. If there's a key inside, you can remove it via Alt-Click!</span>")
+
+/obj/vehicle/ridden/generate_action_type(actiontype)
+	var/datum/action/vehicle/ridden/A = ..()
+	. = A
+	if(istype(A))
+		A.vehicle_ridden_target = src
+
+/obj/vehicle/ridden/post_unbuckle_mob(mob/living/M)
+	remove_occupant(M)
+	return ..()
+
+/obj/vehicle/ridden/post_buckle_mob(mob/living/M)
+	add_occupant(M)
+	return ..()
+
+/obj/vehicle/ridden/attackby(obj/item/I, mob/user, params)
+	if(key_type && !is_key(inserted_key) && is_key(I))
+		if(user.transferItemToLoc(I, src))
+			to_chat(user, "<span class='notice'>You insert \the [I] into \the [src].</span>")
+			if(inserted_key)	//just in case there's an invalid key
+				inserted_key.forceMove(drop_location())
+			inserted_key = I
+		else
+			to_chat(user, "<span class='notice'>[I] seems to be stuck to your hand!</span>")
+		return
+	return ..()
+
+/obj/vehicle/ridden/AltClick(mob/user)
+	if(user.Adjacent(src) && inserted_key)
+		if(!is_occupant(user))
+			to_chat(user, "<span class='notice'>You must be riding the [src] to remove [src]'s key!</span>")
+			return
+		to_chat(user, "<span class='notice'>You remove \the [inserted_key] from \the [src].</span>")
+		inserted_key.forceMove(drop_location())
+		user.put_in_hands(inserted_key)
+		inserted_key = null
+	return ..()
+
+/obj/vehicle/ridden/driver_move(mob/user, direction)
+	if(key_type && !is_key(inserted_key))
+		to_chat(user, "<span class='warning'>[src] has no key inserted!</span>")
+		return FALSE
+	var/datum/component/riding/R = GetComponent(/datum/component/riding)
+	R.handle_ride(user, direction)
+	return ..()
+
+/obj/vehicle/ridden/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
+	if(user.incapacitated())
+		return
+	for(var/atom/movable/A in get_turf(src))
+		if(A.density)
+			if(A != src && A != M)
+				return
+	M.forceMove(get_turf(src))
+	. = ..()
+
+/obj/vehicle/ridden/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
+	if(!force && occupant_amount() >= max_occupants)
+		return FALSE
+	return ..()
@@ -1,112 +1,112 @@
-//VEHICLE DEFAULT HANDLING
-/obj/vehicle/proc/generate_actions()
-	return
-
-/obj/vehicle/proc/generate_action_type(actiontype)
-	var/datum/action/vehicle/A = new actiontype
-	if(!istype(A))
-		return
-	A.vehicle_target = src
-	return A
-
-/obj/vehicle/proc/initialize_passenger_action_type(actiontype)
-	autogrant_actions_passenger += actiontype
-	for(var/i in occupants)
-		grant_passenger_actions(i)	//refresh
-
-/obj/vehicle/proc/initialize_controller_action_type(actiontype, control_flag)
-	LAZYINITLIST(autogrant_actions_controller["[control_flag]"])
-	autogrant_actions_controller["[control_flag]"] += actiontype
-	for(var/i in occupants)
-		grant_controller_actions(i)	//refresh
-
-/obj/vehicle/proc/grant_action_type_to_mob(actiontype, mob/m)
-	if(!occupants[m] || !actiontype)
-		return FALSE
-	LAZYINITLIST(occupant_actions[m])
-	if(occupant_actions[m][actiontype])
-		return TRUE
-	var/datum/action/action = generate_action_type(actiontype)
-	action.Grant(m)
-	occupant_actions[m][action.type] = action
-	return TRUE
-
-/obj/vehicle/proc/remove_action_type_from_mob(actiontype, mob/m)
-	if(!occupants[m] || !actiontype)
-		return FALSE
-	LAZYINITLIST(occupant_actions[m])
-	if(occupant_actions[m][actiontype])
-		var/datum/action/action = occupant_actions[m][actiontype]
-		action.Remove(m)
-		occupant_actions[m] -= actiontype
-	return TRUE
-
-/obj/vehicle/proc/grant_passenger_actions(mob/M)
-	for(var/v in autogrant_actions_passenger)
-		grant_action_type_to_mob(v, M)
-
-/obj/vehicle/proc/remove_passenger_actions(mob/M)
-	for(var/v in autogrant_actions_passenger)
-		remove_action_type_from_mob(v, M)
-
-/obj/vehicle/proc/grant_controller_actions(mob/M)
-	if(!istype(M) || !occupants[M])
-		return FALSE
-	for(var/i in GLOB.bitflags)
-		if(occupants[M] & i)
-			grant_controller_actions_by_flag(M, i)
-	return TRUE
-
-/obj/vehicle/proc/remove_controller_actions(mob/M)
-	if(!istype(M) || !occupants[M])
-		return FALSE
-	for(var/i in GLOB.bitflags)
-		remove_controller_actions_by_flag(M, i)
-	return TRUE
-
-/obj/vehicle/proc/grant_controller_actions_by_flag(mob/M, flag)
-	if(!istype(M) || !autogrant_actions_controller["[flag]"])
-		return FALSE
-	for(var/v in autogrant_actions_controller["[flag]"])
-		grant_action_type_to_mob(v, M)
-	return TRUE
-
-/obj/vehicle/proc/remove_controller_actions_by_flag(mob/M, flag)
-	if(!istype(M) || autogrant_actions_controller["[flag]"])
-		return FALSE
-	for(var/v in autogrant_actions_controller["[flag]"])
-		remove_action_type_from_mob(v, M)
-	return TRUE
-
-/obj/vehicle/proc/cleanup_actions_for_mob(mob/M)
-	if(!istype(M))
-		return FALSE
-	LAZYINITLIST(occupant_actions[M])
-	for(var/path in occupant_actions[M])
-		stack_trace("Leftover action type [path] in vehicle type [type] for mob type [M.type] - THIS SHOULD NOT BE HAPPENING!")
-		var/datum/action/action = occupant_actions[M]
-		action.Remove(M)
-	occupant_actions -= M
-	return TRUE
-
-//ACTION DATUMS
-
-/datum/action/vehicle
-	check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS
-	icon_icon = 'icons/mob/actions/actions_vehicle.dmi'
-	button_icon_state = "vehicle_eject"
-	var/obj/vehicle/vehicle_target
-
-/datum/action/vehicle/sealed
-	var/obj/vehicle/sealed/vehicle_entered_target
-
-/datum/action/vehicle/sealed/climb_out
-	name = "Climb Out"
-	desc = "Climb out of your vehicle!"
-
-/datum/action/vehicle/sealed/climb_out/Trigger()
-	if(..() && istype(vehicle_entered_target))
-		vehicle_entered_target.mob_try_exit(owner, owner)
-
-/datum/action/vehicle/ridden
-	var/obj/vehicle/ridden/vehicle_ridden_target
+//VEHICLE DEFAULT HANDLING
+/obj/vehicle/proc/generate_actions()
+	return
+
+/obj/vehicle/proc/generate_action_type(actiontype)
+	var/datum/action/vehicle/A = new actiontype
+	if(!istype(A))
+		return
+	A.vehicle_target = src
+	return A
+
+/obj/vehicle/proc/initialize_passenger_action_type(actiontype)
+	autogrant_actions_passenger += actiontype
+	for(var/i in occupants)
+		grant_passenger_actions(i)	//refresh
+
+/obj/vehicle/proc/initialize_controller_action_type(actiontype, control_flag)
+	LAZYINITLIST(autogrant_actions_controller["[control_flag]"])
+	autogrant_actions_controller["[control_flag]"] += actiontype
+	for(var/i in occupants)
+		grant_controller_actions(i)	//refresh
+
+/obj/vehicle/proc/grant_action_type_to_mob(actiontype, mob/m)
+	if(!occupants[m] || !actiontype)
+		return FALSE
+	LAZYINITLIST(occupant_actions[m])
+	if(occupant_actions[m][actiontype])
+		return TRUE
+	var/datum/action/action = generate_action_type(actiontype)
+	action.Grant(m)
+	occupant_actions[m][action.type] = action
+	return TRUE
+
+/obj/vehicle/proc/remove_action_type_from_mob(actiontype, mob/m)
+	if(!occupants[m] || !actiontype)
+		return FALSE
+	LAZYINITLIST(occupant_actions[m])
+	if(occupant_actions[m][actiontype])
+		var/datum/action/action = occupant_actions[m][actiontype]
+		action.Remove(m)
+		occupant_actions[m] -= actiontype
+	return TRUE
+
+/obj/vehicle/proc/grant_passenger_actions(mob/M)
+	for(var/v in autogrant_actions_passenger)
+		grant_action_type_to_mob(v, M)
+
+/obj/vehicle/proc/remove_passenger_actions(mob/M)
+	for(var/v in autogrant_actions_passenger)
+		remove_action_type_from_mob(v, M)
+
+/obj/vehicle/proc/grant_controller_actions(mob/M)
+	if(!istype(M) || !occupants[M])
+		return FALSE
+	for(var/i in GLOB.bitflags)
+		if(occupants[M] & i)
+			grant_controller_actions_by_flag(M, i)
+	return TRUE
+
+/obj/vehicle/proc/remove_controller_actions(mob/M)
+	if(!istype(M) || !occupants[M])
+		return FALSE
+	for(var/i in GLOB.bitflags)
+		remove_controller_actions_by_flag(M, i)
+	return TRUE
+
+/obj/vehicle/proc/grant_controller_actions_by_flag(mob/M, flag)
+	if(!istype(M) || !autogrant_actions_controller["[flag]"])
+		return FALSE
+	for(var/v in autogrant_actions_controller["[flag]"])
+		grant_action_type_to_mob(v, M)
+	return TRUE
+
+/obj/vehicle/proc/remove_controller_actions_by_flag(mob/M, flag)
+	if(!istype(M) || autogrant_actions_controller["[flag]"])
+		return FALSE
+	for(var/v in autogrant_actions_controller["[flag]"])
+		remove_action_type_from_mob(v, M)
+	return TRUE
+
+/obj/vehicle/proc/cleanup_actions_for_mob(mob/M)
+	if(!istype(M))
+		return FALSE
+	LAZYINITLIST(occupant_actions[M])
+	for(var/path in occupant_actions[M])
+		stack_trace("Leftover action type [path] in vehicle type [type] for mob type [M.type] - THIS SHOULD NOT BE HAPPENING!")
+		var/datum/action/action = occupant_actions[M]
+		action.Remove(M)
+	occupant_actions -= M
+	return TRUE
+
+//ACTION DATUMS
+
+/datum/action/vehicle
+	check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_vehicle.dmi'
+	button_icon_state = "vehicle_eject"
+	var/obj/vehicle/vehicle_target
+
+/datum/action/vehicle/sealed
+	var/obj/vehicle/sealed/vehicle_entered_target
+
+/datum/action/vehicle/sealed/climb_out
+	name = "Climb Out"
+	desc = "Climb out of your vehicle!"
+
+/datum/action/vehicle/sealed/climb_out/Trigger()
+	if(..() && istype(vehicle_entered_target))
+		vehicle_entered_target.mob_try_exit(owner, owner)
+
+/datum/action/vehicle/ridden
+	var/obj/vehicle/ridden/vehicle_ridden_target
@@ -1,15 +1,15 @@
-/obj/item/key
-	name = "key"
-	desc = "A small grey key."
-	icon = 'icons/obj/vehicles.dmi'
-	icon_state = "key"
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/key/security
-	desc = "A keyring with a small steel key, and a rubber stun baton accessory."
-	icon_state = "keysec"
-
-/obj/item/key/janitor
-	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
-	icon_state = "keyjanitor"
-
+/obj/item/key
+	name = "key"
+	desc = "A small grey key."
+	icon = 'icons/obj/vehicles.dmi'
+	icon_state = "key"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/key/security
+	desc = "A keyring with a small steel key, and a rubber stun baton accessory."
+	icon_state = "keysec"
+
+/obj/item/key/janitor
+	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
+	icon_state = "keyjanitor"
+