Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors

code/_onclick/adjacent.dm

@@ -37,7 +37,7 @@
 	// Non diagonal case
 	if(T0.x == x || T0.y == y)
 		// Check for border blockages
-		return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target)
+		return T0.ClickCross(get_dir(T0,src), border_only = 1, target_atom = target) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target)
 
 	// Diagonal case
 	var/in_dir = get_dir(T0,src) // eg. northwest (1+8) = 9 (00001001)
@@ -45,11 +45,11 @@
 	var/d2 = in_dir&12			 // eg. west	  (1+8)&12 (0000 1100) = 8 (0000 1000)
 
 	for(var/d in list(d1,d2))
-		if(!T0.ClickCross(d, border_only = 1))
+		if(!T0.ClickCross(d, border_only = 1, target_atom = target))
 			continue // could not leave T0 in that direction
 
 		var/turf/T1 = get_step(T0,d)
-		if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0) | get_dir(T1,src), border_only = 0)) //let's check both directions at once
+		if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0) | get_dir(T1,src), border_only = 0, target_atom = target)) //let's check both directions at once
 			continue // couldn't enter or couldn't leave T1
 
 		if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target))
@@ -64,10 +64,13 @@
 	* Must be on a turf
 */
 /atom/movable/Adjacent(var/atom/neighbor)
-	if(neighbor == loc) return 1
-	if(!isturf(loc)) return 0
-	if(loc.Adjacent(neighbor,src)) return 1
-	return 0
+	if(neighbor == loc) 
+		return TRUE
+	if(!isturf(loc)) 
+		return FALSE
+	if(loc.Adjacent(neighbor,target = neighbor)) 
+		return TRUE
+	return FALSE
 
 // This is necessary for storage items not on your person.
 /obj/item/Adjacent(var/atom/neighbor, var/recurse = 1)

code/_onclick/click.dm

@@ -129,7 +129,7 @@
 
 	// Allows you to click on a box's contents, if that box is on the ground, but no deeper than that
 	if(isturf(A) || isturf(A.loc) || (A.loc && isturf(A.loc.loc)))
-		if(A.Adjacent(src)) // see adjacent.dm
+		if(Adjacent(A) || (W && CheckReach(src, A, W.reach))) //Adjacent or reaching attacks
 			if(W)
 				if(W.pre_attackby(A,src,params))
 					// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
@@ -147,6 +147,29 @@
 			else
 				RangedAttack(A, params)
 
+/proc/CheckReach(atom/movable/here, atom/movable/there, reach)
+	if(!here || !there)
+		return
+	switch(reach)
+		if(0)
+			return here.loc == there.loc
+		if(1)
+			return here.Adjacent(there)
+		if(2 to INFINITY)
+			var/obj/dummy = new(get_turf(here)) //We'll try to move this every tick, failing if we can't
+			dummy.pass_flags |= PASSTABLE
+			for(var/i in 1 to reach) //Limit it to that many tries
+				var/turf/T = get_step(dummy, get_dir(dummy, there))
+				if(dummy.loc == there.loc)
+					qdel(dummy)
+					return 1
+				if(there.density && dummy in range(1, there)) //For windows and 
+					qdel(dummy)
+					return 1
+				if(!dummy.Move(T)) //we're blocked!
+					qdel(dummy)
+					return
+
 // Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click)
 /mob/proc/DblClickOn(atom/A, params)
 	return
@@ -391,4 +414,4 @@
 			view = -1
 		else
 			view = 1
-		add_view_range(view)
+		add_view_range(view)

code/_onclick/hud/alert.dm

@@ -3,7 +3,7 @@
 //PUBLIC -  call these wherever you want
 
 
