Port over remaining Lavaland ruins

code/game/dna/dna2.dm

@@ -437,4 +437,18 @@ var/global/list/bad_blocks[0]
 	var/datum/species/S = data["species"]
 	species = new S
 	b_type = data["b_type"]
-	real_name = data["real_name"]
+	real_name = data["real_name"]
+
+/datum/dna/proc/transfer_identity(mob/living/carbon/human/destination)
+	if(!istype(destination))
+		return
+
+	// We manually set the species to ensure all proper species change procs are called.
+	destination.set_species(species.type, retain_damage = TRUE)
+	var/datum/dna/new_dna = Clone()
+	new_dna.species = destination.dna.species
+	destination.dna = new_dna
+	destination.dna.species.handle_dna(destination) // Handle DNA has to be re-called as the DNA was changed.
+
+	destination.UpdateAppearance()
+	domutcheck(destination, null, MUTCHK_FORCED)

code/game/gamemodes/cult/runes.dm

@@ -494,10 +494,9 @@ var/list/teleport_runes = list()
 
 /obj/effect/rune/narsie/New()
 	..()
-	cultist_name = "Summon [SSticker.cultdat.entity_name]"
+	cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]"
 	cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat.entity_title3]. Requires 9 invokers."
 
-
 /obj/effect/rune/narsie/check_icon()
 	return
 

code/game/gamemodes/wizard/spellbook.dm

@@ -906,3 +906,13 @@
 	spellname = "sacred flame"
 	icon_state ="booksacredflame"
 	desc = "Become one with the flames that burn within... and invite others to do so as well."
+
+/obj/item/spellbook/oneuse/random
+	icon_state = "random_book"
+
+/obj/item/spellbook/oneuse/random/initialize()
+	. = ..()
+	var/static/banned_spells = list(/obj/item/spellbook/oneuse/mime, /obj/item/spellbook/oneuse/mime/fingergun, /obj/item/spellbook/oneuse/mime/fingergun/fake, /obj/item/spellbook/oneuse/mime/greaterwall)
+	var/real_type = pick(subtypesof(/obj/item/spellbook/oneuse) - banned_spells)
+	new real_type(loc)
+	return INITIALIZE_HINT_QDEL

code/game/jobs/job/support.dm

@@ -193,7 +193,38 @@
 	backpack = /obj/item/storage/backpack/explorer
 	satchel = /obj/item/storage/backpack/explorer
 
+/datum/outfit/job/mining/equipped
+	name = "Shaft Miner"
 
+	suit = /obj/item/clothing/suit/hooded/explorer
+	mask = /obj/item/clothing/mask/gas/explorer
+	glasses = /obj/item/clothing/glasses/meson
+	suit_store = /obj/item/tank/emergency_oxygen
+	internals_slot = slot_s_store
+	backpack_contents = list(
+		/obj/item/flashlight/seclite=1,\
+		/obj/item/kitchen/knife/combat/survival=1,
+		/obj/item/mining_voucher=1,
+		/obj/item/t_scanner/adv_mining_scanner/lesser=1,
+		/obj/item/gun/energy/kinetic_accelerator=1,\
+		/obj/item/stack/marker_beacon/ten=1
+	)
+
+	backpack = /obj/item/storage/backpack/explorer
+	satchel = /obj/item/storage/backpack/explorer
+
+/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	if(istype(H.wear_suit, /obj/item/clothing/suit/hooded))
+		var/obj/item/clothing/suit/hooded/S = H.wear_suit
+		S.ToggleHood()
+
+/datum/outfit/job/miner/equipped/hardsuit
+	name = "Shaft Miner (Equipment + Hardsuit)"
+	suit = /obj/item/clothing/suit/space/hardsuit/mining
+	mask = /obj/item/clothing/mask/breath
 
 //Griff //BS12 EDIT
 

code/game/machinery/wishgranter.dm

@@ -13,26 +13,28 @@
 
 /obj/machinery/wish_granter/attack_hand(mob/living/carbon/user)
 	. = ..()
+
 	if(.)
-		return
+		return ..()
+
 	if(charges <= 0)
-		to_chat(user, "The Wish Granter lies silent.")
-		return
+		to_chat(user, "<span class='warning'>The Wish Granter lies silent.</span>")
+		return TRUE
 
 	else if(!ishuman(user))
-		to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
+		to_chat(user, "<span class='warning'>You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's..</span>")
 		return
 
 	else if(is_special_character(user))
-		to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this.  Something instinctual makes you pull away.")
+		to_chat(user, "<span class='warning'>Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.</span>")
 
 	else if(!insisting)
-		to_chat(user, "Your first touch makes the Wish Granter stir, listening to you.  Are you really sure you want to do this?")
+		to_chat(user, "<span class='warning'>Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?</span>")
 		insisting = TRUE
 
 	else
-		to_chat(user, "You speak.  [pick("I want the station to disappear", "Humanity is corrupt, mankind must be destroyed", "I want to be rich", "I want to rule the world", "I want immortality.")].  The Wish Granter answers.")
-		to_chat(user, "Your head pounds for a moment, before your vision clears.  You are the avatar of the Wish Granter, and your power is LIMITLESS!  And it's all yours.  You need to make sure no one can take it from you.  No one can know, first.")
+		to_chat(user, "<span class='notice'>You speak. [pick("I want the station to disappear", "Humanity is corrupt, mankind must be destroyed", "I want to be rich", "I want to rule the world", "I want immortality.")]. The Wish Granter answers.</span>")
+		to_chat(user, "<span class='notice'>Your head pounds for a moment, before your vision clears.  You are the avatar of the Wish Granter, and your power is LIMITLESS!  And it's all yours.  You need to make sure no one can take it from you.  No one can know, first.</span>")
 
 		charges--
 		insisting = FALSE
@@ -46,37 +48,43 @@
 	var/list/types = list()
 	
 /obj/machinery/wish_granter/super/attack_hand(mob/living/carbon/user)
+	. = ..()
+
+	if(.)
+		return ..()
+
 	if(!ishuman(user))
