Merge branch 'master' into upstream-merge-28681

2017-06-27 05:14:45 -05:00
parent 8875fbefc5 45b6931d9b
commit 2158ea1e67
153 changed files with 162089 additions and 165208 deletions
@@ -14,6 +14,7 @@
 #define CLOSED_TURF_LAYER 2.05
 #define ABOVE_NORMAL_TURF_LAYER 2.08
 #define LATTICE_LAYER 2.2
+#define OVER_LATTICE_LAYER 2.25
 #define DISPOSAL_PIPE_LAYER 2.3
 #define GAS_PIPE_HIDDEN_LAYER 2.35
 #define WIRE_LAYER 2.4
@@ -178,6 +178,7 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 // Used by NewsCaster and NewsPaper.
 // Used by Modular Computers
 #define PEN_FONT "Verdana"
+#define FOUNTAIN_PEN_FONT "Segoe Script"
 #define CRAYON_FONT "Comic Sans MS"
 #define PRINTER_FONT "Times New Roman"
 #define SIGNFONT "Times New Roman"
@@ -45,4 +45,9 @@
 #define HYPERSPACE_LAUNCH 2
 #define HYPERSPACE_END 3

-#define CALL_SHUTTLE_REASON_LENGTH 12
+#define CALL_SHUTTLE_REASON_LENGTH 12
+
+//Engine related
+#define ENGINE_COEFF_MIN 0.5
+#define ENGINE_COEFF_MAX 2
+#define ENGINE_DEFAULT_MAXSPEED_ENGINES 5
@@ -1210,6 +1210,9 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 #define DELTA_CALC max(((max(world.tick_usage, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)

 /proc/stoplag()
+	if (!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT))
+		sleep(world.tick_lag)
+		return 1
 	. = 0
 	var/i = 1
 	do
@@ -1,13 +0,0 @@
-diff a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm	(rejected hunks)
-@@ -1422,6 +1422,7 @@ var/valid_HTTPSGet = FALSE
- 	fdel(temp_file)
- 
- #define UNTIL(X) while(!(X)) stoplag()
-
-+/*
- /proc/to_chat(target, message)
-	target << message
-\ No newline at end of file
-+	target << message
-+	*/
-\ No newline at end of file
@@ -11,7 +11,7 @@
 */

 /atom/proc/attack_tk(mob/user)
-	if(user.stat)
+	if(user.stat || !tkMaxRangeCheck(user, src))
 		return
 	new /obj/effect/temp_visual/telekinesis(loc)
 	user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
@@ -20,14 +20,20 @@
 /obj/attack_tk(mob/user)
 	if(user.stat)
 		return
+	if(anchored)
+		return ..()
+	attack_tk_grab(user)

+/obj/item/attack_tk(mob/user)
+	if(user.stat)
+		return
+	attack_tk_grab(user)
+
+/obj/proc/attack_tk_grab(mob/user)
 	var/obj/item/tk_grab/O = new(src)
 	O.tk_user = user
 	if(O.focus_object(src))
 		user.put_in_active_hand(O)
-	else
-		qdel(O)
-		..()

 /mob/attack_tk(mob/user)
 	return
@@ -43,7 +43,7 @@ SUBSYSTEM_DEF(mapping)
 	loading_ruins = TRUE
 	var/mining_type = config.minetype
 	if (mining_type == "lavaland")
-		seedRuins(list(5), global.config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
+		seedRuins(list(ZLEVEL_LAVALAND), global.config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
 		spawn_rivers()

 	// deep space ruins
@@ -47,7 +47,7 @@ SUBSYSTEM_DEF(shuttle)

 	var/lockdown = FALSE	//disallow transit after nuke goes off

-	var/auto_call = 99000 //time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.
+	var/auto_call = 99000 //time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.

 /datum/controller/subsystem/shuttle/Initialize(timeofday)
 	if(!arrivals)
@@ -544,3 +544,8 @@ SUBSYSTEM_DEF(shuttle)
 	for(var/obj/docking_port/mobile/M in mobile)
 		if(M.is_in_shuttle_bounds(A))
 			return TRUE
+
+/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
+	for(var/obj/docking_port/mobile/M in mobile)
+		if(M.is_in_shuttle_bounds(A))
+			return M
@@ -0,0 +1,9 @@
+diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm	(rejected hunks)
+@@ -536,3 +536,7 @@ SUBSYSTEM_DEF(shuttle)
+ 		if(M.is_in_shuttle_bounds(A))
+ 			return TRUE
+ 
+/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
+	for(var/obj/docking_port/mobile/M in mobile)
+		if(M.is_in_shuttle_bounds(A))
+			return M
@@ -29,7 +29,7 @@
 		qdel(H.gloves)

 	var/obj/item/clothing/suit/space/space_ninja/theSuit = new(H)
-	var/obj/item/weapon/katana/energy/EK = new(H)
+	var/obj/item/weapon/dash/energy_katana/EK = new(H)
 	theSuit.energyKatana = EK

 	H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears)
@@ -1,10 +0,0 @@
-diff a/code/datums/holocall.dm b/code/datums/holocall.dm	(rejected hunks)
-@@ -42,6 +43,8 @@
- 
- //cleans up ALL references :)
- /datum/holocall/Destroy()
-+	QDEL_NULL(hangup)
-+
- 	var/user_good = !QDELETED(user)
- 	if(user_good)
- 		user.reset_perspective()
@@ -183,3 +183,11 @@
 	suffix = "lavaland_surface_swarmer_crash.dmm"
 	allow_duplicates = FALSE
 	cost = 20
+
+/datum/map_template/ruin/lavaland/miningripley
+	name = "Ripley"
+	id = "ripley"
+	description = "A heavily-damaged mining ripley, property of a very unfortunate miner. You might have to do a bit of work to fix this thing up."
+	suffix = "lavaland_surface_random_ripley.dmm"
+	allow_duplicates = FALSE
+	cost = 5
@@ -21,6 +21,10 @@
 	mappath = "[prefix][shuttle_id].dmm"
 	. = ..()

+//Whatever special stuff you want
+/datum/map_template/shuttle/proc/on_bought()
+	return
+
 /datum/map_template/shuttle/emergency
 	port_id = "emergency"
 	name = "Base Shuttle Template (Emergency)"
@@ -49,6 +53,12 @@
 	// first 10 minutes only
 	return world.time - SSticker.round_start_time < 6000

+/datum/map_template/shuttle/emergency/airless/on_bought()
+	//enable buying engines from cargo
+	var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
+	P.special_enabled = TRUE
+
+
 /datum/map_template/shuttle/emergency/asteroid
 	suffix = "asteroid"
 	name = "Asteroid Station Emergency Shuttle"
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm	(rejected hunks)
-@@ -171,7 +171,7 @@
- 		return 0
- 	if(cooldown > world.time)
- 		if(!CM.active)
-			owner << "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>"
-+			to_chat(owner, "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>")
- 		return 0
- 	return ..()
- 
@@ -35,6 +35,7 @@ To draw a rune, use an arcane tome.
 	var/scribe_damage = 0.1 //how much damage you take doing it

 	var/allow_excess_invokers = FALSE //if we allow excess invokers when being invoked
+	var/invoke_damage = 0 //how much damage invokers take when invoking it
 	var/construct_invoke = TRUE //if constructs can invoke it

 	var/req_keyword = 0 //If the rune requires a keyword - go figure amirite
@@ -133,10 +134,13 @@ structure_check() searches for nearby cultist structures required for the invoca

 /obj/effect/rune/proc/invoke(var/list/invokers)
 	//This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here.
-	if(invocation)
-		for(var/M in invokers)
-			var/mob/living/L = M
+	for(var/M in invokers)
+		var/mob/living/L = M
+		if(invocation)
 			L.say(invocation, language = /datum/language/common)
+		if(invoke_damage)
+			L.apply_damage(invoke_damage, BRUTE)
+			to_chat(L, "<span class='cultitalic'>[src] saps your strength!</span>")
 	do_invoke_glow()

 /obj/effect/rune/proc/do_invoke_glow()
@@ -159,6 +163,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_name = "malformed rune"
 	cultist_desc = "a senseless rune written in gibberish. No good can come from invoking this."
 	invocation = "Ra'sha yoka!"
+	invoke_damage = 30

 /obj/effect/rune/malformed/Initialize(mapload, set_keyword)
 	. = ..()
@@ -167,10 +172,6 @@ structure_check() searches for nearby cultist structures required for the invoca

 /obj/effect/rune/malformed/invoke(var/list/invokers)
 	..()
-	for(var/M in invokers)
-		var/mob/living/L = M
-		to_chat(L, "<span class='cultitalic'><b>You feel your life force draining. The Geometer is displeased.</b></span>")
-		L.apply_damage(30, BRUTE)
 	qdel(src)

 /mob/proc/null_rod_check() //The null rod, if equipped, will protect the holder from the effects of most runes
@@ -508,9 +509,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 /obj/effect/rune/raise_dead/examine(mob/user)
 	..()
 	if(iscultist(user) || user.stat == DEAD)
-		var/revive_number = 0
-		if(GLOB.sacrificed.len)
-			revive_number = GLOB.sacrificed.len - revives_used
+		var/revive_number = LAZYLEN(GLOB.sacrificed) - revives_used
 		to_chat(user, "<b>Revives Remaining:</b> [revive_number]")

 /obj/effect/rune/raise_dead/invoke(var/list/invokers)
@@ -520,6 +519,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/mob/living/user = invokers[1]
 	if(rune_in_use)
 		return
+	rune_in_use = TRUE
 	for(var/mob/living/M in T.contents)
 		if(iscultist(M) && M.stat == DEAD)
 			potential_revive_mobs |= M
@@ -527,18 +527,20 @@ structure_check() searches for nearby cultist structures required for the invoca
 		to_chat(user, "<span class='cultitalic'>There are no dead cultists on the rune!</span>")
 		log_game("Raise Dead rune failed - no corpses to revive")
 		fail_invoke()
+		rune_in_use = FALSE
 		return
-	if(!GLOB.sacrificed.len || GLOB.sacrificed.len <= revives_used)
+	if(LAZYLEN(GLOB.sacrificed) <= revives_used)
 		to_chat(user, "<span class='warning'>You have sacrificed too few people to revive a cultist!</span>")
 		fail_invoke()
+		rune_in_use = FALSE
 		return
 	if(potential_revive_mobs.len > 1)
 		mob_to_revive = input(user, "Choose a cultist to revive.", "Cultist to Revive") as null|anything in potential_revive_mobs
 	else
 		mob_to_revive = potential_revive_mobs[1]
 	if(!src || QDELETED(src) || rune_in_use || !validness_checks(mob_to_revive, user))
+		rune_in_use = FALSE
 		return
-	rune_in_use = 1
 	if(user.name == "Herbert West")
 		invocation = "To life, to life, I bring them!"
 	else
@@ -550,34 +552,34 @@ structure_check() searches for nearby cultist structures required for the invoca
 	to_chat(mob_to_revive, "<span class='cultlarge'>\"PASNAR SAVRAE YAM'TOTH. Arise.\"</span>")
 	mob_to_revive.visible_message("<span class='warning'>[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.</span>", \
 								  "<span class='cultlarge'>You awaken suddenly from the void. You're alive!</span>")
-	rune_in_use = 0
+	rune_in_use = FALSE

 /obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user)
 	var/turf/T = get_turf(src)
-	if(!user)
-		return 0
+	if(QDELETED(user))
+		return FALSE
 	if(!Adjacent(user) || user.incapacitated())
-		return 0
-	if(!target_mob)
+		return FALSE
+	if(QDELETED(target_mob))
 		fail_invoke()
-		return 0
+		return FALSE
 	if(!(target_mob in T.contents))
 		to_chat(user, "<span class='cultitalic'>The cultist to revive has been moved!</span>")
 		fail_invoke()
 		log_game("Raise Dead rune failed - revival target moved")
-		return 0
+		return FALSE
 	var/mob/dead/observer/ghost = target_mob.get_ghost(TRUE)
 	if(!ghost && (!target_mob.mind || !target_mob.mind.active))
 		to_chat(user, "<span class='cultitalic'>The corpse to revive has no spirit!</span>")
 		fail_invoke()
 		log_game("Raise Dead rune failed - revival target has no ghost")
-		return 0
+		return FALSE
 	if(!GLOB.sacrificed.len || GLOB.sacrificed.len <= revives_used)
 		to_chat(user, "<span class='warning'>You have sacrificed too few people to revive a cultist!</span>")
 		fail_invoke()
 		log_game("Raise Dead rune failed - too few sacrificed")
-		return 0
-	return 1
+		return FALSE
+	return TRUE

 /obj/effect/rune/raise_dead/fail_invoke()
 	..()
@@ -592,7 +594,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "emits a large electromagnetic pulse, increasing in size for each cultist invoking it, hindering electronics and disabling silicons."
 	invocation = "Ta'gh fara'qha fel d'amar det!"
 	icon_state = "5"
-	allow_excess_invokers = 1
+	allow_excess_invokers = TRUE
 	color = RUNE_COLOR_EMP

 /obj/effect/rune/emp/invoke(var/list/invokers)
@@ -624,10 +626,14 @@ structure_check() searches for nearby cultist structures required for the invoca
 	invocation = "Fwe'sh mah erl nyag r'ya!"
 	icon_state = "7"
 	color = RUNE_COLOR_DARKRED
-	rune_in_use = 0 //One at a time, please!
-	construct_invoke = 0
+	rune_in_use = FALSE //One at a time, please!
+	construct_invoke = FALSE
 	var/mob/living/affecting = null

+/obj/effect/rune/spirit/Destroy()
+	affecting = null
+	return ..()
+
 /obj/effect/rune/spirit/examine(mob/user)
 	..()
 	if(affecting)
@@ -651,41 +657,33 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/turf/T = get_turf(src)
 	rune_in_use = TRUE
 	affecting = user