-/mob/proc/throw_alert(category, type, severity, obj/new_master)
+/mob/proc/throw_alert(category, type, severity, obj/new_master, override = FALSE)
 
 /* Proc to create or update an alert. Returns the alert if the alert is new or updated, 0 if it was thrown already
  category is a text string. Each mob may only have one alert per category; the previous one will be replaced
@@ -11,7 +11,9 @@
  severity is an optional number that will be placed at the end of the icon_state for this alert
  For example, high pressure's icon_state is "highpressure" and can be serverity 1 or 2 to get "highpressure1" or "highpressure2"
  new_master is optional and sets the alert's icon state to "template" in the ui_style icons with the master as an overlay.
- Clicks are forwarded to master */
+ Clicks are forwarded to master
+ Override makes it so the alert is not replaced until cleared by a clear_alert with clear_override, and it's used for hallucinations.
+ */
 
 	if(!category)
 		return
@@ -19,8 +21,11 @@
 	var/obj/screen/alert/thealert
 	if(alerts[category])
 		thealert = alerts[category]
+		if(thealert.override_alerts)
+			return 0
 		if(new_master && new_master != thealert.master)
 			WARNING("[src] threw alert [category] with new_master [new_master] while already having that alert with master [thealert.master]")
+
 			clear_alert(category)
 			return .()
 		else if(thealert.type != type)
@@ -34,6 +39,9 @@
 				return 0
 	else
 		thealert = new type()
+		thealert.override_alerts = override
+		if(override)
+			thealert.timeout = null
 
 	if(new_master)
 		var/old_layer = new_master.layer
@@ -65,10 +73,12 @@
 		clear_alert(category)
 
 // Proc to clear an existing alert.
-/mob/proc/clear_alert(category)
+/mob/proc/clear_alert(category, clear_override = FALSE)
 	var/obj/screen/alert/alert = alerts[category]
 	if(!alert)
 		return 0
+	if(alert.override_alerts && !clear_override)
+		return 0
 
 	alerts -= category
 	if(client && hud_used)
@@ -85,6 +95,7 @@
 	var/timeout = 0 //If set to a number, this alert will clear itself after that many deciseconds
 	var/severity = 0
 	var/alerttooltipstyle = ""
+	var/override_alerts = FALSE //If it is overriding other alerts of the same type
 
 
 /obj/screen/alert/MouseEntered(location,control,params)
@@ -586,7 +597,7 @@ so as to remain in compliance with the most up-to-date laws."
 		return
 	var/paramslist = params2list(params)
 	if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