-		to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
-		return
-	else if(is_special_character(user) || jobban_isbanned(user, ROLE_TRAITOR) || jobban_isbanned(user, "Syndicate"))
-		to_chat(user, "Something instinctual makes you pull away.")
-		return
+		to_chat(user, "<span class='warning'>You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.</warning>")
+		return TRUE
+
+	if(is_special_character(user) || jobban_isbanned(user, ROLE_TRAITOR) || jobban_isbanned(user, "Syndicate"))
+		to_chat(user, "<span class='warning'>Something instinctual makes you pull away.</span>")
+		return TRUE
+	
+	to_chat(user, "<span class='notice'>Your touch makes the Wish Granter stir. Are you really sure you want to do this?</span>")
+	
+	for(var/supname in GLOB.all_superheroes)
+		types += supname
+
+	var/wish
+	if(types.len == 1)
+		wish = pick(types)
 	else
-	
-		to_chat(user, "Your touch makes the Wish Granter stir.  Are you really sure you want to do this?")
-		
-		for(var/supname in GLOB.all_superheroes)
-			types += supname
-	
-		var/wish
-		if(types.len == 1)
-			wish = pick(types)
-		else
-			wish = input("You want to become...","Wish") as null|anything in types
+		wish = input("You want to become...", "Wish") as null|anything in types
 
-		if(!src || !wish || user.stat == DEAD || (get_dist(src, user) > 4)) //another check after the input to check if someone already used it, closed it, or if they're dead, or if they ran off
-			return
+	if(!wish || user.stat == DEAD || (get_dist(src, user) > 4)) // Another check after the input to check if someone already used it, closed it, or if they're dead, or if they ran off.
+		return
 
-		var/datum/superheroes/S = GLOB.all_superheroes[wish]
-		if(S.activated)
-			to_chat(user,"<span class='warning'>There can only be one! Pick something else!</span>")
-			return
+	var/datum/superheroes/S = GLOB.all_superheroes[wish]
+	if(S.activated)
+		to_chat(user,"<span class='warning'>There can only be one! Pick something else!</span>")
+		return
 
-		S.create(user)
-		S.activated = TRUE //sets this superhero as taken so we don't have duplicates
-		playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
-		visible_message("<span class='notice'>The wishgranter fades into mist..</span>")
-		add_attack_logs(null, user, "Became [GLOB.all_superheroes[wish]]")
-		notify_ghosts("[GLOB.all_superheroes[wish]] has appeared in [get_area(user)].", source = user)
-		qdel(src)
+	S.create(user)
+	S.activated = TRUE //sets this superhero as taken so we don't have duplicates
+
+	playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
+	visible_message("<span class='notice'>The wishgranter fades into mist..</span>")
+	add_attack_logs(null, user, "Became [GLOB.all_superheroes[wish]]")
+	notify_ghosts("[GLOB.all_superheroes[wish]] has appeared in [get_area(user)].", source = user)
+	qdel(src)

code/game/mecha/mecha.dm

@@ -23,6 +23,7 @@
 	infra_luminosity = 15 //byond implementation is bugged.
 	force = 5
 	armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
 	var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items)
 	var/can_move = 0 // time of next allowed movement
 	var/mob/living/carbon/occupant = null

code/game/mecha/working/working.dm

@@ -3,4 +3,5 @@
 
 /obj/mecha/working/New()
 	..()
-	trackers += new /obj/item/mecha_parts/mecha_tracking(src)
+	if(!ruin_mecha)
+		trackers += new /obj/item/mecha_parts/mecha_tracking(src)

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -207,4 +207,10 @@
 		return 1
 
 /datum/effect_system/smoke_spread/sleeping
-	effect_type = /obj/effect/particle_effect/smoke/sleeping
+	effect_type = /obj/effect/particle_effect/smoke/sleeping
+
+/proc/do_smoke(range=0, location=null, smoke_type = /obj/effect/particle_effect/smoke)
+	var/datum/effect_system/smoke_spread/smoke = new
+	smoke.effect_type = smoke_type
+	smoke.set_up(range, location)
+	smoke.start()

code/game/objects/effects/step_triggers.dm

@@ -1,23 +1,43 @@
 /* Simple object type, calls a proc when "stepped" on by something */
 
 /obj/effect/step_trigger
-	var/affect_ghosts = 0
-	var/stopper = 1 // stops throwers
-	invisibility = 101 // nope cant see this shit
-	anchored = 1
+	var/affect_ghosts = FALSE
+	var/stopper = TRUE // stops throwers
+	var/mobs_only = FALSE
+	invisibility = INVISIBILITY_ABSTRACT // nope cant see this shit
+	anchored = TRUE
 
 /obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
-	return 0
+	return FALSE
 
-/obj/effect/step_trigger/Crossed(H as mob|obj)
-	..()
+/obj/effect/step_trigger/Crossed(var/H)
+	. = ..()
 	if(!H)
 		return
-	if(istype(H, /mob/dead/observer) && !affect_ghosts)
+	if(isobserver(H) && !affect_ghosts)
+		return
+	if(!ismob(H) && mobs_only)
 		return
 	Trigger(H)
 
+/obj/effect/step_trigger/singularity_act()
+	return
 
+/obj/effect/step_trigger/singularity_pull()
+	return
+
+/* Sends a message to mob when triggered*/
+
+/obj/effect/step_trigger/message
+	var/message	//the message to give to the mob
+	var/once = 1
+	mobs_only = TRUE
+
+/obj/effect/step_trigger/message/Trigger(mob/M)
+	if(M.client)
+		to_chat(M, "<span class='info'>[message]</span>")
+		if(once)
+			qdel(src)
 
 /* Tosses things in a certain direction */
 
@@ -30,57 +50,57 @@
 	var/nostop = 0 // if 1: will only be stopped by teleporters
 	var/list/affecting = list()
 
-	Trigger(var/atom/A)
-		if(!A || !istype(A, /atom/movable))
+/obj/effect/step_trigger/thrower/Trigger(atom/A)
+	if(!A || !ismovableatom(A))
+		return
+	var/atom/movable/AM = A
+	var/curtiles = 0
+	var/stopthrow = 0
+	for(var/obj/effect/step_trigger/thrower/T in orange(2, src))
+		if(AM in T.affecting)
 			return
-		var/atom/movable/AM = A
-		var/curtiles = 0
-		var/stopthrow = 0
-		for(var/obj/effect/step_trigger/thrower/T in orange(2, src))
-			if(AM in T.affecting)
-				return
 
-		if(ismob(AM))
-			var/mob/M = AM
-			if(immobilize)
-				M.canmove = 0
+	if(isliving(AM))
+		var/mob/living/M = AM
+		if(immobilize)
+			M.canmove = FALSE
 