-	user.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
-	user.visible_message("<span class='warning'>[user] freezes statue-still, glowing an unearthly red.</span>", \
+	affecting.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
+	affecting.visible_message("<span class='warning'>[affecting] freezes statue-still, glowing an unearthly red.</span>", \
 						 "<span class='cult'>You see what lies beyond. All is revealed. While this is a wondrous experience, your physical form will waste away in this state. Hurry...</span>")
-	user.ghostize(1)
-	while(user)
-		if(!affecting)
-			visible_message("<span class='warning'>[src] pulses gently before falling dark.</span>")
-			affecting = null //In case it's assigned to a number or something
-			rune_in_use = FALSE
-			return
+	affecting.ghostize(1)
+	while(!QDELETED(affecting))
 		affecting.apply_damage(0.1, BRUTE)
-		if(!(user in T))
-			user.visible_message("<span class='warning'>A spectral tendril wraps around [user] and pulls [user.p_them()] back to the rune!</span>")
-			Beam(user,icon_state="drainbeam",time=2)
-			user.forceMove(get_turf(src)) //NO ESCAPE :^)
-		if(user.key)
-			user.visible_message("<span class='warning'>[user] slowly relaxes, the glow around [user.p_them()] dimming.</span>", \
+		if(!(affecting in T))
+			user.visible_message("<span class='warning'>A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!</span>")
+			Beam(affecting, icon_state="drainbeam", time=2)
+			affecting.forceMove(get_turf(src)) //NO ESCAPE :^)
+		if(affecting.key)
+			affecting.visible_message("<span class='warning'>[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.</span>", \
 								 "<span class='danger'>You are re-united with your physical form. [src] releases its hold over you.</span>")
-			user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
-			user.Weaken(3)
-			rune_in_use = FALSE
-			affecting = null
-			return
-		if(user.stat == UNCONSCIOUS)
+			affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
+			affecting.Weaken(3)
+			break
+		if(affecting.stat == UNCONSCIOUS)
 			if(prob(1))
-				var/mob/dead/observer/G = user.get_ghost()
+				var/mob/dead/observer/G = affecting.get_ghost()
 				to_chat(G, "<span class='cultitalic'>You feel the link between you and your body weakening... you must hurry!</span>")
-		if(user.stat == DEAD)
-			user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
-			rune_in_use = FALSE
-			affecting = null
-			var/mob/dead/observer/G = user.get_ghost()
+		else if(affecting.stat == DEAD)
+			affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
+			var/mob/dead/observer/G = affecting.get_ghost()
 			to_chat(G, "<span class='cultitalic'><b>You suddenly feel your physical form pass on. [src]'s exertion has killed you!</b></span>")
-			return
+			break
 		sleep(1)
+	affecting = null
 	rune_in_use = FALSE

 //Rite of the Corporeal Shield: When invoked, becomes solid and cannot be passed. Invoke again to undo.
@@ -726,9 +724,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 	update_state()
 	if(density)
 		spread_density()
-	user.visible_message("<span class='warning'>[user] [iscarbon(user) ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].</span>", \
-						 "<span class='cultitalic'>You channel your life energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.</span>")
-	if(iscarbon(user))
+	var/carbon_user = iscarbon(user)
+	user.visible_message("<span class='warning'>[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].</span>", \
+						 "<span class='cultitalic'>You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.</span>")
+	if(carbon_user)
 		var/mob/living/carbon/C = user
 		C.apply_damage(2, BRUTE, pick("l_arm", "r_arm"))

@@ -775,7 +774,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "summons a single cultist to the rune. Requires 2 invokers."
 	invocation = "N'ath reth sh'yro eth d'rekkathnor!"
 	req_cultists = 2
-	allow_excess_invokers = 1
+	invoke_damage = 10
 	icon_state = "5"
 	color = RUNE_COLOR_SUMMON

@@ -812,7 +811,6 @@ structure_check() searches for nearby cultist structures required for the invoca
 									  "<span class='cultitalic'><b>Overwhelming vertigo consumes you as you are hurled through the air!</b></span>")
 	..()
 	visible_message("<span class='warning'>A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!</span>")
-	user.apply_damage(10, BRUTE, "head")
 	cultist_to_summon.forceMove(get_turf(src))
 	qdel(src)

@@ -825,7 +823,8 @@ structure_check() searches for nearby cultist structures required for the invoca
 	color = RUNE_COLOR_MEDIUMRED
 	light_color = LIGHT_COLOR_LAVA
 	req_cultists = 3
-	construct_invoke = 0
+	invoke_damage = 10
+	construct_invoke = FALSE
 	var/tick_damage = 25
 	rune_in_use = FALSE

@@ -839,12 +838,8 @@ structure_check() searches for nearby cultist structures required for the invoca
 	rune_in_use = TRUE
 	var/turf/T = get_turf(src)
 	visible_message("<span class='warning'>[src] turns a bright, glowing orange!</span>")
-	set_light(6)
 	color = "#FC9B54"
-	for(var/M in invokers)
-		var/mob/living/L = M
-		L.apply_damage(10, BRUTE, pick("l_arm", "r_arm"))
-		to_chat(L, "<span class='cultitalic'>[src] saps your strength!</span>")
+	set_light(6, 1, color)
 	for(var/mob/living/L in viewers(T))
 		if(!iscultist(L) && L.blood_volume)
 			var/obj/item/weapon/nullrod/N = L.null_rod_check()
@@ -856,23 +851,24 @@ structure_check() searches for nearby cultist structures required for the invoca
 				to_chat(L, "<span class='userdanger'>You feel an unholy darkness dimming the Justiciar's light!</span>")
 	animate(src, color = "#FCB56D", time = 4)
 	sleep(4)
-	if(!src)
+	if(QDELETED(src))
 		return
 	do_area_burn(T, 0.5)
 	animate(src, color = "#FFDF80", time = 5)
 	sleep(5)
-	if(!src)
+	if(QDELETED(src))
 		return
 	do_area_burn(T, 1)
 	animate(src, color = "#FFFDF4", time = 6)
 	sleep(6)
-	if(!src)
+	if(QDELETED(src))
 		return
 	do_area_burn(T, 1.5)
 	new /obj/effect/hotspot(T)
 	qdel(src)

 /obj/effect/rune/blood_boil/proc/do_area_burn(turf/T, multiplier)
+	set_light(6, 1, color)
 	for(var/mob/living/L in viewers(T))
 		if(!iscultist(L) && L.blood_volume)
 			var/obj/item/weapon/nullrod/N = L.null_rod_check()
@@ -888,7 +884,8 @@ structure_check() searches for nearby cultist structures required for the invoca
 	cultist_desc = "manifests a spirit as a servant of the Geometer. The invoker must not move from atop the rune, and will take damage for each summoned spirit."
 	invocation = "Gal'h'rfikk harfrandid mud'gib!" //how the fuck do you pronounce this
 	icon_state = "6"
-	construct_invoke = 0
+	invoke_damage = 10
+	construct_invoke = FALSE
 	color = RUNE_COLOR_MEDIUMRED
 	var/ghost_limit = 5
 	var/ghosts = 0
@@ -939,7 +936,6 @@ structure_check() searches for nearby cultist structures required for the invoca
 	..()
 	ghosts++
 	playsound(src, 'sound/magic/exit_blood.ogg', 50, 1)
-	user.apply_damage(10, BRUTE)
 	visible_message("<span class='warning'>A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.</span>")
 	to_chat(user, "<span class='cultitalic'>Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...</span>")
 	var/turf/T = get_turf(src)
@@ -1,6 +1,6 @@
 /datum/game_mode/extended
 	name = "secret extended"
-	config_tag = "secret extended"
+	config_tag = "secret_extended"
 	required_players = 0

 	announce_span = "notice"
@@ -1,53 +0,0 @@
-diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm	(rejected hunks)
-@@ -170,35 +170,35 @@
- 
- 	gang.message_gangtools("[usr] is attempting to recall the emergency shuttle.")
- 	recalling = 1
-	to_chat(loc, "<span class='info'>\icon[src]Generating shuttle recall order with codes retrieved from last call signal...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Generating shuttle recall order with codes retrieved from last call signal...</span>")
- 
- 	sleep(rand(100,300))
- 
- 	if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station
-		to_chat(user, "<span class='warning'>\icon[src]Emergency shuttle cannot be recalled at this time.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Emergency shuttle cannot be recalled at this time.</span>")
- 		recalling = 0
- 		return 0
-	to_chat(loc, "<span class='info'>\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Shuttle recall order generated. Accessing station long-range communication arrays...</span>")
- 
- 	sleep(rand(100,300))
- 
- 	if(!gang.dom_attempts)
-		to_chat(user, "<span class='warning'>\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.</span>")
- 		recalling = 0
- 		return 0
- 
- 	var/turf/userturf = get_turf(user)
- 	if(userturf.z != 1) //Shuttle can only be recalled while on station
-		to_chat(user, "<span class='warning'>\icon[src]Error: Device out of range of station communication arrays.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Device out of range of station communication arrays.</span>")
- 		recalling = 0
- 		return 0
- 	var/datum/station_state/end_state = new /datum/station_state()
- 	end_state.count()
- 	if((100 *  start_state.score(end_state)) < 80) //Shuttle cannot be recalled if the station is too damaged
-		to_chat(user, "<span class='warning'>\icon[src]Error: Station communication systems compromised. Unable to establish connection.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Station communication systems compromised. Unable to establish connection.</span>")
- 		recalling = 0
- 		return 0
-	to_chat(loc, "<span class='info'>\icon[src]Comm arrays accessed. Broadcasting recall signal...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Comm arrays accessed. Broadcasting recall signal...</span>")
- 
- 	sleep(rand(100,300))
- 
-@@ -210,7 +210,7 @@
- 		if(SSshuttle.cancelEvac(user))
- 			return 1
- 
-	to_chat(loc, "<span class='info'>\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]No response recieved. Emergency shuttle cannot be recalled at this time.</span>")
- 	return 0
- 
- /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user)
@@ -42,8 +42,8 @@
 	var/obj/effect/countdown/nuclearbomb/countdown
 	var/static/bomb_set

-/obj/machinery/nuclearbomb/New()
-	..()
+/obj/machinery/nuclearbomb/Initialize()
+	. = ..()
 	countdown = new(src)
 	GLOB.nuke_list += src
 	core = new /obj/item/nuke_core(src)
@@ -81,14 +81,14 @@
 /obj/machinery/nuclearbomb/syndicate
 	//ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb

-/obj/machinery/nuclearbomb/syndicate/New()
+/obj/machinery/nuclearbomb/syndicate/Initialize()
+	. = ..()
 	var/obj/machinery/nuclearbomb/existing = locate("syndienuke")
 	if(existing)
 		qdel(src)
 		throw EXCEPTION("Attempted to spawn a syndicate nuke while one already exists at [existing.loc.x],[existing.loc.y],[existing.loc.z]")
 		return 0
 	tag = "syndienuke"
-	return ..()

 /obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params)
 	if (istype(I, /obj/item/weapon/disk/nuclear))