-		usr << "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>"
+		to_chat(usr, "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
 		return
 	if(master)
 		return usr.client.Click(master, location, control, params)

code/_onclick/hud/fullscreen.dm

@@ -18,7 +18,7 @@
 	screen.severity = severity
 
 	screens[category] = screen
-	if(client && stat != DEAD)
+	if(client && screen.should_show_to(src))
 		client.screen += screen
 	return screen
 
@@ -52,9 +52,14 @@
 			client.screen -= screens[category]
 
 /mob/proc/reload_fullscreen()
-	if(client && stat != DEAD) //dead mob do not see any of the fullscreen overlays that he has.
+	if(client)
+		var/obj/screen/fullscreen/screen
 		for(var/category in screens)
-			client.screen |= screens[category]
+			screen = screens[category]
+			if(screen.should_show_to(src))
+				client.screen |= screen
+			else
+				client.screen -= screen
 
 /obj/screen/fullscreen
 	icon = 'icons/mob/screen_full.dmi'
@@ -64,6 +69,12 @@
 	plane = FULLSCREEN_PLANE
 	mouse_opacity = 0
 	var/severity = 0
+	var/show_when_dead = FALSE
+
+/obj/screen/fullscreen/proc/should_show_to(mob/mymob)
+	if(!show_when_dead && mymob.stat == DEAD)
+		return FALSE
+	return TRUE
 
 /obj/screen/fullscreen/Destroy()
 	severity = 0
@@ -125,4 +136,31 @@
 	color = "#ff0000"
 
 /obj/screen/fullscreen/color_vision/blue
-	color = "#0000ff"
+	color = "#0000ff"
+
+/obj/screen/fullscreen/lighting_backdrop
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "flash"
+	transform = matrix(200, 0, 0, 0, 200, 0)
+	plane = LIGHTING_PLANE
+	blend_mode = BLEND_OVERLAY
+	show_when_dead = TRUE
+
+//Provides darkness to the back of the lighting plane
+/obj/screen/fullscreen/lighting_backdrop/lit
+	invisibility = INVISIBILITY_LIGHTING
+	layer = BACKGROUND_LAYER+21
+	color = "#000"
+	show_when_dead = TRUE
+
+//Provides whiteness in case you don't see lights so everything is still visible
+/obj/screen/fullscreen/lighting_backdrop/unlit
+	layer = BACKGROUND_LAYER+20
+	show_when_dead = TRUE
+
+/obj/screen/fullscreen/see_through_darkness
+	icon_state = "nightvision"
+	plane = LIGHTING_PLANE
+	layer = LIGHTING_LAYER
+	blend_mode = BLEND_ADD
+	show_when_dead = TRUE

code/_onclick/hud/ghost.dm

@@ -46,11 +46,6 @@
 
 /datum/hud/ghost/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi')
 	..()
-	var/mob/dead/observer/G = mymob
-	if(!G.client.prefs.ghost_hud)
-		mymob.client.screen = null
-		return
-
 	var/obj/screen/using
 
 	using = new /obj/screen/ghost/jumptomob()
@@ -73,17 +68,13 @@
 	using.screen_loc = ui_ghost_pai
 	static_inventory += using
 
-
-/datum/hud/ghost/show_hud()
-	var/mob/dead/observer/G = mymob
-	mymob.client.screen = list()
-	for(var/thing in plane_masters)
-		mymob.client.screen += plane_masters[thing]
-	create_parallax()
-	if(G.client.prefs.ghost_hud)
+/datum/hud/ghost/show_hud(version = 0, mob/viewmob)
+	..()
+	if(!mymob.client.prefs.ghost_hud)
+		mymob.client.screen -= static_inventory
+	else
 		mymob.client.screen += static_inventory
 
-
 /mob/dead/observer/create_mob_hud()
 	if(client && !hud_used)
 		hud_used = new /datum/hud/ghost(src, ui_style2icon(client.prefs.UI_style))

code/_onclick/hud/hud.dm

@@ -50,8 +50,6 @@
 	var/obj/screen/healths
 	var/obj/screen/healthdoll
 	var/obj/screen/internals
-	//citadel code
-	var/obj/screen/arousal
 
 	var/ui_style_icon = 'icons/mob/screen_midnight.dmi'
 
@@ -68,6 +66,7 @@
 	for(var/mytype in subtypesof(/obj/screen/plane_master))
 		var/obj/screen/plane_master/instance = new mytype()
 		plane_masters["[instance.plane]"] = instance
+		instance.backdrop(mymob)
 
 /datum/hud/Destroy()
 	if(mymob.hud_used == src)
@@ -131,6 +130,7 @@
 			qdel(thing)
 		screenoverlays.Cut()
 	mymob = null
+
 	return ..()
 
 /mob/proc/create_mob_hud()
@@ -204,6 +204,7 @@
 
 	for(var/thing in plane_masters)
 		screenmob.client.screen += plane_masters[thing]
+
 	hud_version = display_hud_version
 	persistent_inventory_update(screenmob)
 	mymob.update_action_buttons(1)
@@ -216,7 +217,7 @@
 	..()
 	hidden_inventory_update(viewmob)
 
-/datum/hud/robot/show_hud(version = 0)
+/datum/hud/robot/show_hud(version = 0, mob/viewmob)
 	..()
 	update_robot_modules_display()
 
@@ -244,9 +245,9 @@
 
 	if(hud_used && client)
 		hud_used.show_hud() //Shows the next hud preset
-		usr << "<span class ='info'>Switched HUD mode. Press F12 to toggle.</span>"
+		to_chat(usr, "<span class ='info'>Switched HUD mode. Press F12 to toggle.</span>")
 	else
-		usr << "<span class ='warning'>This mob type does not use a HUD.</span>"
+		to_chat(usr, "<span class ='warning'>This mob type does not use a HUD.</span>")
 
 
 //(re)builds the hand ui slots, throwing away old ones
@@ -278,4 +279,4 @@
 	for(var/obj/screen/human/equip/E in static_inventory)
 		E.screen_loc = ui_equip_position(mymob)
 	if(mymob.hud_used)
-		show_hud(HUD_STYLE_STANDARD,mymob)
+		show_hud(HUD_STYLE_STANDARD,mymob)

code/_onclick/hud/hud_cit.dm

@@ -0,0 +1,2 @@
+/datum/hud
+	var/obj/screen/arousal

code/_onclick/hud/human.dm

@@ -87,6 +87,8 @@
 
 /datum/hud/human/New(mob/living/carbon/human/owner, ui_style = 'icons/mob/screen_midnight.dmi')
 	..()
+	owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness)
+
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
 