-		affecting.Add(AM)
-		while(AM && !stopthrow)
-			if(tiles)
-				if(curtiles >= tiles)
-					break
-			if(AM.z != src.z)
+	affecting.Add(AM)
+	while(AM && !stopthrow)
+		if(tiles)
+			if(curtiles >= tiles)
 				break
+		if(AM.z != src.z)
+			break
 
-			curtiles++
+		curtiles++
 
-			sleep(speed)
+		sleep(speed)
 
-			// Calculate if we should stop the process
-			if(!nostop)
-				for(var/obj/effect/step_trigger/T in get_step(AM, direction))
-					if(T.stopper && T != src)
-						stopthrow = 1
-			else
-				for(var/obj/effect/step_trigger/teleporter/T in get_step(AM, direction))
-					if(T.stopper)
-						stopthrow = 1
+		// Calculate if we should stop the process
+		if(!nostop)
+			for(var/obj/effect/step_trigger/T in get_step(AM, direction))
+				if(T.stopper && T != src)
+					stopthrow = 1
+		else
+			for(var/obj/effect/step_trigger/teleporter/T in get_step(AM, direction))
+				if(T.stopper)
+					stopthrow = 1
 
-			if(AM)
-				var/predir = AM.dir
-				step(AM, direction)
-				if(!facedir)
-					AM.dir = predir
+		if(AM)
+			var/predir = AM.dir
+			step(AM, direction)
+			if(!facedir)
+				AM.setDir(predir)
 
 
 
-		affecting.Remove(AM)
+	affecting.Remove(AM)
 
-		if(ismob(AM))
-			var/mob/M = AM
-			if(immobilize)
-				M.canmove = 1
+	if(isliving(AM))
+		var/mob/living/M = AM
+		if(immobilize)
+			M.canmove = TRUE
 
 /* Stops things thrown by a thrower, doesn't do anything */
 
@@ -93,12 +113,11 @@
 	var/teleport_y = 0
 	var/teleport_z = 0
 
-	Trigger(var/atom/movable/A)
-		if(teleport_x && teleport_y && teleport_z)
+/obj/effect/step_trigger/teleporter/Trigger(atom/movable/A)
+	if(teleport_x && teleport_y && teleport_z)
 
-			A.x = teleport_x
-			A.y = teleport_y
-			A.z = teleport_z
+		var/turf/T = locate(teleport_x, teleport_y, teleport_z)
+		A.forceMove(T)
 
 /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
 
@@ -107,11 +126,73 @@
 	var/teleport_y_offset = 0
 	var/teleport_z_offset = 0
 
-	Trigger(var/atom/movable/A)
-		if(teleport_x && teleport_y && teleport_z)
-			if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
+/obj/effect/step_trigger/teleporter/random/Trigger(atom/movable/A)
+	if(teleport_x && teleport_y && teleport_z)
+		if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
 
-				A.x = rand(teleport_x, teleport_x_offset)
-				A.y = rand(teleport_y, teleport_y_offset)
-				A.z = rand(teleport_z, teleport_z_offset)
+			var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
+			if (T)
+				A.forceMove(T)
 
+/* Fancy teleporter, creates sparks and smokes when used */
+
+/obj/effect/step_trigger/teleport_fancy
+	var/locationx
+	var/locationy
+	var/uses = 1	//0 for infinite uses
+	var/entersparks = 0
+	var/exitsparks = 0
+	var/entersmoke = 0
+	var/exitsmoke = 0
+
+/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M)
+	var/dest = locate(locationx, locationy, z)
+	M.Move(dest)
+
+	if(entersparks)
+		var/datum/effect_system/spark_spread/s = new
+		s.set_up(4, 1, src)
+		s.start()
+	if(exitsparks)
+		var/datum/effect_system/spark_spread/s = new
+		s.set_up(4, 1, dest)
+		s.start()
+
+	if(entersmoke)
+		var/datum/effect_system/smoke_spread/s = new
+		s.set_up(4, 1, src, 0)
+		s.start()
+	if(exitsmoke)
+		var/datum/effect_system/smoke_spread/s = new
+		s.set_up(4, 1, dest, 0)
+		s.start()
+
+	uses--
+	if(uses == 0)
+		qdel(src)
+
+/* Simple sound player, Mapper friendly! */
+
+/obj/effect/step_trigger/sound_effect
+	var/sound //eg. path to the sound, inside '' eg: 'growl.ogg'
+	var/volume = 100
+	var/freq_vary = 1 //Should the frequency of the sound vary?
+	var/extra_range = 0 // eg World.view = 7, extra_range = 1, 7+1 = 8, 8 turfs radius
+	var/happens_once = 0
+	var/triggerer_only = 0 //Whether the triggerer is the only person who hears this
+
+
+/obj/effect/step_trigger/sound_effect/Trigger(atom/movable/A)
+	var/turf/T = get_turf(A)
+
+	if(!T)
+		return
+
+	if(triggerer_only && ismob(A))
+		var/mob/B = A
+		B.playsound_local(T, sound, volume, freq_vary)
+	else
+		playsound(T, sound, volume, freq_vary, extra_range)
+
+	if(happens_once)
+		qdel(src)

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -6,6 +6,10 @@
 	randomdir = 0
 	layer = ABOVE_NORMAL_TURF_LAYER
 
+/obj/effect/temp_visual/ratvar/door
+	icon_state = "ratvardoorglow"
+	layer = CLOSED_DOOR_LAYER //above closed doors
+
 /obj/effect/temp_visual/ratvar/door/window
 	icon_state = "ratvarwindoorglow"
 	layer = ABOVE_WINDOW_LAYER
@@ -16,9 +20,27 @@
 /obj/effect/temp_visual/ratvar/beam/grille
 	layer = BELOW_OBJ_LAYER
 
+/obj/effect/temp_visual/ratvar/beam/itemconsume
+	layer = HIGH_OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/beam/falsewall
+	layer = OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/beam/catwalk
+	layer = LATTICE_LAYER
+
+/obj/effect/temp_visual/ratvar/wall
+	icon_state = "ratvarwallglow"
+
+/obj/effect/temp_visual/ratvar/wall/false
+	layer = OBJ_LAYER
+
 /obj/effect/temp_visual/ratvar/floor
 	icon_state = "ratvarfloorglow"
 