@@ -1,27 +0,0 @@
-diff a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm	(rejected hunks)
-@@ -413,10 +413,10 @@
- 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[src]'>[customsender]</a> ([customjob]):</b></i><br>[custommessage]<br>"
- 							if (!customrecepient.silent)
- 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3)
-+								customrecepient.audible_message("[bicon(customrecepient)] *[customrecepient.ttone]*", null, 3)
- 								if( customrecepient.loc && ishuman(customrecepient.loc) )
- 									var/mob/living/carbon/human/H = customrecepient.loc
-									to_chat(H, "\icon[customrecepient] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)")
-+									to_chat(H, "[bicon(customrecepient)] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)")
- 								log_pda("[usr]/([usr.ckey]) (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
- 								customrecepient.cut_overlays()
- 								customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r"))
-@@ -426,10 +426,10 @@
- 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[PDARec]'>[PDARec.owner]</a> ([customjob]):</b></i><br>[custommessage]<br>"
- 							if (!customrecepient.silent)
- 								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
-								customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3)
-+								customrecepient.audible_message("[bicon(customrecepient)] *[customrecepient.ttone]*", null, 3)
- 								if( customrecepient.loc && ishuman(customrecepient.loc) )
- 									var/mob/living/carbon/human/H = customrecepient.loc
-									to_chat(H, "\icon[customrecepient] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)")
-+									to_chat(H, "[bicon(customrecepient)] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)")
- 								log_pda("[usr]/([usr.ckey]) (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
- 								customrecepient.cut_overlays()
- 								customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r"))
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm	(rejected hunks)
-@@ -316,7 +316,7 @@
- 		// Create a radio headset for the sole purpose of using its icon
- 		var/obj/item/device/radio/headset/radio = new
- 
-		var/part_b = "</span><b> \icon[radio]\[[freq_text]\][part_b_extra]</b> <span class='message'>"
-+		var/part_b = "</span><b> [bicon(radio)]\[[freq_text]\][part_b_extra]</b> <span class='message'>"
- 		var/part_c = "</span></span>"
- 
- 		if (display_freq==SYND_FREQ)
@@ -53,6 +53,7 @@
 	var/extended_inventory = 0	//can we access the hidden inventory?
 	var/scan_id = 1
 	var/obj/item/weapon/coin/coin
+	var/obj/item/stack/spacecash/bill

 	var/dish_quants = list()  //used by the snack machine's custom compartment to count dishes.

@@ -118,10 +119,9 @@
 	..()

 /obj/machinery/vending/Destroy()
-	qdel(wires)
-	wires = null
-	qdel(coin)
-	coin = null
+	QDEL_NULL(wires)
+	QDEL_NULL(coin)
+	QDEL_NULL(bill)
 	return ..()

 /obj/machinery/vending/snack/Destroy()
@@ -311,6 +311,12 @@
 			attack_hand(user)
 		return
 	else if(istype(W, /obj/item/weapon/coin))
+		if(coin)
+			to_chat(user, "<span class='warning'>[src] already has [coin] inserted</span>")
+			return
+		if(bill)
+			to_chat(user, "<span class='warning'>[src] already has [bill] inserted</span>")
+			return
 		if(!premium.len)
 			to_chat(user, "<span class='warning'>[src] doesn't have a coin slot.</span>")
 			return
@@ -320,6 +326,21 @@
 		coin = W
 		to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
 		return
+	else if(istype(W, /obj/item/stack/spacecash))
+		if(coin)
+			to_chat(user, "<span class='warning'>[src] already has [coin] inserted</span>")
+			return
+		if(bill)
+			to_chat(user, "<span class='warning'>[src] already has [bill] inserted</span>")
+			return
+		var/obj/item/stack/S = W
+		if(!premium.len)
+			to_chat(user, "<span class='warning'>[src] doesn't have a bill slot.</span>")
+			return
+		S.use(1)
+		bill = new S.type(src,1)
+		to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
+		return
 	else if(istype(W, refill_canister) && refill_canister != null)
 		if(stat & (BROKEN|NOPOWER))
 			to_chat(user, "<span class='notice'>It does nothing.</span>")
@@ -386,9 +407,9 @@
 			var/list/display_records = product_records
 			if(extended_inventory)
 				display_records = product_records + hidden_records
-			if(coin)
+			if(coin || bill)
 				display_records = product_records + coin_records
-			if(coin && extended_inventory)
+			if((coin || bill) && extended_inventory)
 				display_records = product_records + hidden_records + coin_records
 			dat += "<ul>"
 			for (var/datum/data/vending_product/R in display_records)
@@ -403,11 +424,11 @@
 			dat += "</ul>"
 		dat += "</div>"
 		if(premium.len > 0)
-			dat += "<b>Coin slot:</b> "
-			if (coin)
-				dat += "[coin]&nbsp;&nbsp;<a href='byond://?src=\ref[src];remove_coin=1'>Remove</a>"
+			dat += "<b>Change Return:</b> "
+			if (coin || bill)
+				dat += "[(coin ? coin : "")][(bill ? bill : "")]&nbsp;&nbsp;<a href='byond://?src=\ref[src];remove_coin=1'>Remove</a>"
 			else
-				dat += "<i>No coin</i>&nbsp;&nbsp;<span class='linkOff'>Remove</span>"
+				dat += "<i>No money</i>&nbsp;&nbsp;<span class='linkOff'>Remove</span>"
 		if(istype(src, /obj/machinery/vending/snack))
 			dat += "<h3>Chef's Food Selection</h3>"
 			dat += "<div class='statusDisplay'>"
@@ -443,16 +464,24 @@
 			return

 	if(href_list["remove_coin"])
-		if(!coin)
-			to_chat(usr, "<span class='notice'>There is no coin in this machine.</span>")
+		if(!(coin || bill))
+			to_chat(usr, "<span class='notice'>There is no money in this machine.</span>")
 			return
-
-		coin.loc = loc
-		if(!usr.get_active_held_item())
-			usr.put_in_hands(coin)
-		to_chat(usr, "<span class='notice'>You remove [coin] from [src].</span>")
-		coin = null
-
+		if(coin)
+			if(!usr.get_active_held_item())
+				usr.put_in_hands(coin)
+			else
+				coin.forceMove(get_turf(src))
+			to_chat(usr, "<span class='notice'>You remove [coin] from [src].</span>")
+			coin = null
+		if(bill)
+			if(!usr.get_active_held_item())
+				usr.put_in_hands(bill)
+			else
+				bill.forceMove(get_turf(src))
+			to_chat(usr, "<span class='notice'>You remove [bill] from [src].</span>")
+			bill = null
+

 	usr.set_machine(src)

@@ -494,26 +523,25 @@
 				vend_ready = 1
 				return
 		else if(R in coin_records)
-			if(!coin)
-				to_chat(usr, "<span class='warning'>You need to insert a coin to get this item!</span>")
+			if(!(coin || bill))
+				to_chat(usr, "<span class='warning'>You need to insert money to get this item!</span>")
 				vend_ready = 1
 				return
-			if(coin.string_attached)
+			if(coin && coin.string_attached)
 				if(prob(50))
 					if(usr.put_in_hands(coin))
 						to_chat(usr, "<span class='notice'>You successfully pull [coin] out before [src] could swallow it.</span>")
 						coin = null
 					else
 						to_chat(usr, "<span class='warning'>You couldn't pull [coin] out because your hands are full!</span>")
-						qdel(coin)
-						coin = null
+						QDEL_NULL(coin)
 				else
 					to_chat(usr, "<span class='warning'>You weren't able to pull [coin] out fast enough, the machine ate it, string and all!</span>")
-					qdel(coin)
-					coin = null
+					QDEL_NULL(coin)
 			else
-				qdel(coin)
-				coin = null
+				QDEL_NULL(coin)
+				QDEL_NULL(bill)
+
 		else if (!(R in product_records))
 			vend_ready = 1
 			message_admins("Vending machine exploit attempted by [key_name(usr, usr.client)]!")
@@ -56,7 +56,7 @@
 	var/datum/gas_mixture/cabin_air
 	var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port = null

-	var/obj/item/device/radio/radio = null
+	var/obj/item/device/radio/mech/radio
 	var/list/trackers = list()

 	var/max_temperature = 25000
@@ -117,6 +117,7 @@

 	hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD)

+/obj/item/device/radio/mech //this has to go somewhere

 /obj/mecha/Initialize()
 	. = ..()
@@ -155,11 +156,9 @@
 			AI = M //AIs are loaded into the mech computer itself. When the mech dies, so does the AI. They can be recovered with an AI card from the wreck.
 		else
 			M.forceMove(loc)
-
-	if(prob(30))
-		explosion(get_turf(loc), 0, 0, 1, 3)
-
 	if(wreckage)
+		if(prob(30))
+			explosion(get_turf(src), 0, 0, 1, 3)
 		var/obj/structure/mecha_wreckage/WR = new wreckage(loc, AI)
 		for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
 			if(E.salvageable && prob(30))
@@ -91,32 +91,34 @@
 /obj/mecha/working/ripley/mining
 	desc = "An old, dusty mining Ripley."
 	name = "\improper APLU \"Miner\""
+	obj_integrity = 75 //Low starting health

-/obj/mecha/working/ripley/mining/New()
-	..()
-	//Attach drill
-	if(prob(25)) //Possible diamond drill... Feeling lucky?
-		var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
-		D.attach(src)
-	else
-		var/obj/item/mecha_parts/mecha_equipment/drill/D = new /obj/item/mecha_parts/mecha_equipment/drill
-		D.attach(src)
+/obj/mecha/working/ripley/mining/Initialize()
+	. = ..()
+	if(cell)
+		cell.charge = Floor(cell.charge * 0.25) //Starts at very low charge
+	if(prob(70)) //Maybe add a drill
+		if(prob(15)) //Possible diamond drill... Feeling lucky?
+			var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new
+			D.attach(src)
+		else
+			var/obj/item/mecha_parts/mecha_equipment/drill/D = new
+			D.attach(src)

-	//Add possible plasma cutter
-	if(prob(25))
-		var/obj/item/mecha_parts/mecha_equipment/M = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
+	else //Add possible plasma cutter if no drill
+		var/obj/item/mecha_parts/mecha_equipment/M = new
 		M.attach(src)

 	//Add ore box to cargo
 	cargo.Add(new /obj/structure/ore_box(src))

 	//Attach hydraulic clamp
-	var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
+	var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new
 	HC.attach(src)
 	for(var/obj/item/mecha_parts/mecha_tracking/B in trackers)//Deletes the beacon so it can't be found easily
 		qdel(B)

-	var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new /obj/item/mecha_parts/mecha_equipment/mining_scanner
+	var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
 	scanner.attach(src)

 /obj/mecha/working/ripley/Exit(atom/movable/O)
@@ -220,7 +220,7 @@
 /obj/structure/foamedmetal/attack_hand(mob/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-	to_chat(user, "<span class='warning'>You hit the metal foam but bounce off it!</span>")
+	to_chat(user, "<span class='warning'>You hit [src] but bounce off it!</span>")
 	playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)

 /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5)
@@ -6,8 +6,8 @@
 	item_state = "syringe_kit"
 	w_class = WEIGHT_CLASS_SMALL
 	var/result_path
-	var/inverse = 0
-	// For inverse dir frames like light fixtures.
+	var/inverse = 0 // For inverse dir frames like light fixtures.
+	var/pixel_shift //The amount of pixels

 /obj/item/wallframe/proc/try_build(turf/on_wall, mob/user)
 	if(get_dist(on_wall,user)>1)
@@ -40,6 +40,16 @@
 			ndir = turn(ndir, 180)

 		var/obj/O = new result_path(get_turf(user), ndir, TRUE)
+		if(pixel_shift)
+			switch(ndir)
+				if(NORTH)
+					O.pixel_y = pixel_shift
+				if(SOUTH)
+					O.pixel_y = -pixel_shift
+				if(EAST)
+					O.pixel_x = pixel_shift
+				if(WEST)
+					O.pixel_x = -pixel_shift
 		after_attach(O)

 	qdel(src)
@@ -111,11 +111,13 @@
 /obj/item/device/pda/heads/rd
 	name = "research director PDA"
 	default_cartridge = /obj/item/weapon/cartridge/rd
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-rd"

 /obj/item/device/pda/captain
 	name = "captain PDA"
 	default_cartridge = /obj/item/weapon/cartridge/captain
+	inserted_item = /obj/item/weapon/pen/fountain/captain
 	icon_state = "pda-captain"
 	detonate = 0

@@ -127,6 +129,7 @@
 /obj/item/device/pda/quartermaster
 	name = "quartermaster PDA"
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-qm"

 /obj/item/device/pda/shaftminer
@@ -148,6 +151,7 @@
 /obj/item/device/pda/lawyer
 	name = "lawyer PDA"
 	default_cartridge = /obj/item/weapon/cartridge/lawyer
+	inserted_item = /obj/item/weapon/pen/fountain
 	icon_state = "pda-lawyer"
 	ttone = "objection"

@@ -166,6 +170,7 @@
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
 	default_cartridge = /obj/item/weapon/cartridge/curator
+	inserted_item = /obj/item/weapon/pen/fountain
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
@@ -184,6 +189,7 @@
 /obj/item/device/pda/bar
 	name = "bartender PDA"
 	icon_state = "pda-bartender"
+	inserted_item = /obj/item/weapon/pen/fountain

 /obj/item/device/pda/atmos
 	name = "atmospherics PDA"
@@ -10,15 +10,64 @@
 	var/mob/living/silicon/ai/ai = list()
 	var/last_tick //used to delay the powercheck
 	dog_fashion = null
+	var/unfastened = FALSE
+
+/obj/item/device/radio/intercom/unscrewed
+	unfastened = TRUE

-/obj/item/device/radio/intercom/Initialize()
+/obj/item/device/radio/intercom/Initialize(mapload, ndir, building)
 	. = ..()
+	if(building)
+		setDir(ndir)
 	START_PROCESSING(SSobj, src)

 /obj/item/device/radio/intercom/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	return ..()

+/obj/item/device/radio/intercom/examine(mob/user)
+	..()
+	if(!unfastened)
+		to_chat(user, "<span class='notice'>It's <b>screwed</b> and secured to the wall.</span>")
+	else
+		to_chat(user, "<span class='notice'>It's <i>unscrewed</i> from the wall, and can be <b>detached</b>.</span>")
+
+/obj/item/device/radio/intercom/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		var/obj/item/weapon/screwdriver/S = I
+		if(unfastened)
+			user.visible_message("<span class='notice'>[user] starts tightening [src]'s screws...</span>", "<span class='notice'>You start screwing in [src]...</span>")
+			playsound(src, S.usesound, 50, 1)
+			if(!do_after(user, 30 * S.toolspeed, target = src))
+				return
+			user.visible_message("<span class='notice'>[user] tightens [src]'s screws!</span>", "<span class='notice'>You tighten [src]'s screws.</span>")
+			playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
+			unfastened = FALSE
+		else
+			user.visible_message("<span class='notice'>[user] starts loosening [src]'s screws...</span>", "<span class='notice'>You start unscrewing [src]...</span>")
+			playsound(src, S.usesound, 50, 1)
+			if(!do_after(user, 60 * S.toolspeed, target = src))
+				return
+			user.visible_message("<span class='notice'>[user] loosens [src]'s screws!</span>", "<span class='notice'>You unscrew [src], loosening it from the wall.</span>")
+			playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
+			unfastened = TRUE
+		return
+	else if(istype(I, /obj/item/weapon/wrench))
+		if(!unfastened)
+			to_chat(user, "<span class='warning'>You need to unscrew [src] from the wall first!</span>")
+			return
+		var/obj/item/weapon/wrench/W = I
+		user.visible_message("<span class='notice'>[user] starts unsecuring [src]...</span>", "<span class='notice'>You start unsecuring [src]...</span>")
+		playsound(src, W.usesound, 50, 1)
+		if(!do_after(user, 80 * W.toolspeed, target = src))
+			return
+		user.visible_message("<span class='notice'>[user] unsecures [src]!</span>", "<span class='notice'>You detach [src] from the wall.</span>")
+		playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
+		new/obj/item/wallframe/intercom(get_turf(src))
+		qdel(src)
+		return
+	return ..()
+
 /obj/item/device/radio/intercom/attack_ai(mob/user)
 	interact(user)

@@ -69,3 +118,13 @@

 /obj/item/device/radio/intercom/add_blood(list/blood_dna)
 	return 0
+
+//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
+/obj/item/wallframe/intercom
+	name = "intercom frame"
+	desc = "A ready-to-go intercom. Just slap it on a wall and screw it in!"
+	icon_state = "intercom"
+	result_path = /obj/item/device/radio/intercom/unscrewed
+	pixel_shift = 29
+	inverse = TRUE
+	materials = list(MAT_METAL = 75, MAT_GLASS = 25)
@@ -197,6 +197,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 			var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
 			if(!istype(O))
 				return