code/_onclick/hud/parallax.dm

@@ -2,7 +2,6 @@
 /client
 	var/list/parallax_layers
 	var/list/parallax_layers_cached
-	var/static/list/parallax_static_layers_tail = newlist(/obj/screen/parallax_pmaster, /obj/screen/parallax_space_whitifier)
 	var/atom/movable/movingmob
 	var/turf/previous_turf
 	var/dont_animate_parallax //world.time of when we can state animate()ing parallax again
@@ -27,11 +26,22 @@
 	if (length(C.parallax_layers) > C.parallax_layers_max)
 		C.parallax_layers.len = C.parallax_layers_max
 
-	C.screen |= (C.parallax_layers + C.parallax_static_layers_tail)
+	C.screen |= (C.parallax_layers)
+	var/obj/screen/plane_master/PM = plane_masters["[PLANE_SPACE]"]
+	PM.color = list(
+		0, 0, 0, 0,
+		0, 0, 0, 0,
+		0, 0, 0, 0,
+		1, 1, 1, 1,
+		0, 0, 0, 0
+		)
+
 
 /datum/hud/proc/remove_parallax()
 	var/client/C = mymob.client
-	C.screen -= (C.parallax_layers_cached + C.parallax_static_layers_tail)
+	C.screen -= (C.parallax_layers_cached)
+	var/obj/screen/plane_master/PM = plane_masters["[PLANE_SPACE]"]
+	PM.color = initial(PM.color)
 	C.parallax_layers = null
 
 /datum/hud/proc/apply_parallax_pref()
@@ -70,7 +80,7 @@
 	create_parallax()
 
 // This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller can append their animation)
-/datum/hud/proc/set_parallax_movedir(new_parallax_movedir)
+/datum/hud/proc/set_parallax_movedir(new_parallax_movedir, skip_windups)
 	. = FALSE
 	var/client/C = mymob.client
 	if(new_parallax_movedir == C.parallax_movedir)
@@ -100,24 +110,29 @@
 			newtransform = matrix(1, 0,-480, 0, 1, 0)
 
 	var/shortesttimer
-	for(var/thing in C.parallax_layers)
-		var/obj/screen/parallax_layer/L = thing
+	if(!skip_windups)
+		for(var/thing in C.parallax_layers)
+			var/obj/screen/parallax_layer/L = thing
 
-		var/T = PARALLAX_LOOP_TIME / L.speed
-		if (isnull(shortesttimer))
-			shortesttimer = T
-		if (T < shortesttimer)
-			shortesttimer = T
-		L.transform = newtransform
-		animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = ANIMATION_END_NOW)
-		if (new_parallax_movedir)
+			var/T = PARALLAX_LOOP_TIME / L.speed
+			if (isnull(shortesttimer))
+				shortesttimer = T
+			if (T < shortesttimer)
+				shortesttimer = T
 			L.transform = newtransform
-			animate(transform = matrix(), time = T) //queue up another animate so lag doesn't create a shutter
+			animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = ANIMATION_END_NOW)
+			if (new_parallax_movedir)
+				L.transform = newtransform
+				animate(transform = matrix(), time = T) //queue up another animate so lag doesn't create a shutter
 
 	C.parallax_movedir = new_parallax_movedir
 	if (C.parallax_animate_timer)
 		deltimer(C.parallax_animate_timer)