+/obj/effect/temp_visual/ratvar/floor/catwalk
+	layer = LATTICE_LAYER
+
 /obj/effect/temp_visual/ratvar/window
 	icon_state = "ratvarwindowglow"
 	layer = ABOVE_OBJ_LAYER
@@ -26,6 +48,10 @@
 /obj/effect/temp_visual/ratvar/window/single
 	icon_state = "ratvarwindowglow_s"
 
+/obj/effect/temp_visual/ratvar/gear
+	icon_state = "ratvargearglow"
+	layer = BELOW_OBJ_LAYER
+
 /obj/effect/temp_visual/ratvar/grille
 	icon_state = "ratvargrilleglow"
 	layer = BELOW_OBJ_LAYER

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -333,10 +333,13 @@ var/global/list/datum/stack_recipe/cult = list ( \
  * Brass
  */
 var/global/list/datum/stack_recipe/brass_recipes = list (\
+	new/datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+	null,
 	new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
 	null,
 	new/datum/stack_recipe/window("directional brass window", /obj/structure/window/reinforced/clockwork, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+	new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
 	)
 

code/game/objects/items/weapons/dice.dm

@@ -25,20 +25,34 @@
 	if(special_die == "100")
 		new /obj/item/dice/d100(src)
 
+/obj/item/storage/pill_bottle/dice/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (OXYLOSS)
+
 /obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
 	name = "die"
 	desc = "A die with six sides. Basic and servicable."
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "d6"
 	w_class = WEIGHT_CLASS_TINY
+
 	var/sides = 6
 	var/result = null
 	var/list/special_faces = list() //entries should match up to sides var if used
 
-/obj/item/dice/New()
-	result = rand(1, sides)
+	var/rigged = DICE_NOT_RIGGED
+	var/rigged_value
+
+/obj/item/dice/Initialize(mapload)
+	. = ..()
+	if(!result)
+		result = roll(sides)
 	update_icon()
 
+/obj/item/dice/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (OXYLOSS)
+
 /obj/item/dice/d1
 	name = "d1"
 	desc = "A die with one side. Deterministic!"
@@ -117,11 +131,19 @@
 	. = ..()
 
 /obj/item/dice/proc/diceroll(mob/user)
-	result = rand(1, sides)
-	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
+	result = roll(sides)
+	if(rigged != DICE_NOT_RIGGED && result != rigged_value)
+		if(rigged == DICE_BASICALLY_RIGGED && prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+			result = rigged_value
+		else if(rigged == DICE_TOTALLY_RIGGED)
+			result = rigged_value
+
+	. = result
+
+	var/fake_result = roll(sides)//Daredevil isn't as good as he used to be
 	var/comment = ""
 	if(sides == 20 && result == 20)
-		comment = "Nat 20!"
+		comment = "NAT 20!"
 	else if(sides == 20 && result == 1)
 		comment = "Ouch, bad luck."
 	update_icon()
@@ -130,16 +152,18 @@
 	if(special_faces.len == sides)
 		result = special_faces[result]
 	if(user != null) //Dice was rolled in someone's hand
-		user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
+		user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
 							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
 							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
-	else if(!throwing) //Dice was thrown and is coming to rest
+	else if(!src.throwing) //Dice was thrown and is coming to rest
 		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
 
 /obj/item/dice/d20/e20/diceroll(mob/user as mob, thrown)
 	if(triggered)
 		return
-	..()
+
+	. = ..()
+
 	if(result == 1)
 		to_chat(user, "<span class='danger'>Rocks fall, you die.</span>")
 		user.gib()
@@ -166,7 +190,7 @@
 
 /obj/item/dice/update_icon()
 	overlays.Cut()
-	overlays += "[src.icon_state][src.result]"
+	overlays += "[icon_state][result]"
 
 /obj/item/storage/box/dice
 	name = "Box of dice"

code/game/objects/structures/aliens.dm

@@ -235,14 +235,22 @@
 	var/status = GROWING	//can be GROWING, GROWN or BURST; all mutually exclusive
 	layer = MOB_LAYER
 
+/obj/structure/alien/egg/grown
+	status = GROWN
+	icon_state = "egg"
+
+/obj/structure/alien/egg/burst
+	status = BURST
+	icon_state = "egg_hatched"
 
 /obj/structure/alien/egg/New()
 	new /obj/item/clothing/mask/facehugger(src)
 	..()
-	spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
-		Grow()
 	if(status == BURST)
 		obj_integrity = integrity_failure
+	else if(status != GROWN)
+		spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
+		Grow()
 
 /obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
 	return attack_hand(user)

code/game/objects/structures/false_walls.dm

@@ -9,19 +9,26 @@
 /obj/structure/falsewall
 	name = "wall"
 	desc = "A huge chunk of metal used to seperate rooms."
-	anchored = 1
+	anchored = TRUE
 	icon = 'icons/turf/walls/wall.dmi'
 	icon_state = "wall"
-	var/mineral = "metal"
-	var/walltype = "metal"
-	var/opening = 0
-	density = 1
-	opacity = 1
+
+	var/mineral = /obj/item/stack/sheet/metal
+	var/mineral_amount = 2
+	var/walltype = /turf/simulated/wall
+	var/girder_type = /obj/structure/girder/displaced
+	var/opening = FALSE
+
+	density = TRUE
+	opacity = TRUE
+
+	can_deconstruct = TRUE
 
 	canSmoothWith = list(
 	/turf/simulated/wall,
 	/turf/simulated/wall/r_wall,
 	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
 	/obj/structure/falsewall/reinforced,  // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS. //because we do smooth with real r-walls now
 	/turf/simulated/wall/rust,
 	/turf/simulated/wall/r_wall/rust)
@@ -31,6 +38,10 @@
 	..()
 	air_update_turf(1)
 
+/obj/structure/falsewall/ratvar_act()
+	new /obj/structure/falsewall/brass(loc)
+	qdel(src)
+
 /obj/structure/falsewall/Destroy()
 	density = 0
 	air_update_turf(1)
@@ -124,18 +135,11 @@
 
 /obj/structure/falsewall/proc/dismantle(mob/user)
 	user.visible_message("<span class='notice'>[user] dismantles the false wall.</span>", "<span class='warning'>You dismantle the false wall.</span>")
-	new /obj/structure/girder/displaced(loc)
-	if(mineral == "metal")
-		if(istype(src, /obj/structure/falsewall/reinforced))
-			new /obj/item/stack/sheet/plasteel(loc, 2)
-		else
-			new /obj/item/stack/sheet/metal(loc, 2)
-	else if(mineral == "wood")
-		new/obj/item/stack/sheet/wood(loc, 2)
-	else
-		var/P = text2path("/obj/item/stack/sheet/mineral/[mineral]")
-		new P(loc)
-		new P(loc)
+	if(can_deconstruct)
+		new girder_type(loc)
+		if(mineral_amount)
+			for(var/i in 1 to mineral_amount)
+				new mineral(loc)
 	playsound(src, 'sound/items/welder.ogg', 100, 1)
 	qdel(src)
 
@@ -148,7 +152,8 @@
 	desc = "A huge chunk of reinforced metal used to seperate rooms."
 	icon = 'icons/turf/walls/reinforced_wall.dmi'
 	icon_state = "r_wall"
-	walltype = "rwall"
+	walltype = /turf/simulated/wall/r_wall
+	mineral = /obj/item/stack/sheet/plasteel
 
 /obj/structure/falsewall/reinforced/ChangeToWall(delete = 1)
 	var/turf/T = get_turf(src)
@@ -166,8 +171,8 @@
 	desc = "A wall with uranium plating. This is probably a bad idea."
 	icon = 'icons/turf/walls/uranium_wall.dmi'
 	icon_state = "uranium"
-	mineral = "uranium"
-	walltype = "uranium"
+	mineral = /obj/item/stack/sheet/mineral/uranium
+	walltype = /turf/simulated/wall/mineral/uranium
 	var/active = null
 	var/last_event = 0
 	canSmoothWith = list(/obj/structure/falsewall/uranium, /turf/simulated/wall/mineral/uranium)
@@ -201,8 +206,8 @@
 	desc = "A wall with gold plating. Swag!"
 	icon = 'icons/turf/walls/gold_wall.dmi'
 	icon_state = "gold"
-	mineral = "gold"
-	walltype = "gold"
+	mineral = /obj/item/stack/sheet/mineral/gold
+	walltype = /turf/simulated/wall/mineral/gold
 	canSmoothWith = list(/obj/structure/falsewall/gold, /turf/simulated/wall/mineral/gold)
 
 /obj/structure/falsewall/silver
@@ -210,8 +215,8 @@
 	desc = "A wall with silver plating. Shiny."
 	icon = 'icons/turf/walls/silver_wall.dmi'
 	icon_state = "silver"
-	mineral = "silver"
-	walltype = "silver"
+	mineral = /obj/item/stack/sheet/mineral/silver
+	walltype = /turf/simulated/wall/mineral/silver
 	canSmoothWith = list(/obj/structure/falsewall/silver, /turf/simulated/wall/mineral/silver)
 
 /obj/structure/falsewall/diamond
@@ -219,8 +224,8 @@
 	desc = "A wall with diamond plating. You monster."
 	icon = 'icons/turf/walls/diamond_wall.dmi'
 	icon_state = "diamond"
-	mineral = "diamond"
-	walltype = "diamond"
+	mineral = /obj/item/stack/sheet/mineral/diamond
+	walltype = /turf/simulated/wall/mineral/diamond
 	canSmoothWith = list(/obj/structure/falsewall/diamond, /turf/simulated/wall/mineral/diamond)
 
 
@@ -229,18 +234,18 @@
 	desc = "A wall with plasma plating. This is definately a bad idea."
 	icon = 'icons/turf/walls/plasma_wall.dmi'
 	icon_state = "plasma"
-	mineral = "plasma"
-	walltype = "plasma"
+	mineral = /obj/item/stack/sheet/mineral/plasma
+	walltype = /turf/simulated/wall/mineral/plasma
 	canSmoothWith = list(/obj/structure/falsewall/plasma, /turf/simulated/wall/mineral/plasma, /turf/simulated/wall/mineral/alien)
 
 /obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
 	if(is_hot(W) > 300)
-		message_admins("Plasma falsewall ignited by [key_name_admin(user)] in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma falsewall ignited by [key_name(user)] in ([x],[y],[z])")
+		message_admins("Plasma falsewall ignited by [key_name_admin(user)] in [ADMIN_VERBOSEJMP(T)]")
+		log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]")
 		investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]","atmos")
 		burnbabyburn()
-		return
-	..()
+	else
+		return ..()
 
 /obj/structure/falsewall/plasma/proc/burnbabyburn(user)
 	playsound(src, 'sound/items/welder.ogg', 100, 1)
@@ -258,8 +263,8 @@
 	desc = "A strange-looking alien wall."
 	icon = 'icons/turf/walls/plasma_wall.dmi'
 	icon_state = "plasma"
-	mineral = "alien"
-	walltype = "alien"
+	mineral = /obj/item/stack/sheet/mineral/abductor
+	walltype = /turf/simulated/wall/mineral/abductor
 	canSmoothWith = list(/obj/structure/falsewall/alien, /turf/simulated/wall/mineral/alien)
 
 
@@ -268,16 +273,16 @@
 	desc = "A wall with bananium plating. Honk!"
 	icon = 'icons/turf/walls/bananium_wall.dmi'
 	icon_state = "bananium"
-	mineral = "clown"
-	walltype = "clown"
+	mineral = /obj/item/stack/sheet/mineral/bananium
+	walltype = /turf/simulated/wall/mineral/bananium
 	canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/simulated/wall/mineral/bananium)
 
 /obj/structure/falsewall/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating."
 	icon_state = "sandstone"