+			if(O.status == BODYPART_ROBOTIC)
+				return
 			var/feetCover = (H.wear_suit && H.wear_suit.body_parts_covered & FEET) || (H.w_uniform && H.w_uniform.body_parts_covered & FEET)
 			if(H.shoes || feetCover || H.movement_type & FLYING || H.buckled)
 				return
@@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 GLOBAL_LIST_INIT(abductor_recipes, list ( \
 /*	new/datum/stack_recipe("alien chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1), \ */
 	new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 2, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \
 	null, \
@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
 	new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
 	new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = 1, on_floor = 1),\
+	new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = 1, on_floor = 1),\
 	new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\
 	))

@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm	(rejected hunks)
-@@ -86,7 +86,7 @@
- 	var/dorm = 0		// determines if this ID has claimed a dorm already
- 
- /obj/item/weapon/card/id/attack_self(mob/user)
-	user.visible_message("<span class='notice'>[user] shows you: \icon[src] [src.name].</span>", \
-+	user.visible_message("<span class='notice'>[user] shows you: [bicon(src)] [src.name].</span>", \
- 					"<span class='notice'>You show \the [src.name].</span>")
- 	src.add_fingerprint(user)
- 	return
@@ -262,7 +262,7 @@

 /obj/item/weapon/nullrod/clown
 	icon = 'icons/obj/wizard.dmi'
-	icon_state = "honkrender"
+	icon_state = "clownrender"
 	item_state = "render"
 	name = "clown dagger"
 	desc = "Used for absolutely hilarious sacrifices."
@@ -62,6 +62,15 @@
 	new /obj/item/device/multitool(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))

+/obj/item/weapon/storage/belt/utility/full/engi/PopulateContents()
+	new /obj/item/weapon/screwdriver(src)
+	new /obj/item/weapon/wrench(src)
+	new /obj/item/weapon/weldingtool/largetank(src)
+	new /obj/item/weapon/crowbar(src)
+	new /obj/item/weapon/wirecutters(src)
+	new /obj/item/device/multitool(src)
+	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
+

 /obj/item/weapon/storage/belt/utility/atmostech/PopulateContents()
 	new /obj/item/weapon/screwdriver(src)
@@ -879,3 +879,11 @@
 /obj/item/weapon/storage/box/silver_sulf/PopulateContents()
 	for(var/i in 1 to 7)
 		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+
+
+/obj/item/weapon/storage/box/fountainpens
+	name = "box of fountain pens"
+
+/obj/item/weapon/storage/box/fountainpens/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/weapon/pen/fountain(src)
@@ -58,7 +58,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/welding(src)
 	for(var/i in 1 to 3)
-		new /obj/item/weapon/weldingtool/largetank(src)
+		new /obj/item/weapon/weldingtool(src)

 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
@@ -50,4 +50,28 @@
 		else
 			to_chat(user, "<span class='danger'>Access Denied.</span>")
 	else
-		return ..()
+		return ..()
+
+/obj/structure/closet/secure_closet/personal/proc/reset_lock(usr)
+	if (opened && !broken)
+		registered_name = null
+		desc = initial(desc)
+		to_chat(usr,"<span class='danger'>The lock has been reset.")
+	else if(!opened)
+		to_chat(usr,"<span class='danger'>The locker must be open!")
+	else if(broken)
+		to_chat(usr,"<span class='danger'>The lock is broken!")
+
+/obj/structure/closet/secure_closet/personal/verb/verb_resetlock()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Reset Lock"
+
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+
+	if(iscarbon(usr) || issilicon(usr) || isdrone(usr))
+		reset_lock(usr)
+	else
+		to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
+
@@ -0,0 +1,18 @@
+/obj/structure/closet/crate/wooden
+	name = "wooden crate"
+	desc = "Works just as well as a metal one."
+	material_drop = /obj/item/stack/sheet/mineral/wood
+	material_drop_amount = 6
+	icon_state = "wooden"
+
+/obj/structure/closet/crate/wooden/toy
+	name = "toy box"
+	desc = "It has the words \"Clown + Mime\" written underneath of it with marker."
+
+/obj/structure/closet/crate/wooden/toy/PopulateContents()
+	. = ..()
+	new	/obj/item/device/megaphone/clown(src)
+	new	/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
+	new /obj/item/weapon/pneumatic_cannon/pie(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
+	new /obj/item/weapon/storage/crayons(src)
@@ -91,6 +91,11 @@
 	icon_state = "[icon_state][rand(1, 6)]"
 	..()

+/obj/structure/flora/tree/jungle/small
+	pixel_y = 0
+	pixel_x = -32
+	icon = 'icons/obj/flora/jungletreesmall.dmi'
+
 //grass
 /obj/structure/flora/grass
 	name = "grass"
@@ -381,5 +386,5 @@
 	pixel_y = -16

 /obj/structure/flora/rock/pile/largejungle/Initialize()
-	..()
-	icon_state = "[initial(icon_state)][rand(1,3)]"
+	. = ..()
+	icon_state = "[initial(icon_state)][rand(1,3)]"
@@ -1,21 +1,95 @@
+#define ENGINE_UNWRENCHED 0
+#define ENGINE_WRENCHED 1
+#define ENGINE_WELDED 2
+#define ENGINE_WELDTIME 200

 /obj/structure/shuttle
 	name = "shuttle"
 	icon = 'icons/turf/shuttle.dmi'
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	obj_integrity = 500
+	max_integrity = 500
+	armor = list(melee = 100, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) //default + ignores melee

 /obj/structure/shuttle/engine
 	name = "engine"
-	density = 1
-	anchored = 1
+	density = TRUE
+	anchored = TRUE
+	var/engine_power = 1
+	var/state = ENGINE_WELDED //welding shmelding
+
+//Ugh this is a lot of copypasta from emitters, welding need some boilerplate reduction
+/obj/structure/shuttle/engine/can_be_unfasten_wrench(mob/user, silent)
+	if(state == ENGINE_WELDED)
+		if(!silent)
+			to_chat(user, "<span class='warning'>[src] is welded to the floor!</span>")
+		return FAILED_UNFASTEN
+	return ..()
+
+/obj/structure/shuttle/engine/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20)
+	. = ..()
+	if(. == SUCCESSFUL_UNFASTEN)
+		if(anchored)
+			state = ENGINE_WRENCHED
+		else
+			state = ENGINE_UNWRENCHED
+
+/obj/structure/shuttle/engine/attackby(obj/item/I, mob/user, params)
+	add_fingerprint(user)
+	if(default_unfasten_wrench(user, I))
+		return
+	else if(istype(I, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = I
+		switch(state)
+			if(ENGINE_UNWRENCHED)
+				to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
+			if(EM_SECURED)
+				if(WT.remove_fuel(0,user))
+					playsound(loc, WT.usesound, 50, 1)
+					user.visible_message("[user.name] starts to weld the [name] to the floor.", \
+						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
+						"<span class='italics'>You hear welding.</span>")
+					if(do_after(user,ENGINE_WELDTIME*WT.toolspeed, target = src) && WT.isOn())
+						state = ENGINE_WELDED
+						to_chat(user, "<span class='notice'>You weld \the [src] to the floor.</span>")
+						alter_engine_power(engine_power)
+			if(EM_WELDED)
+				if(WT.remove_fuel(0,user))
+					playsound(loc, WT.usesound, 50, 1)
+					user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
+						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
+						"<span class='italics'>You hear welding.</span>")
+					if(do_after(user,ENGINE_WELDTIME*WT.toolspeed, target = src) && WT.isOn())
+						state = ENGINE_WRENCHED
+						to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
+						alter_engine_power(-engine_power)
+		return
+	else
+		return ..()
+
+/obj/structure/shuttle/engine/Destroy()
+	if(state == ENGINE_WELDED)
+		alter_engine_power(-engine_power)
+	. = ..()
+
+//Propagates the change to the shuttle.
+/obj/structure/shuttle/engine/proc/alter_engine_power(mod)
+	if(mod == 0)
+		return
+	if(SSshuttle.is_in_shuttle_bounds(src))
+		var/obj/docking_port/mobile/M = SSshuttle.get_containing_shuttle(src)
+		if(M)
+			M.alter_engines(mod)

 /obj/structure/shuttle/engine/heater
 	name = "heater"
 	icon_state = "heater"
+	engine_power = 0 // todo make these into 2x1 parts

 /obj/structure/shuttle/engine/platform
 	name = "platform"
 	icon_state = "platform"
+	engine_power = 0

 /obj/structure/shuttle/engine/propulsion
 	name = "propulsion"
@@ -25,6 +99,10 @@
 /obj/structure/shuttle/engine/propulsion/burst
 	name = "burst"

+/obj/structure/shuttle/engine/propulsion/burst/cargo
+	state = ENGINE_UNWRENCHED
+	anchored = FALSE
+
 /obj/structure/shuttle/engine/propulsion/burst/left
 	name = "left"
 	icon_state = "burst_l"
@@ -0,0 +1,10 @@
+diff a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm	(rejected hunks)
+@@ -46,7 +117,7 @@
+ 	bound_height = 64
+ 	appearance_flags = 0
+ 
+-obj/structure/shuttle/engine/huge
+/obj/structure/shuttle/engine/huge
+ 	name = "engine"
+ 	opacity = 1
+ 	icon = 'icons/obj/3x3.dmi'
@@ -116,6 +116,23 @@
 	underlay_appearance.icon_state = "necro1"
 	return TRUE

+/turf/closed/indestructible/riveted/boss
+	name = "stone wall"
+	desc = "A thick, seemingly indestructible stone wall."
+	icon = 'icons/turf/walls/boss_wall.dmi'
+	icon_state = "wall"
+	explosion_block = 50
+	baseturf = /turf/closed/indestructible/riveted/boss
+
+/turf/closed/indestructible/riveted/boss/hot
+	icon = 'icons/turf/walls/boss_wall_hot.dmi'
+	baseturf = /turf/closed/indestructible/riveted/boss/hot
+
+/turf/closed/indestructible/riveted/boss/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "basalt"
+	return TRUE
+
 /turf/closed/indestructible/riveted/hierophant
 	name = "wall"
 	desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
@@ -54,8 +54,16 @@
 		else
 			to_chat(user, "<span class='warning'>The plating is going to need some support! Place metal rods first.</span>")

+/turf/open/chasm/proc/is_safe()
+	//if anything matching this typecache is found in the chasm, we don't drop things
+	var/static/list/chasm_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
+	var/list/found_safeties = typecache_filter_list(contents, chasm_safeties_typecache)
+	return LAZYLEN(found_safeties)
+
 /turf/open/chasm/proc/drop_stuff(AM)
 	. = 0
+	if(is_safe())
+		return FALSE
 	var/thing_to_check = src
 	if(AM)
 		thing_to_check = list(AM)
@@ -54,7 +54,7 @@

 /turf/open/floor/plating/lava/proc/is_safe()
 	//if anything matching this typecache is found in the lava, we don't burn things
-	var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk))
+	var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
 	var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache)
 	return LAZYLEN(found_safeties)

@@ -196,9 +196,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	else
 		MessageNoRecipient(parsed_message)

-		//show it to the person adminhelping too
-		to_chat(C, "<span class='adminnotice'>PM to-<b>Admins</b>: [name]</span>")
-
 		//send it to irc if nobody is on and tell us how many were on
 		var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]")
 		log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
@@ -265,6 +262,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		window_flash(X, ignorepref = TRUE)
 		to_chat(X, chat_msg)

+	//show it to the person adminhelping too
+	to_chat(initiator, "<span class='adminnotice'>PM to-<b>Admins</b>: [name]</span>")
+
 //Reopen a closed ticket
 /datum/admin_help/proc/Reopen()
 	if(state == AHELP_ACTIVE)
@@ -1,10 +0,0 @@
-diff a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm	(rejected hunks)
-@@ -33,7 +33,7 @@
- 		prayer_type = "CULTIST PRAYER"
- 		deity = "Nar-Sie"
- 
-	msg = "<span class='adminnotice'>\icon[cross]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]: </font>[ADMIN_FULLMONTY(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]:</b> [msg]</span>"
-+	msg = "<span class='adminnotice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]: </font>[ADMIN_FULLMONTY(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]:</b> [msg]</span>"
- 
- 	for(var/client/C in admins)
- 		if(C.prefs.chat_toggles & CHAT_PRAYER)
@@ -5,7 +5,7 @@
 	cost = 500
 	unit_name = "crate"
 	export_types = list(/obj/structure/closet/crate)
-	exclude_types = list(/obj/structure/closet/crate/large)
+	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)

 /datum/export/large/crate/total_printout() // That's why a goddamn metal crate costs that much.
 	. = ..()
@@ -14,7 +14,7 @@

 /datum/export/large/crate/wooden
 	cost = 100
-	unit_name = "wooden crate"
+	unit_name = "large wooden crate"
 	export_types = list(/obj/structure/closet/crate/large)
 	exclude_types = list()

@@ -22,6 +22,13 @@
 	unit_name = "ore box"
 	export_types = list(/obj/structure/ore_box)

+/datum/export/large/crate/wood
+	cost = 240
+	unit_name = "wooden crate"
+	export_types = list(/obj/structure/closet/crate/wooden)
+	exclude_types = list()
+
+

 // Reagent dispensers.
 /datum/export/large/reagent_dispenser
@@ -96,3 +103,79 @@
 	cost = 325
 	unit_name = "security barrier"
 	export_types = list(/obj/item/weapon/grenade/barrier, /obj/structure/barricade/security)