-	C.parallax_animate_timer = addtimer(CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform), min(shortesttimer, PARALLAX_LOOP_TIME), TIMER_CLIENT_TIME|TIMER_STOPPABLE)
+	var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform)
+	if(skip_windups)
+		CB.Invoke()
+	else
+		C.parallax_animate_timer = addtimer(CB, min(shortesttimer, PARALLAX_LOOP_TIME), TIMER_CLIENT_TIME|TIMER_STOPPABLE)
 
 
 /datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform)
@@ -151,7 +166,7 @@
 	var/area/areaobj = posobj.loc
 
 	// Update the movement direction of the parallax if necessary (for shuttles)
-	set_parallax_movedir(areaobj.parallax_movedir)
+	set_parallax_movedir(areaobj.parallax_movedir, FALSE)
 
 	var/force
 	if(!C.previous_turf || (C.previous_turf.z != posobj.z))
@@ -204,6 +219,11 @@
 			if(M && M.client && M.hud_used && length(M.client.parallax_layers))
 				M.hud_used.update_parallax()
 
+/mob/proc/update_parallax_teleport()	//used for arrivals shuttle
+	if(client && client.eye && hud_used && length(client.parallax_layers))
+		var/area/areaobj = get_area(client.eye)
+		hud_used.set_parallax_movedir(areaobj.parallax_movedir, TRUE)
+
 /obj/screen/parallax_layer
 	icon = 'icons/effects/parallax.dmi'
 	var/speed = 1
@@ -216,7 +236,7 @@
 	mouse_opacity = 0
 
 
-/obj/screen/parallax_layer/New(view)
+/obj/screen/parallax_layer/Initialize(mapload, view)
 	..()
 	if (!view)
 		view = world.view
@@ -249,26 +269,6 @@
 	speed = 1
 	layer = 2
 
-/obj/screen/parallax_pmaster
-	appearance_flags = PLANE_MASTER
-	plane = PLANE_SPACE_PARALLAX
-	blend_mode = BLEND_MULTIPLY
-	mouse_opacity = FALSE
-	screen_loc = "CENTER-7,CENTER-7"
-
-/obj/screen/parallax_space_whitifier
-	appearance_flags = PLANE_MASTER
-	plane = PLANE_SPACE
-	color = list(
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		1, 1, 1, 1,
-		0, 0, 0, 0
-		)
-	screen_loc = "CENTER-7,CENTER-7"
-
-
 #undef LOOP_NONE
 #undef LOOP_NORMAL
 #undef LOOP_REVERSE

code/_onclick/hud/plane_master.dm

@@ -4,15 +4,9 @@
 	appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
 	blend_mode = BLEND_OVERLAY
 
-/obj/screen/plane_master/New()
-	if(blend_mode == BLEND_MULTIPLY)
-		//What is this? Read http://www.byond.com/forum/?post=2141928
-		var/image/backdrop = image('icons/mob/screen_gen.dmi', "black")
-		backdrop.transform = matrix(200, 0, 0, 0, 200, 0)
-		backdrop.layer = BACKGROUND_LAYER
-		backdrop.blend_mode = BLEND_OVERLAY
-		add_overlay(backdrop)
-	..()
+//Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928
+//Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
+/obj/screen/plane_master/proc/backdrop(mob/mymob)
 
 /obj/screen/plane_master/game_world
 	name = "game world plane master"
@@ -22,7 +16,24 @@
 /obj/screen/plane_master/lighting
 	name = "lighting plane master"
 	plane = LIGHTING_PLANE
-	blend_mode = BLEND_OVERLAY
-//	blend_mode = BLEND_MULTIPLY
-//	color = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,0, 0.1,0.1,0.1,0)
+	blend_mode = BLEND_MULTIPLY
 	mouse_opacity = 0
+
+/obj/screen/plane_master/lighting/proc/params2color(params)
+	color = params2list(params)
+/obj/screen/plane_master/lighting/proc/basecolor()
+	color = LIGHTING_BASE_MATRIX
+
+/obj/screen/plane_master/parallax
+	name = "parallax plane master"
+	plane = PLANE_SPACE_PARALLAX
+	blend_mode = BLEND_MULTIPLY
+	mouse_opacity = FALSE
+
+/obj/screen/plane_master/parallax_white
+	name = "parallax whitifier plane master"
+	plane = PLANE_SPACE
+
+/obj/screen/plane_master/lighting/backdrop(mob/mymob)
+	mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit)
+	mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit)