-	mineral = "sandstone"
-	walltype = "sandstone"
+	mineral = /obj/item/stack/sheet/mineral/sandstone
+	walltype = /turf/simulated/wall/mineral/sandstone
 	canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/simulated/wall/mineral/sandstone)
 
 /obj/structure/falsewall/wood
@@ -285,8 +290,8 @@
 	desc = "A wall with wooden plating. Stiff."
 	icon = 'icons/turf/walls/wood_wall.dmi'
 	icon_state = "wood"
-	mineral = "wood"
-	walltype = "wood"
+	mineral = /obj/item/stack/sheet/wood
+	walltype = /turf/simulated/wall/mineral/wood
 	canSmoothWith = list(/obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood)
 
 /obj/structure/falsewall/iron
@@ -294,8 +299,9 @@
 	desc = "A wall with rough metal plating."
 	icon = 'icons/turf/walls/iron_wall.dmi'
 	icon_state = "iron"
-	mineral = "metal"
-	walltype = "iron"
+	mineral = /obj/item/stack/rods
+	mineral_amount = 5
+	walltype = /turf/simulated/wall/mineral/iron
 	canSmoothWith = list(/obj/structure/falsewall/iron, /turf/simulated/wall/mineral/iron)
 
 /obj/structure/falsewall/abductor