+
+//Mecha
+/datum/export/large/mech
+	export_types = list(/obj/mecha)
+	var/sellable
+
+/datum/export/large/mech/applies_to(obj/O)
+	if(!..())
+		return FALSE
+
+	var/obj/mecha/ME = O
+	ME.wreckage = null // So the mech doesn't blow up in the cargo shuttle
+	if(sellable)
+		return TRUE
+
+/datum/export/large/mech/sellable
+	export_types = list()
+	sellable = TRUE
+
+/datum/export/large/mech/sellable/ripley
+	cost = 7500 //boards cost 2500 and takes another 1566 worth of materials (glass, metal, plaseel) to build + significant labor
+	unit_name = "APLU \"Ripley\""
+	export_types = list(/obj/mecha/working/ripley)
+	exclude_types = list(/obj/mecha/working/ripley/firefighter)
+
+/datum/export/large/mech/sellable/firefighter
+	cost = 9000 //same as a ripley but takes 10 more plasteel and 5 less metal
+	unit_name = "APLU \"Firefighter\""
+	export_types = list(/obj/mecha/working/ripley/firefighter)
+
+/datum/export/large/mech/sellable/odysseus
+	cost = 6000 // 1540 of material + 2000 price boards + labor
+	unit_name = "odysseus"
+	export_types = list(/obj/mecha/medical/odysseus)
+
+/datum/export/large/mech/sellable/gygax
+	cost = 25000 // The material is worth 22631 alone. Not as big of a premium as one would expect, since R&D would have provided upgrades by then.
+	unit_name = "gygax"
+	export_types = list(/obj/mecha/combat/gygax)
+	exclude_types = list(/obj/mecha/combat/gygax/dark)
+
+/datum/export/large/mech/sellable/honkmech
+	cost = 80000 // The bananium alone is worth around 64887 credits
+	unit_name = "H.O.N.K"
+	message = "- HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONK HONKHONKHONKHONK"
+	export_types = list(/obj/mecha/combat/honker)
+
+/datum/export/large/mech/sellable/durand
+	cost = 12000 // 7586 worth of material. That's less than a gygax. Players will be disappointed by the durand's comparative lack of worth but oh well. Still a large premium because this requires significant cooperation between R&D, robotics, and cargo.
+	unit_name = "durand"
+	export_types = list(/obj/mecha/combat/durand)
+
+/datum/export/large/mech/sellable/phazon
+	cost = 50000 // 15767 material + anomaly core. Fuck it, if you're willing to try selling one of these you should get BIG FUCKING MONEY
+	unit_name = "phazon"
+	export_types = list(/obj/mecha/combat/phazon)
+
+/datum/export/large/mech/sellable/syndiegygax
+	cost = 50000 // You somehow stole a nuke op's gygax and sold it to nanotrasen. Go you.
+	unit_name = "captured syndicate gygax"
+	export_types = list(/obj/mecha/combat/gygax/dark)
+
+/datum/export/large/mech/sellable/syndiegygax/syndie
+	cost = 25000 // You somehow stole a nuke op's gygax and sold it back to the syndicate. Why would you do this?
+	unit_name = "gygax"
+	emagged = TRUE
+
+/datum/export/large/mech/sellable/mauler
+	cost = 87500 // Whoa, momma.
+	unit_name = "captured mauler"
+	export_types = list(/obj/mecha/combat/marauder/mauler)
+
+/datum/export/large/mech/sellable/mauler/syndie
+	cost = 43750 // Just like the mauler is worth 1.75x the telecrystals compared to the gygax, the price reflects this
+	unit_name = "mauler"
+	emagged = TRUE
@@ -99,6 +99,7 @@
 	cost = 5
 	unit_name = "radio"
 	export_types = list(/obj/item/device/radio)
+	exclude_types = list(/obj/item/device/radio/mech)


 // High-tech tools.
@@ -710,6 +710,15 @@
 					/obj/item/weapon/am_containment)
 	crate_name = "antimatter jar crate"

+/datum/supply_pack/engineering/shuttle_engine
+	name = "Shuttle Engine Crate"
+	cost = 5000
+	access = GLOB.access_ce
+	contains = list(/obj/structure/shuttle/engine/propulsion/burst/cargo)
+	crate_name = "shuttle engine crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+	special = TRUE
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Medical /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -1423,6 +1432,7 @@
 					/obj/item/weapon/pen/fourcolor,
 					/obj/item/weapon/pen/fourcolor,
 					/obj/item/weapon/pen,
+					/obj/item/weapon/pen/fountain,
 					/obj/item/weapon/pen/blue,
 					/obj/item/weapon/pen/red,
 					/obj/item/weapon/folder/blue,
@@ -1434,6 +1444,12 @@
 					/obj/item/weapon/stamp/denied)
 	crate_name = "bureaucracy crate"

+/datum/supply_pack/misc/fountainpens
+	name = "Calligraphy Crate"
+	cost = 700
+	contains = list(/obj/item/weapon/storage/box/fountainpens)
+	crate_type = /obj/structure/closet/crate/wooden
+
 /datum/supply_pack/misc/toner
 	name = "Toner Crate"
 	cost = 1000
@@ -1,21 +0,0 @@
-diff a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm	(rejected hunks)
-@@ -279,19 +279,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
- 		"changelog.css" = 'html/changelog.css'
- 	)
- 
-/datum/asset/simple/chat
-	assets = list(
-		"jquery.min.js" = 'code/modules/html_interface/js/jquery.min.js',
-		"json2.min.js" = 'goon/browserassets/js/json2.min.js',
-		"browserOutput.js" = 'goon/browserassets/js/browserOutput.js',
-		"fontawesome-webfont.eot" = 'tgui/assets/fonts/fontawesome-webfont.eot',
-		"fontawesome-webfont.svg" = 'tgui/assets/fonts/fontawesome-webfont.svg',
-		"fontawesome-webfont.ttf" = 'tgui/assets/fonts/fontawesome-webfont.ttf',
-		"fontawesome-webfont.woff" = 'tgui/assets/fonts/fontawesome-webfont.woff',
-		"font-awesome.css" = 'goon/browserassets/css/font-awesome.css',
-		"browserOutput.css" = 'goon/browserassets/css/browserOutput.css'
-	)
-
- //Registers HTML Interface assets.
- /datum/asset/HTML_interface/register()
- 	for(var/path in typesof(/datum/html_interface))
@@ -1,10 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -196,6 +203,8 @@ var/next_external_rsc = 0
- 
- 	. = ..()	//calls mob.Login()
- 
-+	chatOutput.start()
-+
- 	connection_time = world.time
- 	connection_realtime = world.realtime
- 	connection_timeofday = world.timeofday
@@ -1,7 +1,7 @@
 /client/verb/toggle_tips()
 	set name = "Toggle examine tooltips"
 	set desc = "Toggles examine hover-over tooltips"
-	set category = "OOC"
+	set category = "Preferences"

 	prefs.enable_tips = !prefs.enable_tips
 	prefs.save_preferences()
@@ -10,7 +10,7 @@
 /client/verb/change_tip_delay()
 	set name = "Set examine tooltip delay"
 	set desc = "Sets the delay in milliseconds before examine tooltips appear"
-	set category = "OOC"
+	set category = "Preferences"

 	var/indelay = stripped_input(usr, "Enter the tooltip delay in milliseconds (default: 500)", "Enter tooltip delay", "", 10)
 	indelay = text2num(indelay)
@@ -134,6 +134,89 @@ GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
 	else
 		to_chat(src, "<span class='notice'>There are no admin notices at the moment.</span>")

+/client/verb/fix_chat()
+	set name = "Fix chat"
+	set category = "OOC"
+	if (!chatOutput || !istype(chatOutput))
+		var/action = alert(src, "Invalid Chat Output data found!\nRecreate data?", "Wot?", "Recreate Chat Output data", "Cancel")
+		if (action != "Recreate Chat Output data")
+			return
+		chatOutput = new /datum/chatOutput(src)
+		chatOutput.start()
+		action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope")
+		if (action == "Fixed")
+			log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum")
+		else
+			chatOutput.load()
+			action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No")
+			if (action == "Yes")
+				log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum and forcing a load()")
+			else
+				action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat")
+				if (action == "Switch to old chat")
+					winset(src, "output", "is-visible=true;is-disabled=false")
+					winset(src, "browseroutput", "is-visible=false")
+				log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after recreating the chatOutput and forcing a load()")
+	
+	else if (chatOutput.loaded)
+		var/action = alert(src, "ChatOutput seems to be loaded\nDo you want me to force a reload, wiping the chat log or just refresh the chat window because it broke/went away?", "Hmmm", "Force Reload", "Refresh", "Cancel")
+		switch (action)
+			if ("Force Reload")
+				chatOutput.loaded = FALSE
+				chatOutput.start() //this is likely to fail since it asks , but we should try it anyways so we know.
+				action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope")
+				if (action == "Fixed")
+					log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a start()")
+				else
+					chatOutput.load()
+					action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No")
+					if (action == "Yes")
+						log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()")
+					else
+						action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat")
+						if (action == "Switch to old chat")
+							winset(src, "output", "is-visible=true;is-disabled=false")
+							winset(src, "browseroutput", "is-visible=false")
+						log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a start() and forcing a load()")
+						
+			if ("Refresh")
+				chatOutput.showChat()
+				action = alert(src, "Goon chat refreshing, wait a bit and tell me if it's fixed", "", "Fixed", "Nope, force a reload")
+				if (action == "Fixed")
+					log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a show()")
+				else
+					chatOutput.loaded = FALSE
+					chatOutput.load()
+					action = alert(src, "How about now? (give it a moment)", "", "Yes", "No")
+					if (action == "Yes")
+						log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()")
+					else
+						action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat")
+						if (action == "Switch to old chat")
+							winset(src, "output", "is-visible=true;is-disabled=false")
+							winset(src, "browseroutput", "is-visible=false")
+						log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a show() and forcing a load()")
+		return
+	
+	else
+		chatOutput.start()
+		var/action = alert(src, "Manually loading Chat, wait a bit and tell me if it's fixed", "", "Fixed", "Nope")
+		if (action == "Fixed")
+			log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start()")
+		else
+			chatOutput.load()
+			alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No")
+			if (action == "Yes")
+				log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start() and forcing a load()")
+			else
+				action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat")
+				if (action == "Switch to old chat")
+					winset(src, "output", list2params(list("on-show" = "", "is-disabled" = "false", "is-visible" = "true")))
+					winset(src, "browseroutput", "is-disabled=true;is-visible=false")
+				log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after manually calling start() and forcing a load()")
+	
+	
+
 /client/verb/motd()
 	set name = "MOTD"
 	set category = "OOC"
@@ -74,6 +74,14 @@
 	item_color = "waistcoat"
 	minimize_when_attached = FALSE

+/obj/item/clothing/accessory/maidapron
+	name = "maid apron"
+	desc = "The best part of a maid costume."
+	icon_state = "apron"
+	item_state = "apronchef" //probably close enough
+	item_color = "apron"
+	minimize_when_attached = FALSE
+
 //////////
 //Medals//
 //////////
@@ -503,6 +503,12 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = 0

+/obj/item/clothing/under/maid/Initialize()
+	. = ..()
+	var/obj/item/clothing/accessory/maidapron/A = new (src)
+	A.attach(src,null)
+
+
 /obj/item/clothing/under/janimaid
 	name = "maid uniform"
 	desc = "A simple maid uniform for housekeeping."
@@ -90,8 +90,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic

 	testing("Chat loaded for [owner.ckey]")
 	loaded = TRUE
-	winset(owner, "output", "is-disabled=true;is-visible=false")
-	winset(owner, "browseroutput", "is-disabled=false;is-visible=true")
+	showChat()


 	for(var/message in messageQueue)
@@ -99,9 +98,16 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic

 	messageQueue = null
 	sendClientData()
-
+	
+	//do not convert to to_chat()
+	owner << {"<span class="userdanger">If you can see this, update byond.</span>"}
+	
 	pingLoop()

+/datum/chatOutput/proc/showChat()
+	winset(owner, "output", "is-visible=false")
+	winset(owner, "browseroutput", "is-disabled=false;is-visible=true")
+
 /datum/chatOutput/proc/pingLoop()
 	set waitfor = FALSE

@@ -237,24 +243,24 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
 	message = replacetext(message, "\proper", "")
 	message = replacetext(message, "\n", "<br>")
 	message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]")
-
+	
 	for(var/I in targets)
 		//Grab us a client if possible
 		var/client/C = grab_client(I)
-
+		
 		if (!C)
 			continue
-
+		
+		//Send it to the old style output window.
+		C << original_message
+		
 		if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
-			C << original_message
-			return TRUE
+			continue

 		if(!C.chatOutput.loaded)
-			//Client sucks at loading things, put their messages in a queue
+			//Client still loading, put their messages in a queue
 			C.chatOutput.messageQueue += message
-			//But also send it to their output window since that shows until goonchat loads
-			C << original_message
-			return
+			continue

 		// url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
 		C << output(url_encode(url_encode(message)), "browseroutput:output")
@@ -1,51 +0,0 @@
-diff a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm	(rejected hunks)
-@@ -32,7 +32,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
- 		alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
- 		return
- 
-	if(winget(owner, "browseroutput", "is-disabled") == "false") //Already setup
-+	if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup
- 		doneLoading()
- 
- 	else //Not setup
-@@ -90,7 +90,10 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
- 
- 	testing("Chat loaded for [owner.ckey]")
- 	loaded = TRUE
-	winset(owner, "browseroutput", "is-disabled=false")
-+	winset(owner, "output", "is-disabled=true;is-visible=false")
-+	winset(owner, "browseroutput", "is-disabled=false;is-visible=true")
-+
-+
- 	for(var/message in messageQueue)
- 		to_chat(owner, message)
- 
-@@ -228,7 +231,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
- 		targets = target 
- 		if(!targets.len)
- 			return
-
-+	var/original_message = message
- 	//Some macros remain in the string even after parsing and fuck up the eventual output
- 	message = replacetext(message, "\improper", "")
- 	message = replacetext(message, "\proper", "")
-@@ -241,14 +244,16 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
- 
- 		if (!C)
- 			continue
-		
-+
- 		if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
-			C << message
-+			C << original_message
- 			return TRUE
-			
-+
- 		if(!C.chatOutput.loaded)
- 			//Client sucks at loading things, put their messages in a queue
- 			C.chatOutput.messageQueue += message
-+			//But also send it to their output window since that shows until goonchat loads
-+			C << original_message
- 			return
- 
- 		// url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
@@ -34,9 +34,6 @@ Clown
 		/obj/item/weapon/stamp/clown = 1,
 		/obj/item/weapon/reagent_containers/spray/waterflower = 1,
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
-		/obj/item/device/megaphone/clown = 1,
-		/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,
-		/obj/item/weapon/pneumatic_cannon/pie = 1
 		)

 	implants = list(/obj/item/weapon/implant/sad_trombone)