code/_onclick/hud/robot.dm

@@ -206,7 +206,7 @@
 		screenmob.client.screen += module_store_icon	//"store" icon
 
 		if(!R.module.modules)
-			usr << "<span class='danger'>Selected module has no modules to select</span>"
+			to_chat(usr, "<span class='danger'>Selected module has no modules to select</span>")
 			return
 
 		if(!R.robot_modules_background)

code/_onclick/hud/screen_objects.dm

@@ -80,7 +80,7 @@
 		return 1
 	var/area/A = get_area(usr)
 	if(!A.outdoors)
-		usr << "<span class='warning'>There is already a defined structure here.</span>"
+		to_chat(usr, "<span class='warning'>There is already a defined structure here.</span>")
 		return 1
 	create_area(usr)
 
@@ -159,7 +159,7 @@
 	// We don't even know if it's a middle click
 	if(world.time <= usr.next_move)
 		return 1
-	if(usr.incapacitated())
+	if(usr.incapacitated() || isobserver(usr))
 		return 1
 	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
@@ -241,49 +241,49 @@
 
 	if(C.internal)
 		C.internal = null
-		C << "<span class='notice'>You are no longer running on internals.</span>"
+		to_chat(C, "<span class='notice'>You are no longer running on internals.</span>")
 		icon_state = "internal0"
 	else
 		if(!C.getorganslot("breathing_tube"))
 			if(!istype(C.wear_mask, /obj/item/clothing/mask))
-				C << "<span class='warning'>You are not wearing an internals mask!</span>"
+				to_chat(C, "<span class='warning'>You are not wearing an internals mask!</span>")
 				return 1
 			else
 				var/obj/item/clothing/mask/M = C.wear_mask
 				if(M.mask_adjusted) // if mask on face but pushed down
 					M.adjustmask(C) // adjust it back
 				if( !(M.flags & MASKINTERNALS) )
-					C << "<span class='warning'>You are not wearing an internals mask!</span>"
+					to_chat(C, "<span class='warning'>You are not wearing an internals mask!</span>")
 					return
 
 		var/obj/item/I = C.is_holding_item_of_type(/obj/item/weapon/tank)
 		if(I)
-			C << "<span class='notice'>You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))].</span>"
+			to_chat(C, "<span class='notice'>You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))].</span>")
 			C.internal = I
 		else if(ishuman(C))
 			var/mob/living/carbon/human/H = C
 			if(istype(H.s_store, /obj/item/weapon/tank))
-				H << "<span class='notice'>You are now running on internals from the [H.s_store] on your [H.wear_suit].</span>"
+				to_chat(H, "<span class='notice'>You are now running on internals from the [H.s_store] on your [H.wear_suit].</span>")
 				H.internal = H.s_store
 			else if(istype(H.belt, /obj/item/weapon/tank))
-				H << "<span class='notice'>You are now running on internals from the [H.belt] on your belt.</span>"
+				to_chat(H, "<span class='notice'>You are now running on internals from the [H.belt] on your belt.</span>")
 				H.internal = H.belt
 			else if(istype(H.l_store, /obj/item/weapon/tank))
-				H << "<span class='notice'>You are now running on internals from the [H.l_store] in your left pocket.</span>"
+				to_chat(H, "<span class='notice'>You are now running on internals from the [H.l_store] in your left pocket.</span>")
 				H.internal = H.l_store
 			else if(istype(H.r_store, /obj/item/weapon/tank))
-				H << "<span class='notice'>You are now running on internals from the [H.r_store] in your right pocket.</span>"
+				to_chat(H, "<span class='notice'>You are now running on internals from the [H.r_store] in your right pocket.</span>")
 				H.internal = H.r_store
 
 		//Seperate so CO2 jetpacks are a little less cumbersome.
 		if(!C.internal && istype(C.back, /obj/item/weapon/tank))