@@ -303,8 +309,8 @@
 	desc = "A wall with alien alloy plating."
 	icon = 'icons/turf/walls/abductor_wall.dmi'
 	icon_state = "abductor"
-	mineral = "abductor"
-	walltype = "abductor"
+	mineral = /obj/item/stack/sheet/mineral/abductor
+	walltype = /turf/simulated/wall/mineral/abductor
 	canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor)
 
 /obj/structure/falsewall/titanium
@@ -324,3 +330,23 @@
 	walltype = /turf/simulated/wall/mineral/plastitanium
 	smooth = SMOOTH_MORE
 	canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+
+/obj/structure/falsewall/brass
+	name = "clockwork wall"
+	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
+	icon = 'icons/turf/walls/clockwork_wall.dmi'
+	icon_state = "clockwork_wall"
+	resistance_flags = FIRE_PROOF
+	unacidable = TRUE
+	mineral_amount = 1
+	canSmoothWith = list(/obj/effect/clockwork/overlay/wall, /obj/structure/falsewall/brass)
+	girder_type = /obj/structure/clockwork/wall_gear/displaced
+	walltype = /turf/simulated/wall/clockwork
+	mineral = /obj/item/stack/tile/brass
+
+/obj/structure/falsewall/brass/New(loc)
+	..()
+	var/turf/T = get_turf(src)
+	new /obj/effect/temp_visual/ratvar/wall/false(T)
+	new /obj/effect/temp_visual/ratvar/beam/falsewall(T)
+

code/game/objects/structures/fluff.dm

@@ -63,3 +63,19 @@
 /obj/structure/fluff/drake_statue/falling //A variety of statue in disrepair; parts are broken off and a gemstone is missing
 	desc = "A towering basalt sculpture of a drake. Cracks run down its surface and parts of it have fallen off."
 	icon_state = "drake_statue_falling"
+
+/obj/structure/fluff/divine
+	name = "Miracle"
+	icon = 'icons/obj/hand_of_god_structures.dmi'
+	anchored = TRUE
+	density = TRUE
+
+/obj/structure/fluff/divine/nexus
+	name = "nexus"
+	desc = "It anchors a deity to this world. It radiates an unusual aura. It looks well protected from explosive shock."
+	icon_state = "nexus"
+
+/obj/structure/fluff/divine/conduit
+	name = "conduit"
+	desc = "It allows a deity to extend their reach.  Their powers are just as potent near a conduit as a nexus."
+	icon_state = "conduit"

code/game/objects/structures/lattice.dm

@@ -59,6 +59,26 @@
 	if(current_size >= STAGE_FOUR)
 		qdel(src)
 
+/obj/structure/lattice/clockwork
+	name = "cog lattice"
+	desc = "A lightweight support lattice. These hold the Justicar's station together."
+	icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
+
+/obj/structure/lattice/clockwork/Initialize(mapload)
+	. = ..()
+	ratvar_act()
+
+/obj/structure/lattice/clockwork/ratvar_act()
+	if((x + y) % 2 != 0)
+		icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
+		pixel_x = -9
+		pixel_y = -9
+	else
+		icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
+		pixel_x = 0
+		pixel_y = 0
+	return TRUE
+
 /obj/structure/lattice/catwalk
 	name = "catwalk"
 	desc = "A catwalk for easier EVA maneuvering and cable placement."
@@ -82,3 +102,30 @@
 	for(var/obj/structure/cable/C in T)
 		C.deconstruct()
 	..()
+
+/obj/structure/lattice/catwalk/clockwork
+	name = "clockwork catwalk"
+	icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
+	canSmoothWith = list(/obj/structure/lattice,
+	/turf/simulated/floor,
+	/turf/simulated/wall,
+	/obj/structure/falsewall)
+	smooth = SMOOTH_MORE
+
+/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
+	. = ..()
+	ratvar_act()
+	if(!mapload)
+		new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
+		new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
+
+/obj/structure/lattice/catwalk/clockwork/ratvar_act()
+	if((x + y) % 2 != 0)
+		icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
+		pixel_x = -9
+		pixel_y = -9
+	else
+		icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
+		pixel_x = 0
+		pixel_y = 0
+	return TRUE

code/game/objects/structures/mirror.dm

@@ -6,7 +6,6 @@
 	icon_state = "mirror"
 	density = 0
 	anchored = 1
-	var/shattered = 0
 	var/list/ui_users = list()
 
 /obj/structure/mirror/New(turf/T, newdir = SOUTH, building = FALSE)
@@ -23,7 +22,7 @@
 				pixel_x = 32
 
 /obj/structure/mirror/attack_hand(mob/user)
-	if(shattered)
+	if(broken)
 		return
 
 	if(ishuman(user))
@@ -36,9 +35,9 @@
 		AC.ui_interact(user)
 
 /obj/structure/mirror/proc/shatter()
-	if(shattered)
+	if(broken)
 		return
-	shattered = 1
+	broken = TRUE
 	icon_state = "mirror_broke"
 	playsound(src, "shatter", 70, 1)
 	desc = "Oh no, seven years of bad luck!"
@@ -46,7 +45,7 @@
 
 /obj/structure/mirror/bullet_act(obj/item/projectile/Proj)
 	if(prob(Proj.damage * 2))
-		if(!shattered)
+		if(!broken)
 			shatter()
 		else
 			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
@@ -58,7 +57,7 @@
 	if(isscrewdriver(I))
 		user.visible_message("<span class='notice'>[user] begins to unfasten [src].</span>", "<span class='notice'>You begin to unfasten [src].</span>")
 		if(do_after(user, 30 * I.toolspeed, target = src))
-			if(shattered)
+			if(broken)
 				user.visible_message("<span class='notice'>[user] drops the broken shards to the floor.</span>", "<span class='notice'>You drop the broken shards on the floor.</span>")
 				new /obj/item/shard(get_turf(user))
 			else