@@ -83,7 +83,7 @@ Station Engineer
 	name = "Station Engineer"
 	jobtype = /datum/job/engineer

-	belt = /obj/item/weapon/storage/belt/utility/full
+	belt = /obj/item/weapon/storage/belt/utility/full/engi
 	l_pocket = /obj/item/device/pda/engineering
 	ears = /obj/item/device/radio/headset/headset_eng
 	uniform = /obj/item/clothing/under/rank/engineer
@@ -13,7 +13,8 @@
 	force_wielded = 20
 	throwforce = 5
 	throw_speed = 4
-	luminosity = 4
+	light_range = 5
+	light_power = 1
 	armour_penetration = 10
 	materials = list(MAT_METAL=1150, MAT_GLASS=2075)
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -175,8 +176,9 @@
 		if(istype(T, denied_type) || istype(src, T.denied_type))
 			to_chat(user, "<span class='warning'>You can't seem to attach [src] to [H]. Maybe remove a few trophies?</span>")
 			return FALSE
+	if(!user.transferItemToLoc(src, H))
+		return
 	H.trophies += src
-	forceMove(H)
 	to_chat(user, "<span class='notice'>You attach [src] to [H].</span>")
 	return TRUE

@@ -309,7 +309,7 @@
 						/obj/item/weapon/melee/supermatter_sword,
 						/obj/item/weapon/shield/changeling,
 						/obj/item/weapon/lava_staff,
-						/obj/item/weapon/katana/energy,
+						/obj/item/weapon/dash/energy_katana,
 						/obj/item/weapon/hierophant_club,
 						/obj/item/weapon/his_grace,
 						/obj/item/weapon/gun/ballistic/minigun,
@@ -4,12 +4,14 @@
 	var/blacklisted_turfs
 	var/whitelisted_turfs
 	var/banned_areas
+	var/banned_objects

 /datum/map_template/shelter/New()
 	. = ..()
 	blacklisted_turfs = typecacheof(/turf/closed)
 	whitelisted_turfs = list()
 	banned_areas = typecacheof(/area/shuttle)
+	banned_objects = list()

 /datum/map_template/shelter/proc/check_deploy(turf/deploy_location)
 	var/affected = get_affected_turfs(deploy_location, centered=TRUE)
@@ -24,7 +26,7 @@
 			return SHELTER_DEPLOY_BAD_TURFS

 		for(var/obj/O in T)
-			if(O.density && O.anchored)
+			if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects))
 				return SHELTER_DEPLOY_ANCHORED_OBJECTS
 	return SHELTER_DEPLOY_ALLOWED

@@ -40,7 +42,7 @@
 /datum/map_template/shelter/alpha/New()
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
-
+	banned_objects = typecacheof(/obj/structure/stone_tile)

 /datum/map_template/shelter/beta
 	name = "Shelter Beta"
@@ -55,3 +57,4 @@
 /datum/map_template/shelter/beta/New()
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
+	banned_objects = typecacheof(/obj/structure/stone_tile)
@@ -1,14 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm	(rejected hunks)
-@@ -681,10 +681,10 @@
- 					status += "numb"
- 				if(status == "")
- 					status = "OK"
-				to_chat(src, "\t [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].")
-+				to_chat(src, "\t <span class='[status == "OK" ? "notice" : "warning"]'>Your [LB.name] is [status].</span>")
- 
- 				for(var/obj/item/I in LB.embedded_objects)
-					to_chat(src, "\t <a href='byond://?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]'>\red There is \a [I] embedded in your [LB.name]!</a>")
-+					to_chat(src, "\t <a href='?src=\ref[src];embedded_object=\ref[I];embedded_limb=\ref[LB]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
- 
- 			for(var/t in missing)
- 				to_chat(src, "<span class='boldannounce'>Your [parse_zone(t)] is missing!</span>")
@@ -827,7 +827,10 @@
 		if(slot_belt)
 			if(H.belt)
 				return 0
-			if(!H.w_uniform && !nojumpsuit)
+
+			var/obj/item/bodypart/O = H.get_bodypart("chest")
+
+			if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
 				if(!disable_warning)
 					to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
 				return 0
@@ -867,7 +870,9 @@
 		if(slot_wear_id)
 			if(H.wear_id)
 				return 0
-			if(!H.w_uniform && !nojumpsuit)
+
+			var/obj/item/bodypart/O = H.get_bodypart("chest")
+			if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
 				if(!disable_warning)
 					to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
 				return 0
@@ -879,7 +884,10 @@
 				return 0
 			if(H.l_store)
 				return 0
-			if(!H.w_uniform && !nojumpsuit)
+
+			var/obj/item/bodypart/O = H.get_bodypart("l_leg")
+
+			if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
 				if(!disable_warning)
 					to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
 				return 0
@@ -892,7 +900,10 @@
 				return 0
 			if(H.r_store)
 				return 0
-			if(!H.w_uniform && !nojumpsuit)
+
+			var/obj/item/bodypart/O = H.get_bodypart("r_leg")
+
+			if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC))
 				if(!disable_warning)
 					to_chat(H, "<span class='warning'>You need a jumpsuit before you can attach this [I.name]!</span>")
 				return 0
@@ -164,6 +164,9 @@

 	. = ..()

+/mob/living/silicon/ai/IgniteMob()
+	fire_stacks = 0
+	. = ..()

 /mob/living/silicon/ai/verb/pick_icon()
 	set category = "AI Commands"
@@ -1,8 +0,0 @@
-diff a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm	(rejected hunks)
-@@ -1,5 +1,5 @@
- /mob/living/silicon/ai/examine(mob/user)
-	var/msg = "<span class='info'>*---------*\nThis is \icon[src] <EM>[src]</EM>!\n"
-+	var/msg = "<span class='info'>*---------*\nThis is [bicon(src)] <EM>[src]</EM>!\n"
- 	if (src.stat == DEAD)
- 		msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
- 	else
@@ -4,12 +4,11 @@
 	stat = DEAD
 	canmove = 0
 	card.removePersonality()
-	if(holoform)
-		card.forceMove(loc)
+	card.forceMove(loc)
 	update_sight()
 	clear_fullscreens()

 	//New pAI's get a brand new mind to prevent meta stuff from their previous life. This new mind causes problems down the line if it's not deleted here.
 	GLOB.living_mob_list -= src
 	ghostize()
-	qdel(src)
+	qdel(src)
@@ -316,7 +316,7 @@ Difficulty: Medium
 	for(var/mob/living/L in T.contents)
 		if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon))
 			continue
-		if(!islist(flame_hit) || !flame_hit[L])
+		if(islist(flame_hit) && !flame_hit[L])
 			L.adjustFireLoss(40)
 			to_chat(L, "<span class='userdanger'>You're hit by the drake's fire breath!</span>")
 			flame_hit[L] = TRUE
@@ -7,23 +7,25 @@ The Hierophant spawns in its arena, which makes fighting it challenging but not

 The text this boss speaks is ROT4, use ROT22 to decode

-The Hierophant's attacks are as follows, and INTENSIFY at a random chance based on Hierophant's health;
- Creates a cardinal or diagonal blast(Cross Blast) under its target, exploding after a short time.
-	INTENSITY EFFECT: Creates one of the cross blast types under itself instead of under the target.
-	INTENSITY EFFECT: The created Cross Blast fires in all directions if below half health.
- If no chasers exist, creates a chaser that will seek its target, leaving a trail of blasts.
-	INTENSITY EFFECT: Creates a second, slower chaser.
- Creates an expanding AoE burst.
- INTENSE ATTACKS:
+The Hierophant's attacks are as follows;
+- These attacks happen at a random, increasing chance:
 	If target is at least 2 tiles away; Blinks to the target after a very brief delay, damaging everything near the start and end points.
 		As above, but does so multiple times if below half health.
-	Rapidly creates Cross Blasts under a target.
-	If chasers are off cooldown, creates four high-speed chasers.
- IF TARGET WAS STRUCK IN MELEE: Creates a 3x3 square of blasts under the target.
+	Rapidly creates cardinal and diagonal Cross Blasts under a target.
+	If chasers are off cooldown, creates 4 chasers.

- IF TARGET IS OUTSIDE THE ARENA: Creates an arena around the target for 10 seconds, blinking to it if Hierophant is not in the arena.
+- IF TARGET IS OUTSIDE THE ARENA: Creates an arena around the target for 10 seconds, blinking to the target if not in the created arena.
 	The arena has a 20 second cooldown, giving people a small window to get the fuck out.

+- If no chasers exist, creates a chaser that will seek its target, leaving a trail of blasts.
+	Is more likely to create a second, slower, chaser if hurt.
+- If the target is at least 2 tiles away, may Blink to the target after a very brief delay, damaging everything near the start and end points.
+- Creates a cardinal or diagonal blast(Cross Blast) under its target, exploding after a short time.
+	If below half health, the created Cross Blast may fire in all directions.
+- Creates an expanding AoE burst.
+
+- IF TARGET WAS STRUCK IN MELEE: Creates a 3x3 square of blasts under the target.
+
 Cross Blasts and the AoE burst gain additional range as Hierophant loses health, while Chasers gain additional speed.

 When Hierophant dies, it stops trying to murder you and shrinks into a small form, which, while much weaker, is still quite effective.
@@ -178,17 +180,18 @@ Difficulty: Hard

 /mob/living/simple_animal/hostile/megafauna/hierophant/OpenFire()
 	calculate_rage()
-	var/target_is_slow = FALSE
+	if(blinking)
+		return
+
+	var/target_slowness = 0
 	if(isliving(target))
 		var/mob/living/L = target
 		if(!blinking && L.stat == DEAD && get_dist(src, L) > 2)
 			blink(L)
 			return
-		if(L.movement_delay() > 1.5)
-			target_is_slow = TRUE
-	chaser_speed = max(1, (3 - anger_modifier * 0.04) + target_is_slow * 0.5)
-	if(blinking)
-		return
+		target_slowness += L.movement_delay()
+	target_slowness = max(target_slowness, 1)
+	chaser_speed = max(1, (3 - anger_modifier * 0.04) + ((target_slowness - 1) * 0.5))

 	arena_trap(target)
 	ranged_cooldown = world.time + max(5, ranged_cooldown_time - anger_modifier * 0.75) //scale cooldown lower with high anger.
@@ -210,18 +213,19 @@ Difficulty: Hard
 			var/blink_counter = 1 + round(anger_modifier * 0.08)
 			switch(pick(possibilities))
 				if("blink_spam") //blink either once or multiple times.
-					if(health < maxHealth * 0.5 && !target_is_slow && blink_counter > 1)
+					if(health < maxHealth * 0.5 && blink_counter > 1)
 						visible_message("<span class='hierophant'>\"Mx ampp rsx iwgeti.\"</span>")
 						var/oldcolor = color
 						animate(src, color = "#660099", time = 6)
-						while(health && target && blink_counter)
+						sleep(6)
+						while(health && !QDELETED(target) && blink_counter)
 							if(loc == target.loc || loc == target) //we're on the same tile as them after about a second we can stop now
 								break
 							blink_counter--
 							blinking = FALSE
 							blink(target)
 							blinking = TRUE
-							sleep(5)
+							sleep(4 + target_slowness)
 						animate(src, color = oldcolor, time = 8)
 						addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
 						sleep(8)
@@ -233,15 +237,14 @@ Difficulty: Hard
 					blinking = TRUE
 					var/oldcolor = color
 					animate(src, color = "#660099", time = 6)
-					while(health && target && cross_counter)
+					sleep(6)
+					while(health && !QDELETED(target) && cross_counter)
 						cross_counter--
-						var/delay = 7
 						if(prob(60))
 							INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
 						else
 							INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
-							delay = 5 //this one isn't so mean, so do the next one faster(if there is one)
-						sleep(delay)
+						sleep(6 + target_slowness)
 					animate(src, color = oldcolor, time = 8)
 					addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
 					sleep(8)
@@ -250,19 +253,22 @@ Difficulty: Hard
 					visible_message("<span class='hierophant'>\"Mx gerrsx lmhi.\"</span>")
 					blinking = TRUE
 					var/oldcolor = color
-					animate(src, color = "#660099", time = 10)
+					animate(src, color = "#660099", time = 6)
+					sleep(6)
 					var/list/targets = ListTargets()
 					var/list/cardinal_copy = GLOB.cardinal.Copy()
 					while(health && targets.len && cardinal_copy.len)
 						var/mob/living/pickedtarget = pick(targets)
-						if(targets.len > 4)
+						if(targets.len >= cardinal_copy.len)
 							pickedtarget = pick_n_take(targets)
 						if(!istype(pickedtarget) || pickedtarget.stat == DEAD)
 							pickedtarget = target
+							if(QDELETED(pickedtarget) || (istype(pickedtarget) && pickedtarget.stat == DEAD))
+								break //main target is dead and we're out of living targets, cancel out
 						var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
 						C.moving = 3
 						C.moving_dir = pick_n_take(cardinal_copy)
-						sleep(10)
+						sleep(8 + target_slowness)
 					chaser_cooldown = world.time + initial(chaser_cooldown)
 					animate(src, color = oldcolor, time = 8)
 					addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
@@ -270,31 +276,24 @@ Difficulty: Hard
 					blinking = FALSE
 			return