-			C << "<span class='notice'>You are now running on internals from the [C.back] on your back.</span>"
+			to_chat(C, "<span class='notice'>You are now running on internals from the [C.back] on your back.</span>")
 			C.internal = C.back
 
 		if(C.internal)
 			icon_state = "internal1"
 		else
-			C << "<span class='warning'>You don't have an oxygen tank!</span>"
+			to_chat(C, "<span class='warning'>You don't have an oxygen tank!</span>")
 			return
 	C.update_action_buttons_icon()
 
@@ -667,21 +667,29 @@
 			L.say(pick(word_messages))
 
 /obj/screen/splash
-	icon = 'icons/misc/fullscreen.dmi'
-	icon_state = "title"
+	icon = 'config/title_screens/images/blank.png'
+	icon_state = ""
 	screen_loc = "1,1"
 	layer = SPLASHSCREEN_LAYER
 	plane = SPLASHSCREEN_PLANE
 	var/client/holder
 
-/obj/screen/splash/New(client/C, fadeout, qdel_after = TRUE)
-	..()
+/obj/screen/splash/New(client/C, visible, use_previous_title)
 	holder = C
+
+	if(!visible)
+		alpha = 0
+	if(SStitle.title_screen)
+		icon = SStitle.title_screen.icon
+
 	holder.screen += src
-	var/titlescreen = TITLESCREEN
-	if(titlescreen)
-		icon_state = titlescreen
-	if(fadeout)
+	if(use_previous_title && !SSmapping.previous_map_config.defaulted)
+		holder.screen -= src	//Yell at Cyberboss to finish this
+
+	..()
+
+/obj/screen/splash/proc/Fade(out, qdel_after = TRUE)
+	if(out)
 		animate(src, alpha = 0, time = 30)
 	else
 		alpha = 0

code/_onclick/item_attack.dm

@@ -11,17 +11,14 @@
 	return
 
 /obj/attackby(obj/item/I, mob/living/user, params)
-	if(unique_rename && istype(I, /obj/item/weapon/pen))
-		rewrite(user)
-	else
-		return I.attack_obj(src, user)
+	return I.attack_obj(src, user)
 
 /mob/living/attackby(obj/item/I, mob/user, params)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it?
 		var/sharpness = I.is_sharp()
 		if(sharpness)
-			user << "<span class='notice'>You begin to butcher [src]...</span>"
+			to_chat(user, "<span class='notice'>You begin to butcher [src]...</span>")
 			playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
 			if(do_mob(user, src, 80/sharpness))
 				harvest(user)

code/_onclick/observer.dm

@@ -71,13 +71,13 @@
 	if(awaygate)
 		user.forceMove(awaygate.loc)
 	else
-		user << "[src] has no destination."
+		to_chat(user, "[src] has no destination.")
 
 /obj/machinery/gateway/centeraway/attack_ghost(mob/user)
 	if(stationgate)
 		user.forceMove(stationgate.loc)
 	else
-		user << "[src] has no destination."
+		to_chat(user, "[src] has no destination.")
 
 /obj/item/weapon/storage/attack_ghost(mob/user)
 	orient2hud(user)

code/_onclick/other_mobs.dm

@@ -7,7 +7,7 @@
 /mob/living/carbon/human/UnarmedAttack(atom/A, proximity)
 
 	if(!has_active_hand()) //can't attack without a hand.
-		src << "<span class='notice'>You look at your arm and sigh.</span>"
+		to_chat(src, "<span class='notice'>You look at your arm and sigh.</span>")
 		return
 
 	// Special glove functions:
@@ -200,5 +200,5 @@
 	New Players:
 	Have no reason to click on anything at all.
 */
-/mob/new_player/ClickOn()
+/mob/dead/new_player/ClickOn()
 	return

code/_onclick/telekinesis.dm

@@ -152,7 +152,7 @@ var/const/tk_maxrange = 15
 	if(focus)
 		d = max(d,get_dist(user,focus)) // whichever is further
 	if(d > tk_maxrange)
-		user << "<span class ='warning'>Your mind won't reach that far.</span>"
+		to_chat(user, "<span class ='warning'>Your mind won't reach that far.</span>")
 		return 0
 	return 1