@@ -68,7 +67,7 @@
 			return
 
 	user.do_attack_animation(src)
-	if(shattered)
+	if(broken)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
 
@@ -85,7 +84,7 @@
 	if(islarva(user))
 		return
 	user.do_attack_animation(src)
-	if(shattered)
+	if(broken)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
 	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
@@ -100,7 +99,7 @@
 	if(M.melee_damage_upper <= 0)
 		return
 	M.do_attack_animation(src)
-	if(shattered)
+	if(broken)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
 	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
@@ -113,7 +112,7 @@
 	if(!S.is_adult)
 		return
 	user.do_attack_animation(src)
-	if(shattered)
+	if(broken)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
 	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
@@ -136,7 +135,7 @@
 	icon_state = "magic_mirror"
 
 /obj/structure/mirror/magic/attack_hand(mob/user)
-	if(!ishuman(user))
+	if(!ishuman(user) || broken)
 		return
 
 	var/mob/living/carbon/human/H = user
@@ -154,6 +153,9 @@
 				H.dna.real_name = newname
 			if(H.mind)
 				H.mind.name = newname
+		
+			if(newname)
+				curse(user)
 
 		if("Body")
 			var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
@@ -172,6 +174,7 @@
 				AC.whitelist = race_list
 				ui_users[user] = AC
 			AC.ui_interact(user)
+
 		if("Voice")
 			var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav")
 			var/voice_mutation
@@ -192,8 +195,17 @@
 					H.dna.SetSEState(voice_mutation, TRUE)
 					genemutcheck(H, voice_mutation, null, MUTCHK_FORCED)
 
+			if(voice_choice)
+				curse(user)
+			
+/obj/structure/mirror/magic/on_ui_close(mob/user)
+	curse(user)
+
 /obj/structure/mirror/magic/attackby(obj/item/I, mob/living/user, params)
 	return
 
 /obj/structure/mirror/magic/shatter()
-	return //can't be broken. it's magic, i ain't gotta explain shit
+	return //can't be broken. it's magic, i ain't gotta explain shit
+
+/obj/structure/mirror/magic/proc/curse(mob/living/user)
+	return

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -28,6 +28,11 @@
 		W.setDir(dir)
 		qdel(src)
 
+/obj/structure/chair/ratvar_act()
+	var/obj/structure/chair/brass/B = new(get_turf(src))
+	B.setDir(dir)
+	qdel(src)
+
 /obj/structure/chair/Move(atom/newloc, direct)
 	..()
 	handle_rotation()
@@ -416,3 +421,41 @@
 	desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
 	icon_state = "chairold"
 	item_chair = null
+
+// Brass chair
+/obj/structure/chair/brass
+	name = "brass chair"
+	desc = "A spinny chair made of brass. It looks uncomfortable."
+	icon_state = "brass_chair"
+	max_integrity = 150
+	buildstacktype = /obj/item/stack/tile/brass
+	buildstackamount = 1
+	item_chair = null
+	var/turns = 0
+
+/obj/structure/chair/brass/Destroy()
+	STOP_PROCESSING(SSfastprocess, src)
+	. = ..()
+
+/obj/structure/chair/brass/process()
+	setDir(turn(dir,-90))
+	playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
+	turns++
+	if(turns >= 8)
+		STOP_PROCESSING(SSfastprocess, src)
+
+/obj/structure/chair/brass/ratvar_act()
+	return
+
+/obj/structure/chair/brass/AltClick(mob/living/user)
+	turns = 0
+	if(!istype(user) || user.incapacitated() || !in_range(src, user))
+		return
+	if(!isprocessing)
+		user.visible_message("<span class='notice'>[user] spins [src] around, and Ratvarian technology keeps it spinning FOREVER.</span>", \
+		"<span class='notice'>Automated spinny chairs. The pinnacle of Ratvarian technology.</span>")
+		START_PROCESSING(SSfastprocess, src)
+	else
+		user.visible_message("<span class='notice'>[user] stops [src]'s uncontrollable spinning.</span>", \
+		"<span class='notice'>You grab [src] and stop its wild spinning.</span>")
+		STOP_PROCESSING(SSfastprocess, src)

code/game/turfs/simulated/floor/misc_floor.dm

@@ -111,18 +111,35 @@
 /turf/simulated/floor/clockwork
 	name = "clockwork floor"
 	desc = "Tightly-pressed brass tiles. They emit minute vibration."
-	icon_state = "clockwork_floor"
+	icon_state = "plating"
+	baseturf = /turf/simulated/floor/clockwork
+	var/dropped_brass
+	var/uses_overlay = TRUE
+	var/obj/effect/clockwork/overlay/floor/realappearence
 
-/turf/simulated/floor/clockwork/New()
-	..()
-	new /obj/effect/temp_visual/ratvar/floor(src)
-	new /obj/effect/temp_visual/ratvar/beam(src)
+/turf/simulated/floor/clockwork/Initialize(mapload)
+	. = ..()
+	if(uses_overlay)
+		new /obj/effect/temp_visual/ratvar/floor(src)
+		new /obj/effect/temp_visual/ratvar/beam(src)
+		realappearence = new /obj/effect/clockwork/overlay/floor(src)
+		realappearence.linked = src
+	
+/turf/simulated/floor/clockwork/Destroy()
+	if(uses_overlay && realappearence)
+		QDEL_NULL(realappearence)
+	return ..()
+
+/turf/simulated/floor/clockwork/ReplaceWithLattice()
+	. = ..()
+	for(var/obj/structure/lattice/L in src)
+		L.ratvar_act()
 
 /turf/simulated/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
 	if(iscrowbar(I))
 		user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
 		playsound(src, I.usesound, 20, 1)
-		if(!do_after(user, 70*I.toolspeed, target = src))
+		if(!do_after(user, 70 * I.toolspeed, target = src))
 			return 0
 		user.visible_message("<span class='notice'>[user] pries up [src]!</span>", "<span class='notice'>You pry up [src]!</span>")
 		playsound(src, I.usesound, 80, 1)
@@ -131,7 +148,11 @@
 	return ..()
 
 /turf/simulated/floor/clockwork/make_plating()
-	new /obj/item/stack/tile/brass(src)
+	if(!dropped_brass)
+		new /obj/item/stack/tile/brass(src)
+		dropped_brass = TRUE
+	if(baseturf == type)
+		return
 	return ..()
 
 /turf/simulated/floor/clockwork/narsie_act()