-	if(prob(10 + (anger_modifier * 0.5)) && get_dist(src, target) > 2)
-		blink(target)
-
-	else if(prob(70 - anger_modifier)) //a cross blast of some type
-		if(prob(anger_modifier)) //at us?
-			if(prob(anger_modifier * 2) && health < maxHealth * 0.5) //we're super angry do it at all dirs
-				INVOKE_ASYNC(src, .proc/alldir_blasts, src)
-			else if(prob(60))
-				INVOKE_ASYNC(src, .proc/cardinal_blasts, src)
-			else
-				INVOKE_ASYNC(src, .proc/diagonal_blasts, src)
-		else //at them?
-			if(prob(anger_modifier * 2) && health < maxHealth * 0.5 && !target_is_slow) //we're super angry do it at all dirs
-				INVOKE_ASYNC(src, .proc/alldir_blasts, target)
-			else if(prob(60))
-				INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
-			else
-				INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
-	else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
+	if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
 		var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
 		chaser_cooldown = world.time + initial(chaser_cooldown)
 		if((prob(anger_modifier) || target.Adjacent(src)) && target != src)
-			var/obj/effect/temp_visual/hierophant/chaser/OC = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
+			var/obj/effect/temp_visual/hierophant/chaser/OC = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, chaser_speed * 1.5, FALSE)
 			OC.moving = 4
 			OC.moving_dir = pick(GLOB.cardinal - C.moving_dir)
+
+	else if(prob(10 + (anger_modifier * 0.5)) && get_dist(src, target) > 2)
+		blink(target)
+
+	else if(prob(70 - anger_modifier)) //a cross blast of some type
+		if(prob(anger_modifier * (2 / target_slowness)) && health < maxHealth * 0.5) //we're super angry do it at all dirs
+			INVOKE_ASYNC(src, .proc/alldir_blasts, target)
+		else if(prob(60))
+			INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
+		else
+			INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
 	else //just release a burst of power
 		INVOKE_ASYNC(src, .proc/burst, get_turf(src))

@@ -351,7 +350,7 @@ Difficulty: Hard
 		INVOKE_ASYNC(src, .proc/arena_squares, T, d)
 	for(var/t in RANGE_TURFS(11, T))
 		if(t && get_dist(t, T) == 11)
-			new /obj/effect/temp_visual/hierophant/wall(t)
+			new /obj/effect/temp_visual/hierophant/wall(t, src)
 			new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
 	if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you!
 		INVOKE_ASYNC(src, .proc/blink, T)
@@ -470,6 +469,8 @@ Difficulty: Hard
 	return ..()

 /obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0)
+	if(QDELETED(caster))
+		return FALSE
 	if(mover == caster.pulledby)
 		return TRUE
 	if(istype(mover, /obj/item/projectile))
@@ -39,22 +39,25 @@

 	// Optional hardware (improves functionality, but is not critical for computer to work)

-	var/list/all_components							// List of "connection ports" in this computer and the components with which they are plugged
+	var/list/all_components = list()						// List of "connection ports" in this computer and the components with which they are plugged

 	var/list/idle_threads							// Idle programs on background. They still receive process calls but can't be interacted with.
 	var/obj/physical = null									// Object that represents our computer. It's used for Adjacent() and UI visibility checks.
+	var/has_light = FALSE						//If the computer has a flashlight/LED light/what-have-you installed
+	var/light_on = FALSE						//If that light is enabled
+	var/comp_light_luminosity = 3				//The brightness of that light
+	var/comp_light_color			//The color of that light



-/obj/item/device/modular_computer/New()
+/obj/item/device/modular_computer/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
-	update_icon()
 	if(!physical)
 		physical = src
-	..()
-
-	all_components = list()
+	comp_light_color = "#FFFFFF"
 	idle_threads = list()
+	update_icon()

 /obj/item/device/modular_computer/Destroy()
 	kill_program(forced = TRUE)
@@ -0,0 +1,11 @@
+diff a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm	(rejected hunks)
+@@ -49,9 +49,6 @@
+ 	var/comp_light_color			//The color of that light
+ 
+ 
+-/obj/item/device/modular_computer/New()
+-	all_components = list()
+-	
+ /obj/item/device/modular_computer/Initialize()
+ 	. = ..()
+ 	START_PROCESSING(SSobj, src)
@@ -50,6 +50,9 @@

 		data["programs"] += list(list("name" = P.filename, "desc" = P.filedesc, "running" = running))

+	data["has_light"] = has_light
+	data["light_on"] = light_on
+	data["comp_light_color"] = comp_light_color
 	return data


@@ -128,6 +131,27 @@
 				active_program = P
 				update_icon()
 			return 1
+
+		if("PC_toggle_light")
+			light_on = !light_on
+			if(light_on)
+				set_light(comp_light_luminosity, 1, comp_light_color)
+			else
+				set_light(0)
+
+		if("PC_light_color")
+			var/mob/user = usr
+			var/new_color
+			while(!new_color)
+				new_color = input(user, "Choose a new color for [src]'s flashlight.", "Light Color") as null|color
+				if(!new_color)
+					return
+				if(color_hex2num(new_color) < 200) //Colors too dark are rejected
+					to_chat(user, "<span class='warning'>That color is too dark! Choose a lighter one.</span>")
+					new_color = null
+			comp_light_color = new_color
+			light_color = new_color
+			update_light()
 		else
 			return

@@ -9,4 +9,6 @@
 	max_hardware_size = 1
 	w_class = WEIGHT_CLASS_SMALL
 	steel_sheet_cost = 1
-	slot_flags = SLOT_ID | SLOT_BELT
+	slot_flags = SLOT_ID | SLOT_BELT
+	has_light = TRUE //LED flashlight!
+	comp_light_luminosity = 2.3 //Same as the PDA
@@ -1,30 +1,93 @@
-/obj/item/weapon/katana/energy
+/obj/item/weapon/dash
+	name = "abstract dash weapon"
+	var/max_charges = 3
+	var/current_charges = 3
+	var/charge_rate = 30 //In deciseconds
+	var/dash_toggled = TRUE
+
+	var/bypass_density = FALSE //Can we beam past windows/airlocks/etc
+
+	var/start_effect_type = /obj/effect/temp_visual/dir_setting/ninja/phase/out
+	var/end_effect_type = /obj/effect/temp_visual/dir_setting/ninja/phase
+	var/beam_icon_state = "blur"
+	var/dash_beam_type = /obj/effect/ebeam
+
+/obj/item/weapon/dash/proc/charge()
+	current_charges = Clamp(current_charges + 1, 0, max_charges)
+	if(istype(loc, /mob/living))
+		to_chat(loc, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
+
+/obj/item/weapon/dash/attack_self(mob/user)
+	dash_toggled = !dash_toggled
+	to_chat(user, "<span class='notice'>You [dash_toggled ? "enable" : "disable"] the dash function on [src].</span>")
+
+/obj/item/weapon/dash/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	if(dash_toggled)
+		dash(user, target)
+		return
+
+/obj/item/weapon/dash/proc/dash(mob/user, atom/target)
+	if(!current_charges)
+		return
+
+	if(Adjacent(target))
+		return
+
+	if(target.density)
+		return
+
+	var/turf/T = get_turf(target)
+
+	if(!bypass_density)
+		for(var/turf/turf in getline(get_turf(user),T))
+			for(var/atom/A in turf)
+				if(A.density)
+					return
+
+	if(target in view(user.client.view, get_turf(user)))
+		var/obj/spot1 = new start_effect_type(T, user.dir)
+		user.forceMove(T)
+		playsound(T, 'sound/magic/blink.ogg', 25, 1)
+		playsound(T, "sparks", 50, 1)
+		var/obj/spot2 = new end_effect_type(get_turf(user), user.dir)
+		spot1.Beam(spot2, beam_icon_state,time = 2, maxdistance = 20, beam_type = dash_beam_type)
+		current_charges--
+		addtimer(CALLBACK(src, .proc/charge), charge_rate)
+
+/obj/item/weapon/dash/energy_katana
 	name = "energy katana"
 	desc = "A katana infused with strong energy."
 	icon_state = "energy_katana"
 	item_state = "energy_katana"
 	force = 40
 	throwforce = 20
+	block_chance = 50
 	armour_penetration = 50
+	w_class = WEIGHT_CLASS_NORMAL
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	block_chance = 50
+	sharpness = IS_SHARP
+	obj_integrity = 200
+	max_integrity = 200
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	bypass_density = TRUE
 	var/datum/effect_system/spark_spread/spark_system

-/obj/item/weapon/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
-	if(!user || !target)
-		return
-
-	if(proximity_flag)
-		if(isobj(target) || issilicon(target))
-			spark_system.start()
-			playsound(user, "sparks", 50, 1)
-			playsound(user, 'sound/weapons/blade1.ogg', 50, 1)
-			target.emag_act(user)
+/obj/item/weapon/dash/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	if(dash_toggled)
+		return ..()
+	if(proximity_flag && (isobj(target) || issilicon(target)))
+		spark_system.start()
+		playsound(user, "sparks", 50, 1)
+		playsound(user, 'sound/weapons/blade1.ogg', 50, 1)
+		target.emag_act(user)


 //If we hit the Ninja who owns this Katana, they catch it.
 //Works for if the Ninja throws it or it throws itself or someone tries
 //To throw it at the ninja
-/obj/item/weapon/katana/energy/throw_impact(atom/hit_atom)
+/obj/item/weapon/dash/energy_katana/throw_impact(atom/hit_atom)
 	if(ishuman(hit_atom))
 		var/mob/living/carbon/human/H = hit_atom
 		if(istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
@@ -35,7 +98,7 @@

 	..()

-/obj/item/weapon/katana/energy/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
+/obj/item/weapon/dash/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
 	if(!istype(user))
 		return
 	forceMove(get_turf(user))
@@ -62,13 +125,12 @@
 	if(msg)
 		to_chat(user, "<span class='notice'>[msg]</span>")

-/obj/item/weapon/katana/energy/New()
-	..()
+/obj/item/weapon/dash/energy_katana/Initialize()
+	. = ..()
 	spark_system = new /datum/effect_system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)

-/obj/item/weapon/katana/energy/Destroy()
-	qdel(spark_system)
-	spark_system = null
-	return ..()
+/obj/item/weapon/dash/energy_katana/Destroy()
+	QDEL_NULL(spark_system)
+	return ..()
@@ -22,7 +22,7 @@ Contents:
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 100, acid = 100)
 	strip_delay = 12

-	actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjajaunt, /datum/action/item_action/ninjasmoke, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninjanet, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth, /datum/action/item_action/toggle_glove)
+	actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjasmoke, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninjanet, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth, /datum/action/item_action/toggle_glove)

 		//Important parts of the suit.
 	var/mob/living/carbon/human/affecting = null
@@ -31,7 +31,7 @@ Contents:
 	var/list/reagent_list = list("omnizine","salbutamol","spaceacillin","charcoal","nutriment","radium","potass_iodide")//The reagents ids which are added to the suit at New().
 	var/list/stored_research = list()//For stealing station research.
 	var/obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk.
-	var/obj/item/weapon/katana/energy/energyKatana //For teleporting the katana back to the ninja (It's an ability)
+	var/obj/item/weapon/dash/energy_katana/energyKatana //For teleporting the katana back to the ninja (It's an ability)

 		//Other articles of ninja gear worn together, used to easily reference them after initializing.
 	var/obj/item/clothing/head/helmet/space/space_ninja/n_hood
@@ -181,9 +181,6 @@ Contents:
 	if(!s_initialized)
 		to_chat(user, "<span class='warning'><b>ERROR</b>: suit offline.  Please activate suit.</span>")
 		return FALSE
-	if(istype(action, /datum/action/item_action/ninjajaunt))
-		ninjajaunt()
-		return TRUE
 	if(istype(action, /datum/action/item_action/ninjasmoke))
 		ninjasmoke()
 		return TRUE
@@ -71,7 +71,6 @@

 /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_three(delay, mob/living/carbon/human/U)
 	to_chat(U, "<span class='notice'>Logging off, [U:real_name]. Shutting down <B>SpiderOS</B>.</span>")
-	remove_ninja_verbs()
 	addtimer(CALLBACK(src, .proc/deinitialize_four, delay, U), delay)

 /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_four(delay, mob/living/carbon/human/U)
@@ -22,11 +22,5 @@ Contents:


 /obj/item/clothing/suit/space/space_ninja/proc/grant_ninja_verbs()
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-
 	s_initialized=1
-	slowdown=0
-
-
-/obj/item/clothing/suit/space/space_ninja/proc/remove_ninja_verbs()
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
+	slowdown=0
@@ -214,7 +214,7 @@
 		t = replacetext(t, "\[list\]", "<ul>")
 		t = replacetext(t, "\[/list\]", "</ul>")

-		t = "<font face=\"[PEN_FONT]\" color=[P.colour]>[t]</font>"
+		t = "<font face=\"[P.font]\" color=[P.colour]>[t]</font>"
 	else // If it is a crayon, and he still tries to use these, make them empty!
 		var/obj/item/toy/crayon/C = P
 		t = replacetext(t, "\[*\]", "")
@@ -26,6 +26,7 @@
 	var/colour = "black"	//what colour the ink is!
 	var/traitor_unlock_degrees = 0
 	var/degrees = 0
+	var/font = PEN_FONT

 /obj/item/weapon/pen/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...</span>")
@@ -64,6 +65,42 @@
 	to_chat(user, "<span class='notice'>\The [src] will now write in [colour].</span>")
 	desc = "It's a fancy four-color ink pen, set to [colour]."

+/obj/item/weapon/pen/fountain
+	name = "fountain pen"
+	desc = "It's a common fountain pen, with a faux wood body."
+	icon_state = "pen-fountain"
+	font = FOUNTAIN_PEN_FONT
+
+/obj/item/weapon/pen/fountain/captain
+	name = "captain's fountain pen"
+	desc = "It's an expensive Oak fountain pen. The nib is quite sharp."
+	icon_state = "pen-fountain-o"
+	force = 5
+	throwforce = 5
+	throw_speed = 4
+	colour = "crimson"
+	materials = list(MAT_GOLD = 750)
+	sharpness = IS_SHARP
+	resistance_flags = FIRE_PROOF
+	var/unique_reskin = TRUE
+	var/list/skins = list("Oak" = "pen-fountain-o", "Gold" = "pen-fountain-g", "Rosewood" = "pen-fountain-r", "Black and Silver" = "pen-fountain-b","Command Blue" = "pen-fountain-cb")
+
+/obj/item/weapon/pen/fountain/captain/AltClick()
+	var/mob/living/carbon/user = usr
+	if(!istype(user))
+		return
+	if(unique_reskin)
+		var/choice = input(user,"Choose the finish for your pen.","Reskin Pen") as null|anything in skins
+		if(!QDELETED(src) && choice && !user.incapacitated() && in_range(user,src))
+			icon_state = skins[choice]
+			unique_reskin = FALSE
+			to_chat(user, "Your pen now has a [choice] finish.")
+			desc = "It's an expensive [choice] fountain pen. The nib is quite sharp."
+
+/obj/item/weapon/pen/fountain/captain/examine(mob/user)
+	..()
+	if(unique_reskin)
+		to_chat(user, "<span class='notice'>This item can be reskinned. Alt-click to select a skin.</span>")

 /obj/item/weapon/pen/attack_self(mob/living/carbon/user)
 	var/deg = input(user, "What angle would you like to rotate the pen head to? (1-360)", "Rotate Pen Head") as null|num
@@ -37,7 +37,7 @@
 	name = "disabler"
 	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
 	icon_state = "disabler"
-	item_state = "disabler"
+	item_state = null
 	origin_tech = "combat=3"
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler)
 	ammo_x_offset = 3
@@ -87,6 +87,8 @@
 			new impact_effect_type(target_loca, target, src)
 		return 0
 	var/mob/living/L = target
+	if(L.buckled && ismob(L.buckled))
+		L = L.buckled
 	if(blocked != 100) // not completely blocked
 		if(damage && L.blood_volume && damage_type == BRUTE)
 			var/splatter_dir = dir
@@ -479,6 +479,14 @@
 	build_path = /obj/item/device/radio/off
 	category = list("initial", "T-Comm")

+/datum/design/intercom_frame
+	name = "Intercom Frame"
+	id = "intercom_frame"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 75, MAT_GLASS = 25)
+	build_path = /obj/item/wallframe/intercom
+	category = list("initial", "T-Comm")
+
 /datum/design/infrared_emitter
 	name = "Infrared Emitter"
 	id = "infrared_emitter"
@@ -60,3 +60,168 @@
 		. = ..()
 	else
 		return QDEL_HINT_LETMELIVE
+
+//stone tiles for boss arenas
+/obj/structure/stone_tile
+	name = "stone tile"
+	icon = 'icons/turf/boss_floors.dmi'
+	icon_state = "pristine_tile1"
+	layer = OVER_LATTICE_LAYER
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	var/tile_key = "pristine_tile"
+	var/tile_random_sprite_max = 24
+
+/obj/structure/stone_tile/Initialize(mapload)
+	. = ..()
+	icon_state = "[tile_key][rand(1, tile_random_sprite_max)]"
+
+/obj/structure/stone_tile/block
+	name = "stone block"
+	icon_state = "pristine_block1"
+	tile_key = "pristine_block"
+	tile_random_sprite_max = 4
+
+/obj/structure/stone_tile/slab
+	name = "stone slab"
+	icon_state = "pristine_slab1"
+	tile_key = "pristine_slab"
+	tile_random_sprite_max = 4
+
+/obj/structure/stone_tile/center
+	name = "stone center tile"
+	icon_state = "pristine_center1"
+	tile_key = "pristine_center"
+	tile_random_sprite_max = 4
+
+/obj/structure/stone_tile/surrounding
+	name = "stone surrounding slab"
+	icon_state = "pristine_surrounding1"
+	tile_key = "pristine_surrounding"
+	tile_random_sprite_max = 2
+
+/obj/structure/stone_tile/surrounding_tile
+	name = "stone surrounding tile"
+	icon_state = "pristine_surrounding_tile1"
+	tile_key = "pristine_surrounding_tile"
+	tile_random_sprite_max = 2
+
+//cracked stone tiles
+/obj/structure/stone_tile/cracked
+	name = "cracked stone tile"
+	icon_state = "cracked_tile1"
+	tile_key = "cracked_tile"
+
+/obj/structure/stone_tile/block/cracked
+	name = "cracked stone block"
+	icon_state = "cracked_block1"
+	tile_key = "cracked_block"
+
+/obj/structure/stone_tile/slab/cracked
+	name = "cracked stone slab"
+	icon_state = "cracked_slab1"
+	tile_key = "cracked_slab"
+	tile_random_sprite_max = 1
+
+/obj/structure/stone_tile/center/cracked
+	name = "cracked stone center tile"
+	icon_state = "cracked_center1"
+	tile_key = "cracked_center"
+
+/obj/structure/stone_tile/surrounding/cracked
+	name = "cracked stone surrounding slab"
+	icon_state = "cracked_surrounding1"
+	tile_key = "cracked_surrounding"
+	tile_random_sprite_max = 1
+
+/obj/structure/stone_tile/surrounding_tile/cracked
+	name = "cracked stone surrounding tile"
+	icon_state = "cracked_surrounding_tile1"
+	tile_key = "cracked_surrounding_tile"
+
+//burnt stone tiles
+/obj/structure/stone_tile/burnt
+	name = "burnt stone tile"
+	icon_state = "burnt_tile1"
+	tile_key = "burnt_tile"
+
+/obj/structure/stone_tile/block/burnt
+	name = "burnt stone block"
+	icon_state = "burnt_block1"
+	tile_key = "burnt_block"
+
+/obj/structure/stone_tile/slab/burnt
+	name = "burnt stone slab"
+	icon_state = "burnt_slab1"
+	tile_key = "burnt_slab"
+
+/obj/structure/stone_tile/center/burnt
+	name = "burnt stone center tile"
+	icon_state = "burnt_center1"
+	tile_key = "burnt_center"
+
+/obj/structure/stone_tile/surrounding/burnt
+	name = "burnt stone surrounding slab"
+	icon_state = "burnt_surrounding1"
+	tile_key = "burnt_surrounding"
+
+/obj/structure/stone_tile/surrounding_tile/burnt
+	name = "burnt stone surrounding tile"
+	icon_state = "burnt_surrounding_tile1"
+	tile_key = "burnt_surrounding_tile"
+
+//hot stone tiles, cosmetic only
+/obj/structure/stone_tile/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/block/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/slab/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/center/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding_tile/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+//hot cracked stone tiles, cosmetic only
+/obj/structure/stone_tile/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/block/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/slab/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/center/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding_tile/cracked/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+//hot burnt stone tiles, cosmetic only
+/obj/structure/stone_tile/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/block/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/slab/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/center/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
+
+/obj/structure/stone_tile/surrounding_tile/burnt/hot
+	icon = 'icons/turf/boss_floors_hot.dmi'
@@ -213,7 +213,7 @@
 				set_coefficient = 1
 			else
 				set_coefficient = 0.5
-	var/call_time = SSshuttle.emergencyCallTime * set_coefficient
+	var/call_time = SSshuttle.emergencyCallTime * set_coefficient * engine_coeff
 	switch(mode)
 		// The shuttle can not normally be called while "recalling", so
 		// if this proc is called, it's via admin fiat
@@ -359,7 +359,7 @@
 				enterTransit()
 				mode = SHUTTLE_ESCAPE
 				launch_status = ENDGAME_LAUNCHED
-				setTimer(SSshuttle.emergencyEscapeTime)
+				setTimer(SSshuttle.emergencyEscapeTime * engine_coeff)
 				priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority")

 		if(SHUTTLE_STRANDED)
@@ -285,6 +285,9 @@

 		message_admins(msg)
 		WARNING(msg)
+		return
+	//Everything fine
+	S.on_bought()

 /obj/machinery/shuttle_manipulator/proc/unload_preview()
 	if(preview_shuttle)
@@ -12,7 +12,7 @@

 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	anchored = 1
-
+// 
 	var/id
 	// this should point -away- from the dockingport door, ie towards the ship
 	dir = NORTH
@@ -224,11 +224,9 @@
 	var/timid = FALSE

 	var/list/ripples = list()
-
-/obj/docking_port/mobile/Initialize()
-	. = ..()
-	if(!timid)
-		register()
+	var/engine_coeff = 1 //current engine coeff
+	var/current_engines = 0 //current engine power
+	var/initial_engines = 0 //initial engine power

 /obj/docking_port/mobile/proc/register()
 	SSshuttle.mobile += src
@@ -244,6 +242,8 @@

 /obj/docking_port/mobile/Initialize(mapload)
 	. = ..()
+	if(!timid)
+		register()

 	var/area/A = get_area(src)
 	if(istype(A, /area/shuttle))
@@ -259,6 +259,9 @@
 		areaInstance.name = name
 		areaInstance.contents += return_ordered_turfs()

+	initial_engines = count_engines()
+	current_engines = initial_engines
+
 	#ifdef DOCKING_PORT_HIGHLIGHT
 	highlight("#0f0")
 	#endif
@@ -325,17 +328,17 @@
 	switch(mode)
 		if(SHUTTLE_CALL)
 			if(S == destination)
-				if(timeLeft(1) < callTime)
-					setTimer(callTime)
+				if(timeLeft(1) < callTime * engine_coeff)
+					setTimer(callTime * engine_coeff)
 			else
 				destination = S
-				setTimer(callTime)
+				setTimer(callTime * engine_coeff)
 		if(SHUTTLE_RECALL)
 			if(S == destination)
-				setTimer(callTime - timeLeft(1))
+				setTimer(callTime * engine_coeff - timeLeft(1))
 			else
 				destination = S
-				setTimer(callTime)
+				setTimer(callTime * engine_coeff)
 			mode = SHUTTLE_CALL
 		if(SHUTTLE_IDLE, SHUTTLE_IGNITING)
 			destination = S
@@ -621,7 +624,7 @@
 				return
 			else
 				mode = SHUTTLE_CALL
-				setTimer(callTime)
+				setTimer(callTime * engine_coeff)
 				enterTransit()
 				return

@@ -685,7 +688,7 @@

 	var/ds_remaining
 	if(!timer)
-		ds_remaining = callTime
+		ds_remaining = callTime * engine_coeff
 	else
 		ds_remaining = max(0, timer - world.time)

@@ -765,5 +768,62 @@
 		return TRUE
 	return FALSE

+// Losing all initial engines should get you 2 
+// Adding another set of engines at 0.5 time
+/obj/docking_port/mobile/proc/alter_engines(mod)
+	if(mod == 0)
+		return
+	var/old_coeff = engine_coeff
+	engine_coeff = get_engine_coeff(current_engines,mod)
+	current_engines = max(0,current_engines + mod)
+	if(in_flight())
+		var/delta_coeff = engine_coeff / old_coeff
+		modTimer(delta_coeff)
+
+/obj/docking_port/mobile/proc/count_engines()
+	. = 0
+	for(var/obj/structure/shuttle/engine/E in areaInstance.contents)
+		if(!QDELETED(E))
+			. += E.engine_power
+
+// Double initial engines to get to 0.5 minimum
+// Lose all initial engines to get to 2
+//For 0 engine shuttles like BYOS 5 engines to get to doublespeed
+/obj/docking_port/mobile/proc/get_engine_coeff(current,engine_mod)
+	var/new_value = max(0,current + engine_mod)
+	if(new_value == initial_engines)
+		return 1
+	if(new_value > initial_engines)
+		var/delta = new_value - initial_engines
+		var/change_per_engine = (1 - ENGINE_COEFF_MIN) / ENGINE_DEFAULT_MAXSPEED_ENGINES // 5 by default
+		if(initial_engines > 0)
+			change_per_engine = (1 - ENGINE_COEFF_MIN) / initial_engines // or however many it had
+		return Clamp(1 - delta * change_per_engine,ENGINE_COEFF_MIN,ENGINE_COEFF_MAX)
+	if(new_value < initial_engines)
+		var/delta = initial_engines - new_value
+		var/change_per_engine = 1 //doesn't really matter should not be happening for 0 engine shuttles
+		if(initial_engines > 0)
+			change_per_engine = (ENGINE_COEFF_MAX -  1) / initial_engines //just linear drop to max delay
+		return Clamp(1 + delta * change_per_engine,ENGINE_COEFF_MIN,ENGINE_COEFF_MAX)
+		
+
+/obj/docking_port/mobile/proc/in_flight()
+	switch(mode)
+		if(SHUTTLE_CALL,SHUTTLE_RECALL)
+			return TRUE
+		if(SHUTTLE_IDLE,SHUTTLE_IGNITING)
+			return FALSE
+		else
+			return FALSE // hmm
+
+/obj/docking_port/mobile/emergency/in_flight()
+	switch(mode)
+		if(SHUTTLE_ESCAPE)
+			return TRUE
+		if(SHUTTLE_STRANDED,SHUTTLE_ENDGAME)
+			return FALSE
+		else
+			return ..()
+

 #undef DOCKING_PORT_HIGHLIGHT
@@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 	var/sold_atoms = ""

 	for(var/atom/movable/AM in areaInstance)
-		if(AM.anchored)
+		if(AM.anchored && !istype(AM, /obj/mecha))
 			continue
 		sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)

@@ -1 +0,0 @@
-poop
@@ -1,10 +0,0 @@
-diff a/code/world.dm b/code/world.dm	(rejected hunks)
-@@ -198,7 +198,7 @@
- #define CHAT_PULLR	64 //defined in preferences.dm, but not available here at compilation time
- 	for(var/client/C in GLOB.clients)
- 		if(C.prefs && (C.prefs.chat_toggles & CHAT_PULLR))
-			C << "<span class='announce'>PR: [announcement]</span>"
-+			to_chat(C, "<span class='announce'>PR: [announcement]</span>")
- #undef CHAT_PULLR
- 
- #define WORLD_REBOOT(X) log_world("World rebooted at [time_stamp()]"); ..(X); return;