@@ -140,3 +161,12 @@
 		var/previouscolor = color
 		color = "#960000"
 		animate(src, color = previouscolor, time = 8)
+		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+
+/turf/simulated/floor/clockwork/reebe
+	name = "cogplate"
+	desc = "Warm brass plating. You can feel it gently vibrating, as if machinery is on the other side."
+	icon_state = "reebe"
+	baseturf = /turf/simulated/floor/clockwork/reebe
+	uses_overlay = FALSE
+	planetary_atmos = TRUE

code/game/turfs/simulated/floor/plating.dm

@@ -17,6 +17,16 @@
 	icon_plating = icon_state
 	update_icon()
 
+/turf/simulated/floor/plating/damaged/New()
+	..()
+	icon_state = icon_plating
+	break_tile()
+
+/turf/simulated/floor/plating/burnt/New()
+	..()
+	icon_state = icon_plating
+	burn_tile()
+
 /turf/simulated/floor/plating/update_icon()
 	if(!..())
 		return

code/game/turfs/simulated/walls.dm

@@ -22,6 +22,7 @@
 	heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
 
 	var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through.
+	var/slicing_duration = 100
 	var/engraving //engraving on the wall
 	var/engraving_quality
 
@@ -340,7 +341,7 @@
 				to_chat(user, "<span class='notice'>You begin slicing through the outer plating.</span>")
 				playsound(src, WT.usesound, 100, 1)
 
-				if(do_after(user, 100 * WT.toolspeed, target = src) && WT && WT.isOn())
+				if(do_after(user, slicing_duration * WT.toolspeed, target = src) && WT && WT.isOn())
 					to_chat(user, "<span class='notice'>You remove the outer plating.</span>")
 					dismantle_wall()
 				else

code/game/turfs/simulated/walls_indestructible.dm

@@ -69,4 +69,8 @@
 	desc = "A wall made out of smooth, cold stone."
 	icon = 'icons/turf/walls/hierophant_wall.dmi'
 	icon_state = "hierophant"
-	smooth = SMOOTH_TRUE
+	smooth = SMOOTH_TRUE
+
+/turf/simulated/wall/indestructible/uranium
+	icon = 'icons/turf/walls/uranium_wall.dmi'
+	icon_state = "uranium"

code/game/turfs/simulated/walls_misc.dm

@@ -50,3 +50,100 @@
 	desc = "A huge chunk of reinforced metal used to seperate rooms. It seems to have additional plating to protect against heat."
 	icon = 'icons/turf/walls/coated_reinforced_wall.dmi'
 	max_temperature = INFINITY
+
+//Clockwork walls
+/turf/simulated/wall/clockwork
+	name = "clockwork wall"
+	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
+	explosion_block = 2
+	hardness = 10
+	slicing_duration = 80
+	sheet_type = /obj/item/stack/tile/brass
+	sheet_amount = 1
+	girder_type = /obj/structure/clockwork/wall_gear
+	baseturf = /turf/simulated/floor/clockwork/reebe
+	var/heated
+	var/obj/effect/clockwork/overlay/wall/realappearance
+
+/turf/simulated/wall/clockwork/Initialize()
+	. = ..()
+	new /obj/effect/temp_visual/ratvar/wall(src)
+	new /obj/effect/temp_visual/ratvar/beam(src)
+	realappearance = new /obj/effect/clockwork/overlay/wall(src)
+	realappearance.linked = src
+
+/turf/simulated/wall/clockwork/Destroy()
+	if(realappearance)
+		qdel(realappearance)
+		realappearance = null
+
+	return ..()
+
+/turf/simulated/wall/clockwork/ReplaceWithLattice()
+	..()
+	for(var/obj/structure/lattice/L in src)
+		L.ratvar_act()
+
+/turf/simulated/wall/clockwork/narsie_act()
+	..()
+	if(istype(src, /turf/simulated/wall/clockwork)) //if we haven't changed type
+		var/previouscolor = color
+		color = "#960000"
+		animate(src, color = previouscolor, time = 8)
+		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+
+/turf/simulated/wall/clockwork/dismantle_wall(devastated=0, explode=0)
+	if(devastated)
+		devastate_wall()
+		ChangeTurf(baseturf)
+	else
+		playsound(src, 'sound/items/welder.ogg', 100, 1)
+		var/newgirder = break_wall()
+		if(newgirder) //maybe we want a gear!
+			transfer_fingerprints_to(newgirder)
+		ChangeTurf(baseturf)
+
+	for(var/obj/O in src) //Eject contents!
+		if(istype(O, /obj/structure/sign/poster))
+			var/obj/structure/sign/poster/P = O
+			P.roll_and_drop(src)
+		else
+			O.forceMove(src)
+
+/turf/simulated/wall/clockwork/devastate_wall()
+	for(var/i in 1 to 2)
+		new/obj/item/clockwork/alloy_shards/large(src)
+	for(var/i in 1 to 2)
+		new/obj/item/clockwork/alloy_shards/medium(src)
+	for(var/i in 1 to 3)
+		new/obj/item/clockwork/alloy_shards/small(src)
+
+/turf/simulated/wall/clockwork/attack_hulk(mob/living/user, does_attack_animation = 0)
+	..()
+	if(heated)
+		to_chat(user, "<span class='userdanger'>The wall is searing hot to the touch!</span>")
+		user.adjustFireLoss(5)
+		playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE)
+
+/turf/simulated/wall/clockwork/mech_melee_attack(obj/mecha/M)
+	..()
+	if(heated)
+		to_chat(M.occupant, "<span class='userdanger'>The wall's intense heat completely reflects your [M.name]'s attack!</span>")
+		M.take_damage(20, BURN)
+
+/turf/simulated/wall/clockwork/proc/turn_up_the_heat()
+	if(!heated)
+		name = "superheated [name]"
+		visible_message("<span class='warning'>[src] sizzles with heat!</span>")
+		playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE)
+		heated = TRUE
+		hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing
+		slicing_duration = 150
+		animate(realappearance, color = "#FFC3C3", time = 5)
+	else
+		name = initial(name)
+		visible_message("<span class='notice'>[src] cools down.</span>")
+		heated = FALSE
+		hardness = initial(hardness)
+		slicing_duration = initial(slicing_duration)
+		animate(realappearance, color = initial(realappearance.color), time = 25)