Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity

code/modules/admin/admin_verbs.dm

@@ -149,8 +149,8 @@ var/list/admin_verbs_debug = list(
 	/client/proc/reload_admins,
 	/client/proc/reload_mentors,
 	/client/proc/restart_controller,
-	/client/proc/remake_distribution_map,
-	/client/proc/show_distribution_map,
+	/client/proc/print_random_map,
+	/client/proc/create_random_map,
 	/client/proc/show_plant_genes,
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,

code/modules/client/preferences_gear.dm

@@ -470,7 +470,7 @@ var/global/list/gear_datums = list()
 
 /datum/gear/bomber
 	display_name = "bomber jacket"
-	path = /obj/item/clothing/suit/storage/bomber
+	path = /obj/item/clothing/suit/storage/toggle/bomber
 	cost = 4
 	slot = slot_wear_suit
 
@@ -506,10 +506,14 @@ var/global/list/gear_datums = list()
 
 /datum/gear/hoodie
 	display_name = "hoodie, grey"
-	path = /obj/item/clothing/suit/hoodie
+	path = /obj/item/clothing/suit/storage/toggle/hoodie
 	cost = 2
 	slot = slot_wear_suit
 
+/datum/gear/hoodie/black
+	display_name = "hoodie, black"
+	path = /obj/item/clothing/suit/storage/toggle/hoodie/black
+
 /datum/gear/unathi_mantle
 	display_name = "hide mantle (Unathi)"
 	path = /obj/item/clothing/suit/unathi/mantle

code/modules/clothing/suits/miscellaneous.dm

@@ -346,11 +346,13 @@
 	icon_state = "blueponcho"
 	item_state = "blueponcho"
 
-/obj/item/clothing/suit/storage/bomber
+/obj/item/clothing/suit/storage/toggle/bomber
 	name = "bomber jacket"
 	desc = "A thick, well-worn WW2 leather bomber jacket."
 	icon_state = "bomber"
 	item_state = "bomber"
+	icon_open = "bomber_open"
+	icon_closed = "bomber"
 	body_parts_covered = UPPER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|ARMS
 	min_cold_protection_temperature = T0C - 20
@@ -383,10 +385,20 @@
 	icon_open = "brown_jacket_nt_open"
 	icon_closed = "brown_jacket_nt"
 
-/obj/item/clothing/suit/hoodie
+/obj/item/clothing/suit/storage/toggle/hoodie
 	name = "grey hoodie"
 	desc = "A warm, grey sweatshirt."
 	icon_state = "grey_hoodie"
 	item_state = "grey_hoodie"
+	icon_open = "grey_hoodie_open"
+	icon_closed = "grey_hoodie"
 	min_cold_protection_temperature = T0C - 20
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/suit/storage/toggle/hoodie/black
+	name = "black hoodie"
+	desc = "A warm, black sweatshirt."
+	icon_state = "black_hoodie"
+	item_state = "black_hoodie"
+	icon_open = "black_hoodie_open"
+	icon_closed = "black_hoodie"

code/modules/holodeck/HolodeckControl.dm

@@ -0,0 +1,385 @@
+var/global/list/holodeck_programs = list(
+	"emptycourt" = /area/holodeck/source_emptycourt,		\
+	"boxingcourt" =	/area/holodeck/source_boxingcourt,	\
+	"basketball" =	/area/holodeck/source_basketball,	\
+	"thunderdomecourt" =	/area/holodeck/source_thunderdomecourt,	\
+	"beach" =	/area/holodeck/source_beach,	\
+	"desert" =	/area/holodeck/source_desert,	\
+	"space" =	/area/holodeck/source_space,	\
+	"picnicarea" = /area/holodeck/source_picnicarea,	\
+	"snowfield" =	/area/holodeck/source_snowfield,	\
+	"theatre" =	/area/holodeck/source_theatre,	\
+	"meetinghall" =	/area/holodeck/source_meetinghall,	\
+	"courtroom" =	/area/holodeck/source_courtroom,	\
+	"burntest" = 	/area/holodeck/source_burntest,	\
+	"wildlifecarp" = 	/area/holodeck/source_wildlife,	\
+	"turnoff" = 	/area/holodeck/source_plating	\
+	)
+
+/obj/machinery/computer/HolodeckControl
+	name = "holodeck control console"
+	desc = "A computer used to control a nearby holodeck."
+	icon_state = "holocontrol"
+
+	use_power = 1
+	active_power_usage = 8000 //8kW for the scenery + 500W per holoitem
+	var/item_power_usage = 500
+
+	var/area/linkedholodeck = null
+	var/area/target = null
+	var/active = 0
+	var/list/holographic_items = list()
+	var/list/holographic_mobs = list()
+	var/damaged = 0
+	var/safety_disabled = 0
+	var/mob/last_to_emag = null
+	var/last_change = 0
+	var/last_gravity_change = 0
+	var/list/supported_programs = list( \
+	"Empty Court" = "emptycourt", \
+	"Basketball Court" = "basketball",	\
+	"Thunderdome Court" = "thunderdomecourt",	\
+	"Boxing Ring"="boxingcourt",	\
+	"Beach" = "beach",	\
+	"Desert" = "desert",	\
+	"Space" = "space",	\
+	"Picnic Area" = "picnicarea",	\
+	"Snow Field" = "snowfield",	\
+	"Theatre" = "theatre",	\
+	"Meeting Hall" = "meetinghall",	\
+	"Courtroom" = "courtroom"	\
+	)
+	var/list/restricted_programs = list("Atmospheric Burn Simulation" = "burntest", "Wildlife Simulation" = "wildlifecarp")
+
+/obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob)
+
+	if(..())
+		return
+	user.set_machine(src)
+	var/dat
+
+	dat += "<B>Holodeck Control System</B><BR>"
+	dat += "<HR>Current Loaded Programs:<BR>"
+	for(var/prog in supported_programs)
+		dat += "<A href='?src=\ref[src];program=[supported_programs[prog]]'>([prog])</A><BR>"
+
+	dat += "<BR>"
+	dat += "<A href='?src=\ref[src];program=turnoff'>(Turn Off)</A><BR>"
+
+	dat += "<BR>"
+	dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.<BR>"
+
+	if(issilicon(user))
+		dat += "<BR>"
+		if(safety_disabled)
+			if (emagged)
+				dat += "<font color=red><b>ERROR</b>: Cannot re-enable Safety Protocols.</font><BR>"
+			else
+				dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=green>Re-Enable Safety Protocols?</font>)</A><BR>"
+		else
+			dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=red>Override Safety Protocols?</font>)</A><BR>"
+
+	dat += "<BR>"
+
+	if(safety_disabled)
+		for(var/prog in restricted_programs)
+			dat += "<A href='?src=\ref[src];program=[restricted_programs[prog]]'>(<font color=red>Begin [prog]</font>)</A><BR>"
+			dat += "Ensure the holodeck is empty before testing.<BR>"
+			dat += "<BR>"
+		dat += "Safety Protocols are <font color=red> DISABLED </font><BR>"
+	else
+		dat += "Safety Protocols are <font color=green> ENABLED </font><BR>"
+
+	if(linkedholodeck.has_gravity)
+		dat += "Gravity is <A href='?src=\ref[src];gravity=1'><font color=green>(ON)</font></A><BR>"
+	else
+		dat += "Gravity is <A href='?src=\ref[src];gravity=1'><font color=blue>(OFF)</font></A><BR>"
+
+	user << browse(dat, "window=computer;size=400x500")
+	onclose(user, "computer")
+
+	return
+
+
+/obj/machinery/computer/HolodeckControl/Topic(href, href_list)
+	if(..())
+		return
+	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+		usr.set_machine(src)
+
+		if(href_list["program"])
+			var/prog = href_list["program"]
+			if(prog in holodeck_programs)
+				target = locate(holodeck_programs[prog])
+				if(target)
+					loadProgram(target)
+
+		else if(href_list["AIoverride"])
+			if(!issilicon(usr))
+				return
+
+			if(safety_disabled && emagged)
+				return //if a traitor has gone through the trouble to emag the thing, let them keep it.
+
+			safety_disabled = !safety_disabled
+			update_projections()
+			if(safety_disabled)
+				message_admins("[key_name_admin(usr)] overrode the holodeck's safeties")
+				log_game("[key_name(usr)] overrided the holodeck's safeties")
+			else
+				message_admins("[key_name_admin(usr)] restored the holodeck's safeties")
+				log_game("[key_name(usr)] restored the holodeck's safeties")
+
+		else if(href_list["gravity"])
+			toggleGravity(linkedholodeck)
+
+		src.add_fingerprint(usr)
+	src.updateUsrDialog()
+	return
+
+/obj/machinery/computer/HolodeckControl/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+	if(istype(D, /obj/item/weapon/card/emag))
+		playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+		last_to_emag = user //emag again to change the owner
+		if (!emagged)
+			emagged = 1
+			safety_disabled = 1
+			update_projections()
+			user << "<span class='notice'>You vastly increase projector power and override the safety and security protocols.</span>"
+			user << "Warning.  Automatic shutoff and derezing protocols have been corrupted.  Please call Nanotrasen maintenance and do not use the simulator."
+			log_game("[key_name(usr)] emagged the Holodeck Control Computer")
+	src.updateUsrDialog()
+	return
+
+/obj/machinery/computer/HolodeckControl/proc/update_projections()
+	if (safety_disabled)
+		item_power_usage = 2500
+		for(var/obj/item/weapon/holo/esword/H in linkedholodeck)
+			H.damtype = BRUTE
+	else
+		item_power_usage = initial(item_power_usage)
+		for(var/obj/item/weapon/holo/esword/H in linkedholodeck)
+			H.damtype = initial(H.damtype)
+
+	for(var/mob/living/simple_animal/hostile/carp/holodeck/C in holographic_mobs)
+		C.set_safety(!safety_disabled)
+		if (last_to_emag)
+			C.friends = list(last_to_emag)
+
+/obj/machinery/computer/HolodeckControl/New()
+	..()
+	linkedholodeck = locate(/area/holodeck/alphadeck)
+	//if(linkedholodeck)
+	//	target = locate(/area/holodeck/source_emptycourt)
+	//	if(target)
+	//		loadProgram(target)
+
+//This could all be done better, but it works for now.
+/obj/machinery/computer/HolodeckControl/Del()
+	emergencyShutdown()
+	..()
+
+/obj/machinery/computer/HolodeckControl/meteorhit(var/obj/O as obj)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/emp_act(severity)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/ex_act(severity)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/blob_act()
+	emergencyShutdown()
+	..()
+
+/obj/machinery/computer/HolodeckControl/power_change()
+	var/oldstat
+	..()
+	if (stat != oldstat && active && (stat & NOPOWER))
+		emergencyShutdown()
+
+/obj/machinery/computer/HolodeckControl/process()
+	for(var/item in holographic_items) // do this first, to make sure people don't take items out when power is down.
+		if(!(get_turf(item) in linkedholodeck))
+			derez(item, 0)
+
+	if (!safety_disabled)
+		for(var/mob/living/simple_animal/hostile/carp/holodeck/C in holographic_mobs)
+			if (get_area(C.loc) != linkedholodeck)
+				holographic_mobs -= C
+				C.derez()
+
+	if(!..())
+		return
+	if(active)
+		use_power(item_power_usage * (holographic_items.len + holographic_mobs.len))
+
+		if(!checkInteg(linkedholodeck))
+			damaged = 1
+			target = locate(/area/holodeck/source_plating)
+			if(target)
+				loadProgram(target)
+			active = 0
+			use_power = 1
+			for(var/mob/M in range(10,src))
+				M.show_message("The holodeck overloads!")
+
+
+			for(var/turf/T in linkedholodeck)
+				if(prob(30))
+					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+					s.set_up(2, 1, T)
+					s.start()
+				T.ex_act(3)
+				T.hotspot_expose(1000,500,1)
+
+/obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1)
+	holographic_items.Remove(obj)
+
+	if(obj == null)
+		return
+
+	if(isobj(obj))
+		var/mob/M = obj.loc
+		if(ismob(M))
+			M.u_equip(obj)
+			M.update_icons()	//so their overlays update
+
+	if(!silent)
+		var/obj/oldobj = obj
+		visible_message("The [oldobj.name] fades away!")
+	del(obj)
+
+/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A)
+	for(var/turf/T in A)
+		if(istype(T, /turf/space))
+			return 0
+
+	return 1
+
+//Why is it called toggle if it doesn't toggle?
+/obj/machinery/computer/HolodeckControl/proc/togglePower(var/toggleOn = 0)
+
+	if(toggleOn)
+		var/area/targetsource = locate(/area/holodeck/source_emptycourt)
+		holographic_items = targetsource.copy_contents_to(linkedholodeck)
+
+		spawn(30)
+			for(var/obj/effect/landmark/L in linkedholodeck)
+				if(L.name=="Atmospheric Test Start")
+					spawn(20)
+						var/turf/T = get_turf(L)
+						var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+						s.set_up(2, 1, T)
+						s.start()
+						if(T)
+							T.temperature = 5000
+							T.hotspot_expose(50000,50000,1)
+
+		active = 1
+		use_power = 2
+	else
+		for(var/item in holographic_items)
+			derez(item)
+		if(!linkedholodeck.has_gravity)
+			linkedholodeck.gravitychange(1,linkedholodeck)
+
+		var/area/targetsource = locate(/area/holodeck/source_plating)
+		targetsource.copy_contents_to(linkedholodeck , 1)
+		active = 0
+		use_power = 1
+
+
+/obj/machinery/computer/HolodeckControl/proc/loadProgram(var/area/A)
+
+	if(world.time < (last_change + 25))
+		if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve
+			return
+		for(var/mob/M in range(3,src))
+			M.show_message("\b ERROR. Recalibrating projection apparatus.")
+			last_change = world.time
+			return
+
+	last_change = world.time
+	active = 1
+	use_power = 2
+
+	for(var/item in holographic_items)
+		derez(item)
+
+	for(var/mob/living/simple_animal/hostile/carp/holodeck/C in holographic_mobs)
+		holographic_mobs -= C
+		C.derez()
+
+	for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
+		del(B)
+
+	holographic_items = A.copy_contents_to(linkedholodeck , 1)
+
+	spawn(30)
+		for(var/obj/effect/landmark/L in linkedholodeck)
+			if(L.name=="Atmospheric Test Start")
+				spawn(20)
+					var/turf/T = get_turf(L)
+					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+					s.set_up(2, 1, T)
+					s.start()
+					if(T)
+						T.temperature = 5000
+						T.hotspot_expose(50000,50000,1)
+			if(L.name=="Holocarp Spawn")
+				holographic_mobs += new /mob/living/simple_animal/hostile/carp/holodeck(L.loc)
+
+			if(L.name=="Holocarp Spawn Random")
+				if (prob(4)) //With 4 spawn points, carp should only appear 15% of the time.
+					holographic_mobs += new /mob/living/simple_animal/hostile/carp/holodeck(L.loc)
+
+		update_projections()
+
+
+/obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A)
+	if(world.time < (last_gravity_change + 25))
+		if(world.time < (last_gravity_change + 15))//To prevent super-spam clicking
+			return
+		for(var/mob/M in range(3,src))
+			M.show_message("\b ERROR. Recalibrating gravity field.")
+			last_change = world.time
+			return
+
+	last_gravity_change = world.time
+	active = 1
+	use_power = 1
+
+	if(A.has_gravity)
+		A.gravitychange(0,A)
+	else
+		A.gravitychange(1,A)
+
+/obj/machinery/computer/HolodeckControl/proc/emergencyShutdown()
+	//Get rid of any items
+	for(var/item in holographic_items)
+		derez(item)
+	for(var/mob/living/simple_animal/hostile/carp/holodeck/C in holographic_mobs)
+		holographic_mobs -= C
+		C.derez()
+	//Turn it back to the regular non-holographic room
+	target = locate(/area/holodeck/source_plating)
+	if(target)
+		loadProgram(target)
+
+	if(!linkedholodeck.has_gravity)
+		linkedholodeck.gravitychange(1,linkedholodeck)
+
+	var/area/targetsource = locate(/area/holodeck/source_plating)
+	targetsource.copy_contents_to(linkedholodeck , 1)
+	active = 0
+	use_power = 1

code/modules/holodeck/HolodeckObjects.dm

@@ -0,0 +1,422 @@
+// Holographic Items!
+
+/turf/simulated/floor/holofloor/
+	thermal_conductivity = 0
+
+/turf/simulated/floor/holofloor/grass
+	name = "Lush Grass"
+	icon_state = "grass1"
+	floor_type = /obj/item/stack/tile/grass
+
+	New()
+		icon_state = "grass[pick("1","2","3","4")]"
+		..()
+		spawn(4)
+			update_icon()
+			for(var/direction in cardinal)
+				if(istype(get_step(src,direction),/turf/simulated/floor))
+					var/turf/simulated/floor/FF = get_step(src,direction)
+					FF.update_icon() //so siding get updated properly
+
+/turf/simulated/floor/holofloor/space
+	icon = 'icons/turf/space.dmi'
+	name = "\proper space"
+	icon_state = "0"
+
+/turf/simulated/floor/holofloor/space/New()
+	icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
+
+/turf/simulated/floor/holofloor/desert
+	name = "desert sand"
+	desc = "Uncomfortably gritty for a hologram."
+	icon_state = "asteroid"
+
+/turf/simulated/floor/holofloor/desert/New()
+	..()
+	if(prob(10))
+		overlays += "asteroid[rand(0,9)]"
+
+/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	return
+	// HOLOFLOOR DOES NOT GIVE A FUCK
+
+/obj/structure/table/holotable
+	name = "table"
+	desc = "A square piece of metal standing on four metal legs. It can not move."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "table"
+	density = 1
+	anchored = 1.0
+	layer = 2.8
+	throwpass = 1	//You can throw objects over this, despite it's density.
+
+/obj/structure/table/holotable/attack_hand(mob/user as mob)
+	return // HOLOTABLE DOES NOT GIVE A FUCK
+
+
+/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/wrench))
+		user << "It's a holotable!  There are no bolts!"
+		return
+
+	if(isrobot(user))
+		return
+
+	..()
+
+/obj/structure/table/woodentable/holotable
+	name = "table"
+	desc = "A square piece of wood standing on four wooden legs. It can not move."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "wood_table"
+
+/obj/structure/holostool
+	name = "stool"
+	desc = "Apply butt."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "stool"
+	anchored = 1.0
+	pressure_resistance = 15
+
+
+/obj/item/clothing/gloves/boxing/hologlove
+	name = "boxing gloves"
+	desc = "Because you really needed another excuse to punch your crewmates."
+	icon_state = "boxing"
+	item_state = "boxing"
+
+/obj/structure/window/reinforced/holowindow/Del()
+	..()
+
+/obj/structure/window/reinforced/holowindow/attackby(obj/item/W as obj, mob/user as mob)
+	if(!istype(W)) return//I really wish I did not need this
+	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
+		var/obj/item/weapon/grab/G = W
+		if(istype(G.affecting,/mob/living))
+			var/mob/living/M = G.affecting
+			var/state = G.state
+			del(W)	//gotta delete it here because if window breaks, it won't get deleted
+			switch (state)
+				if(1)
+					M.visible_message("<span class='warning'>[user] slams [M] against \the [src]!</span>")
+					M.apply_damage(7)
+					hit(10)
+				if(2)
+					M.visible_message("<span class='danger'>[user] bashes [M] against \the [src]!</span>")
+					if (prob(50))
+						M.Weaken(1)
+					M.apply_damage(10)
+					hit(25)
+				if(3)
+					M.visible_message("<span class='danger'><big>[user] crushes [M] against \the [src]!</big></span>")
+					M.Weaken(5)
+					M.apply_damage(20)
+					hit(50)
+			return
+
+	if(W.flags & NOBLUDGEON) return
+
+	if(istype(W, /obj/item/weapon/screwdriver))
+		user << ("<span class='notice'>It's a holowindow, you can't unfasten it!</span>")
+	else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1)
+		user << ("<span class='notice'>It's a holowindow, you can't pry it!</span>")
+	else if(istype(W, /obj/item/weapon/wrench) && !anchored && (!state || !reinf))
+		user << ("<span class='notice'>It's a holowindow, you can't dismantle it!</span>")
+	else
+		if(W.damtype == BRUTE || W.damtype == BURN)
+			hit(W.force)
+			if(health <= 7)
+				anchored = 0
+				update_nearby_icons()
+				step(src, get_dir(user, src))
+		else
+			playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+		..()
+	return
+
+/obj/structure/window/reinforced/holowindow/shatter(var/display_message = 1)
+	playsound(src, "shatter", 70, 1)
+	if(display_message)
+		visible_message("[src] fades away as it shatters!")
+	del(src)
+	return
+
+/obj/structure/window/reinforced/holowindow/disappearing/Del()
+	..()
+
+/obj/machinery/door/window/holowindoor/Del()
+	..()
+
+/obj/machinery/door/window/holowindoor/attackby(obj/item/weapon/I as obj, mob/user as mob)
+
+	if (src.operating == 1)
+		return
+
+	if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card))
+		var/aforce = I.force
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+		visible_message("\red <B>[src] was hit by [I].</B>")
+		if(I.damtype == BRUTE || I.damtype == BURN)
+			take_damage(aforce)
+		return
+
+	src.add_fingerprint(user)
+	if (!src.requiresID())
+		user = null
+
+	if (src.allowed(user))
+		if (src.density)
+			open()
+		else
+			close()
+
+	else if (src.density)
+		flick(text("[]deny", src.base_state), src)
+
+	return
+
+/obj/machinery/door/window/holowindoor/shatter(var/display_message = 1)
+	src.density = 0
+	playsound(src, "shatter", 70, 1)
+	if(display_message)
+		visible_message("[src] fades away as it shatters!")
+	del(src)
+
+/obj/structure/stool/bed/chair/holochair/Del()
+	..()
+
+/obj/structure/stool/bed/chair/holochair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		user << ("<span class='notice'>It's a holochair, you can't dismantle it!</span>")
+	return
+
+/obj/item/weapon/holo
+	damtype = HALLOSS
+
+/obj/item/weapon/holo/esword
+	desc = "May the force be within you. Sorta."
+	icon_state = "sword0"
+	force = 3.0
+	throw_speed = 1
+	throw_range = 5
+	throwforce = 0
+	w_class = 2.0
+	flags = NOSHIELD | NOBLOODY
+	var/active = 0
+
+/obj/item/weapon/holo/esword/green
+	New()
+		item_color = "green"
+
+/obj/item/weapon/holo/esword/red
+	New()
+		item_color = "red"
+
+/obj/item/weapon/holo/esword/IsShield()
+	if(active)
+		return 1
+	return 0
+
+/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob)
+	..()
+
+/obj/item/weapon/holo/esword/New()
+	item_color = pick("red","blue","green","purple")
+
+/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob)
+	active = !active
+	if (active)
+		force = 30
+		icon_state = "sword[item_color]"
+		w_class = 4
+		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+		user << "<span class='notice'>[src] is now active.</span>"
+	else
+		force = 3
+		icon_state = "sword0"
+		w_class = 2
+		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+		user << "<span class='notice'>[src] can now be concealed.</span>"
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
+	add_fingerprint(user)
+	return
+
+//BASKETBALL OBJECTS
+
+/obj/item/weapon/beach_ball/holoball
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "basketball"
+	name = "basketball"
+	item_state = "basketball"
+	desc = "Here's your chance, do your dance at the Space Jam."
+	w_class = 4 //Stops people from hiding it in their bags/pockets
+
+/obj/structure/holohoop
+	name = "basketball hoop"
+	desc = "Boom, Shakalaka!"
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "hoop"
+	anchored = 1
+	density = 1
+	throwpass = 1
+
+/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
+		var/obj/item/weapon/grab/G = W
+		if(G.state<2)
+			user << "<span class='warning'>You need a better grip to do that!</span>"
+			return
+		G.affecting.loc = src.loc
+		G.affecting.Weaken(5)
+		visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>", 3)
+		del(W)
+		return
+	else if (istype(W, /obj/item) && get_dist(src,user)<2)
+		user.drop_item(src)
+		visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>", 3)
+		return
+
+/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if (istype(mover,/obj/item) && mover.throwing)
+		var/obj/item/I = mover
+		if(istype(I, /obj/item/projectile))
+			return
+		if(prob(50))
+			I.loc = src.loc
+			visible_message("<span class='notice'>Swish! \the [I] lands in \the [src].</span>", 3)
+		else
+			visible_message("<span class='warning'>\The [I] bounces off of \the [src]'s rim!</span>", 3)
+		return 0
+	else
+		return ..(mover, target, height, air_group)
+
+
+/obj/machinery/readybutton
+	name = "Ready Declaration Device"
+	desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!"
+	icon = 'icons/obj/monitors.dmi'
+	icon_state = "auth_off"
+	var/ready = 0
+	var/area/currentarea = null
+	var/eventstarted = 0
+
+	anchored = 1.0
+	use_power = 1
+	idle_power_usage = 2
+	active_power_usage = 6
+	power_channel = ENVIRON
+
+/obj/machinery/readybutton/attack_ai(mob/user as mob)
+	user << "The station AI is not to interact with these devices!"
+	return
+
+/obj/machinery/readybutton/New()
+	..()
+
+
+/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	user << "The device is a solid button, there's nothing you can do with it!"
+
+/obj/machinery/readybutton/attack_hand(mob/user as mob)
+
+	if(user.stat || stat & (NOPOWER|BROKEN))
+		user << "This device is not powered."
+		return
+
+	if(!user.IsAdvancedToolUser())
+		return 0
+
+	currentarea = get_area(src.loc)
+	if(!currentarea)
+		del(src)
+
+	if(eventstarted)
+		usr << "The event has already begun!"
+		return
+
+	ready = !ready
+
+	update_icon()
+
+	var/numbuttons = 0
+	var/numready = 0
+	for(var/obj/machinery/readybutton/button in currentarea)
+		numbuttons++
+		if (button.ready)
+			numready++
+
+	if(numbuttons == numready)
+		begin_event()
+
+/obj/machinery/readybutton/update_icon()
+	if(ready)
+		icon_state = "auth_on"
+	else
+		icon_state = "auth_off"
+
+/obj/machinery/readybutton/proc/begin_event()
+
+	eventstarted = 1
+
+	for(var/obj/structure/window/reinforced/holowindow/disappearing/W in currentarea)
+		del(W)
+
+	for(var/mob/M in currentarea)
+		M << "FIGHT!"
+
+//Holorack
+
+/obj/structure/table/rack/holorack
+	name = "rack"
+	desc = "Different from the Middle Ages version."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "rack"
+
+/obj/structure/table/rack/holorack/attack_hand(mob/user as mob)
+	return
+
+/obj/structure/table/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/wrench))
+		user << "It's a holorack!  You can't unwrench it!"
+		return
+
+//Holocarp
+
+/mob/living/simple_animal/hostile/carp/holodeck
+	icon = 'icons/mob/AI.dmi'
+	icon_state = "holo4"
+	icon_living = "holo4"
+	icon_dead = "holo4"
+	icon_gib = null
+	meat_amount = 0
+	meat_type = null
+
+/mob/living/simple_animal/hostile/carp/holodeck/proc/set_safety(var/safe)
+	if (safe)
+		faction = "neutral"
+		melee_damage_lower = 0
+		melee_damage_upper = 0
+		wall_smash = 0
+		destroy_surroundings = 0
+	else
+		faction = "carp"
+		melee_damage_lower = initial(melee_damage_lower)
+		melee_damage_upper = initial(melee_damage_upper)
+		wall_smash = initial(wall_smash)
+		destroy_surroundings = initial(destroy_surroundings)
+
+/mob/living/simple_animal/hostile/carp/holodeck/gib()
+	derez() //holograms can't gib
+
+/mob/living/simple_animal/hostile/carp/holodeck/death()
+	..()
+	derez()
+
+/mob/living/simple_animal/hostile/carp/holodeck/proc/derez()
+	visible_message("<span class='notice'>\The [src] fades away!</span>")
+	del(src)

code/modules/mining/drilling/distribution.dm

@@ -1,233 +0,0 @@
-//If anyone can think of a less shitty way to work out x,y points on a linear string of integers please tell me.
-#define MAP_CELL ((y-1)*real_size)+x
-#define MAP_CENTRE (((y-1)+size/2)*real_size)+(x+size/2)
-#define MAP_TOP_LEFT ((y-1)*real_size)+x
-#define MAP_TOP_RIGHT ((y-1)*real_size)+(x+size)
-#define MAP_BOTTOM_LEFT (((y+size)-1)*real_size)+x
-#define MAP_BOTTOM_RIGHT ((((y+size)-1)*real_size)+(x+size))
-#define MAP_MID_TOP MAP_TOP_LEFT + (size/2)
-#define MAP_MID_BOTTOM MAP_BOTTOM_LEFT + (size/2)
-#define MAP_MID_LEFT (((y-1)+size/2)*real_size)+x
-#define MAP_MID_RIGHT (((y-1)+size/2)*real_size)+(x+size)
-
-#define MIN_SURFACE_COUNT 1000
-#define MAX_SURFACE_COUNT 5000
-#define MIN_RARE_COUNT 1000
-#define MAX_RARE_COUNT 5000
-#define MIN_DEEP_COUNT 100
-#define MAX_DEEP_COUNT 300
-#define ITERATE_BEFORE_FAIL 200
-
-#define RESOURCE_HIGH_MAX 4
-#define RESOURCE_HIGH_MIN 2
-#define RESOURCE_MID_MAX 3
-#define RESOURCE_MID_MIN 1
-#define RESOURCE_LOW_MAX 1
-#define RESOURCE_LOW_MIN 0
-
-/*
-Surface minerals:
-	silicates
-	iron
-	gold
-	silver
-
-Rare minerals:
-	uranium
-	diamond
-
-Deep minerals:
-	phoron
-	osmium (platinum)
-	tritium (hydrogen)
-*/
-
-/datum/ore_distribution
-
-	var/real_size = 65     //Overall map size ((must be power of 2)+1)
-	var/chunk_size = 4     //Size each cell represents on map (like hell we're generating up to 100 256^2 grids at roundstart)
-	var/list/map[4225]     //The actual map. real_size squared.
-	var/range = 255        //Max random range of cells in map.
-
-	var/random_variance_chance = 25
-	var/random_element = 0.5
-
-/datum/ore_distribution/proc/map_is_sane()
-	if(!map) return 0
-
-	var/rare_count = 0
-	var/surface_count = 0
-	var/deep_count = 0
-
-	for(var/cell in map)
-		if(cell>(range*0.60))
-			deep_count++
-		else if(cell>(range*0.40))
-			rare_count++
-		else
-			surface_count++
-
-	if(surface_count < MIN_SURFACE_COUNT || surface_count > MAX_SURFACE_COUNT) return 0
-	if(rare_count < MIN_RARE_COUNT || rare_count > MAX_RARE_COUNT) return 0
-	if(deep_count < MIN_DEEP_COUNT || deep_count > MAX_DEEP_COUNT) return 0
-	return 1
-
-//Halfassed diamond-square algorithm with some fuckery since it's a single dimension array.
-/datum/ore_distribution/proc/populate_distribution_map()
-
-	//Seed beginning values.
-	var/x = 1
-	var/y = 1
-	var/size = real_size-1
-	map[MAP_TOP_LEFT] =     (range/3)+rand(range/5)
-	map[MAP_TOP_RIGHT] =    (range/3)+rand(range/5)
-	map[MAP_BOTTOM_LEFT] =  (range/3)+rand(range/5)
-	map[MAP_BOTTOM_RIGHT] = (range/3)+rand(range/5)
-
-	//Fill in and smooth it out.
-	var/attempts = 0
-	do
-		attempts++
-		generate_distribution_map(1,1,size)
-	while(attempts < ITERATE_BEFORE_FAIL && !map_is_sane())
-
-	if(attempts >= ITERATE_BEFORE_FAIL)
-		world << "<b><font color='red'>Could not generate a sane distribution map. Aborting.</font></b>"
-		map = null
-		return
-	else
-		apply_to_asteroid()
-
-/datum/ore_distribution/proc/clear_distribution_map()
-	for(var/x = 1, x <= real_size, x++)
-		for(var/y = 1, y <= real_size, y++)
-			map[MAP_CELL] = 0
-
-/datum/ore_distribution/proc/print_distribution_map(var/mob/usr)
-	var/line = ""
-	for(var/x = 1, x <= real_size, x++)
-		for(var/y = 1, y <= real_size, y++)
-			line += num2text(round(map[MAP_CELL]/25.5))
-		if(usr)
-			usr << line
-		else
-			world << line
-		line = ""
-
-/datum/ore_distribution/proc/generate_distribution_map(var/x,var/y,var/input_size)
-
-	var/size = input_size
-
-	map[MAP_MID_TOP] =    (map[MAP_TOP_LEFT] + map[MAP_TOP_RIGHT])/2
-	map[MAP_MID_RIGHT] =  (map[MAP_BOTTOM_RIGHT] + map[MAP_TOP_RIGHT])/2
-	map[MAP_MID_BOTTOM] = (map[MAP_BOTTOM_LEFT] + map[MAP_BOTTOM_RIGHT])/2
-	map[MAP_MID_LEFT] =   (map[MAP_TOP_LEFT] + map[MAP_BOTTOM_RIGHT])/2
-	map[MAP_CENTRE] =     (map[MAP_MID_LEFT]+map[MAP_MID_RIGHT]+map[MAP_MID_BOTTOM]+map[MAP_MID_TOP])/4
-
-	if(prob(random_variance_chance))
-		map[MAP_CENTRE] *= (rand(1) ? (1.0-random_element) : (1.0+random_element))
-		map[MAP_CENTRE] = max(0,min(range,map[MAP_CENTRE]))
-
-	if(size>3)
-		generate_distribution_map(x,y,input_size/2)
-		generate_distribution_map(x+(input_size/2),y,input_size/2)
-		generate_distribution_map(x,y+(input_size/2),input_size/2)
-		generate_distribution_map(x+(input_size/2),y+(input_size/2),input_size/2)
-
-/datum/ore_distribution/proc/apply_to_asteroid()
-
-	// THESE VALUES DETERMINE THE AREA THAT THE DISTRIBUTION MAP IS APPLIED TO.
-	// IF YOU DO NOT RUN OFFICIAL BAYCODE ASTEROID MAP YOU NEED TO CHANGE THEM.
-	// ORIGIN IS THE BOTTOM LEFT CORNER OF THE SQUARE CONTAINING ALL ASTEROID
-	// TILES YOU WISH TO APPLY THE DISTRIBUTION MAP TO.
-
-	var/origin_x = 13  //We start here...
-	var/origin_y = 32  //...and here...
-	var/limit_x = 217  //...and iterate until here...
-	var/limit_y = 223  //...and here...
-	var/asteroid_z = 5 //...on this Z-level.
-
-	var/tx = origin_x
-	var/ty = origin_y
-
-	for(var/y = 1, y <= real_size, y++)
-
-		for(var/x = 1, x <= real_size, x++)
-
-			var/turf/target_turf
-
-			for(var/i=0,i<chunk_size,i++)
-
-				for(var/j=0,j<chunk_size,j++)
-
-					if(tx+j > limit_x || ty+i > limit_y)
-						continue
-
-					target_turf = locate(tx+j, ty+i, asteroid_z)
-
-					if(target_turf && target_turf.has_resources)
-						target_turf.resources = list()
-						target_turf.resources["silicates"] = rand(3,5)
-						target_turf.resources["carbonaceous rock"] = rand(3,5)
-
-						switch(map[MAP_CELL])
-							if(0 to 100)
-								target_turf.resources["iron"] =       rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["gold"] =       rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["silver"] =     rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["diamond"] =    0
-								target_turf.resources["phoron"] =     0
-								target_turf.resources["osmium"] =     0
-								target_turf.resources["hydrogen"] =   0
-							if(100 to 124)
-								target_turf.resources["iron"] =       0
-								target_turf.resources["gold"] =       rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["silver"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["uranium"] =    rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["diamond"] =    0
-								target_turf.resources["phoron"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["osmium"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-								target_turf.resources["hydrogen"] =   0
-							if(125 to 255)
-								target_turf.resources["iron"] =       0
-								target_turf.resources["gold"] =       0
-								target_turf.resources["silver"] =     0
-								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["diamond"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["phoron"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["osmium"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
-								target_turf.resources["hydrogen"] =   rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
-
-			tx += chunk_size
-		tx = origin_x
-		ty += chunk_size
-
-	world << "<b><font color='red'>Resource map generation complete.</font></b>"
-	return
-
-#undef MAP_CELL
-#undef MAP_CENTRE
-#undef MAP_TOP_LEFT
-#undef MAP_TOP_RIGHT
-#undef MAP_BOTTOM_LEFT
-#undef MAP_BOTTOM_RIGHT
-#undef MAP_MID_TOP
-#undef MAP_MID_BOTTOM
-#undef MAP_MID_LEFT
-#undef MAP_MID_RIGHT
-
-#undef MIN_SURFACE_COUNT
-#undef MAX_SURFACE_COUNT
-#undef MIN_RARE_COUNT
-#undef MAX_RARE_COUNT
-#undef MIN_DEEP_COUNT
-#undef MAX_DEEP_COUNT
-#undef ITERATE_BEFORE_FAIL
-
-#undef RESOURCE_HIGH_MAX
-#undef RESOURCE_HIGH_MIN
-#undef RESOURCE_MID_MAX
-#undef RESOURCE_MID_MIN
-#undef RESOURCE_LOW_MAX
-#undef RESOURCE_LOW_MIN

code/modules/mining/mine_items.dm

@@ -49,21 +49,22 @@
 /*****************************Pickaxe********************************/
 
 /obj/item/weapon/pickaxe
-	name = "pickaxe"
+	name = "mining drill"
+	desc = "The most basic of mining drills, for short excavations and small mineral extractions."
 	icon = 'icons/obj/items.dmi'
-	icon_state = "pickaxe"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 15.0
 	throwforce = 4.0
-	item_state = "pickaxe"
+	icon_state = "pickaxe"
+	item_state = "jackhammer"
 	w_class = 4.0
 	matter = list("metal" = 3750)
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
-	attack_verb = list("hit", "pierced", "sliced", "attacked")
+	attack_verb = list("hit", "pierced", "sliced", "attacked", "drilled")
 	var/drill_sound = 'sound/weapons/Genhit.ogg'
-	var/drill_verb = "picking"
+	var/drill_verb = "drilling"
 	sharp = 1
 
 	var/excavation_amount = 100
@@ -82,7 +83,7 @@
 	desc = "This makes no metallurgic sense."
 
 /obj/item/weapon/pickaxe/drill
-	name = "mining drill" // Can dig sand as well!
+	name = "advanced mining drill" // Can dig sand as well!
 	icon_state = "handdrill"
 	item_state = "jackhammer"
 	digspeed = 30

code/modules/mining/mine_turfs.dm

@@ -29,7 +29,8 @@
 
 /turf/simulated/mineral/New()
 
-	MineralSpread()
+	spawn(0)
+		MineralSpread()
 
 	spawn(2)
 		var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
@@ -86,7 +87,7 @@
 	if(mineral && mineral.spread)
 		for(var/trydir in cardinal)
 			if(prob(mineral.spread_chance))
-				var/turf/simulated/mineral/random/target_turf = get_step(src, trydir)
+				var/turf/simulated/mineral/target_turf = get_step(src, trydir)
 				if(istype(target_turf) && !target_turf.mineral)
 					target_turf.mineral = mineral
 					target_turf.UpdateMineral()
@@ -363,7 +364,7 @@
 /turf/simulated/mineral/random
 	name = "Mineral deposit"
 	var/mineralSpawnChanceList = list("Uranium" = 5, "Platinum" = 5, "Iron" = 35, "Coal" = 35, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Phoron" = 10)
-	var/mineralChance = 10  //means 10% chance of this plot changing to a mineral deposit
+	var/mineralChance = 100 //10 //means 10% chance of this plot changing to a mineral deposit
 
 /turf/simulated/mineral/random/New()
 	if (prob(mineralChance) && !mineral)
@@ -379,7 +380,7 @@
 	. = ..()
 
 /turf/simulated/mineral/random/high_chance
-	mineralChance = 25
+	mineralChance = 100 //25
 	mineralSpawnChanceList = list("Uranium" = 10, "Platinum" = 10, "Iron" = 20, "Coal" = 20, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Phoron" = 20)
 
 

code/modules/random_map/mining_distribution.dm

@@ -0,0 +1,242 @@
+#define MIN_SURFACE_COUNT 500
+#define MIN_RARE_COUNT 200
+#define MIN_DEEP_COUNT 100
+#define RESOURCE_HIGH_MAX 4
+#define RESOURCE_HIGH_MIN 2
+#define RESOURCE_MID_MAX 3
+#define RESOURCE_MID_MIN 1
+#define RESOURCE_LOW_MAX 1
+#define RESOURCE_LOW_MIN 0
+
+/*
+Surface minerals:
+	silicates
+	iron
+	gold
+	silver
+Rare minerals:
+	uranium
+	diamond
+Deep minerals:
+	phoron
+	osmium (platinum)
+	tritium (hydrogen)
+*/
+
+/datum/random_map/ore
+
+	descriptor = "resource distribution map"
+	real_size = 65         // Must be (power of 2)+1 for diamond-square.
+	cell_range = 255       // These values are used to seed ore values rather than to determine a turf type.
+	iterations = 0        // We'll handle iterating on our end (recursive, with args).
+
+	var/chunk_size = 4              // Size each cell represents on map
+	var/random_variance_chance = 25 // % chance of applying random_element.
+	var/random_element = 0.5        // Determines the variance when smoothing out cell values.
+	var/deep_val = 0.8              // Threshold for deep metals, set in new as percentage of cell_range.
+	var/rare_val = 0.7              // Threshold for rare metal, set in new as percentage of cell_range.
+	var/cell_base          // Set in New()
+	var/initial_cell_range // Set in New()
+
+/datum/random_map/ore/New()
+	rare_val = cell_range * rare_val
+	deep_val = cell_range * deep_val
+
+	initial_cell_range = cell_range/5
+	cell_base = cell_range/2
+	..()
+
+/datum/random_map/ore/check_map_sanity()
+
+	var/rare_count = 0
+	var/surface_count = 0
+	var/deep_count = 0
+
+	// Increment map sanity counters.
+	for(var/value in map)
+		if(value < rare_val)
+			surface_count++
+		else if(value < deep_val)
+			rare_count++
+		else
+			deep_count++
+	// Sanity check.
+	if(surface_count < MIN_SURFACE_COUNT)
+		world << "<span class='danger'>Insufficient surface minerals. Rerolling...</span>"
+		return 0
+	else if(rare_count < MIN_RARE_COUNT)
+		world << "<span class='danger'>Insufficient rare minerals. Rerolling...</span>"
+		return 0
+	else if(deep_count < MIN_DEEP_COUNT)
+		world << "<span class='danger'>Insufficient deep minerals. Rerolling...</span>"
+		return 0
+	else
+		return 1
+
+//Halfassed diamond-square algorithm with some fuckery since it's a single dimension array.
+/datum/random_map/ore/seed_map()
+
+	// Instantiate the grid.
+	for(var/x = 1, x <= real_size, x++)
+		for(var/y = 1, y <= real_size, y++)
+			map[get_map_cell(x,y)] = 0
+
+	// Now dump in the actual random data.
+	map[get_map_cell(1,1)]                 = cell_base+rand(initial_cell_range)
+	map[get_map_cell(1,real_size)]         = cell_base+rand(initial_cell_range)
+	map[get_map_cell(real_size,real_size)] = cell_base+rand(initial_cell_range)
+	map[get_map_cell(real_size,1)]         = cell_base+rand(initial_cell_range)
+	iterate(1,1,1,(real_size-1)) // Start the recursion here.
+
+/datum/random_map/ore/display_map(atom/user)
+
+	if(!user)
+		user = world
+
+	for(var/x = 1, x <= real_size, x++)
+		var/line = ""
+		for(var/y = 1, y <= real_size, y++)
+			var/current_cell = get_map_cell(x,y)
+			if(within_bounds(current_cell) && map[current_cell])
+				if(map[current_cell] < rare_val)
+					line += "S"
+				else if(map[current_cell] < deep_val)
+					line += "R"
+				else
+					line += "D"
+			else
+				line += "X"
+		user << line
+
+/datum/random_map/ore/iterate(var/iteration,var/x,var/y,var/input_size)
+
+	// Infinite loop check!
+	if(iteration>=iterate_before_fail)
+		world << "<span class='danger'>Iteration count exceeded, aborting.</span>"
+		return
+
+	var/isize = input_size
+	var/hsize = round(input_size/2)
+
+	/*
+	(x,y+isize)----(x+hsize,y+isize)----(x+size,y+isize)
+	  |                 |                  |
+	  |                 |                  |
+	  |                 |                  |
+	(x,y+hsize)----(x+hsize,y+hsize)----(x+isize,y)
+	  |                 |                  |
+	  |                 |                  |
+	  |                 |                  |
+	(x,y)----------(x+hsize,y)----------(x+isize,y)
+	*/
+	// Central edge values become average of corners.
+	map[get_map_cell(x+hsize,y+isize)] = round((\
+		map[get_map_cell(x,y+isize)] +          \
+		map[get_map_cell(x+isize,y+isize)] \
+		)/2)
+
+	map[get_map_cell(x+hsize,y)] = round((  \
+		map[get_map_cell(x,y)] +            \
+		map[get_map_cell(x+isize,y)]   \
+		)/2)
+
+	map[get_map_cell(x,y+hsize)] = round((  \
+		map[get_map_cell(x,y+isize)] + \
+		map[get_map_cell(x,y)]              \
+		)/2)
+
+	map[get_map_cell(x+isize,y+hsize)] = round((  \
+		map[get_map_cell(x+isize,y+isize)] + \
+		map[get_map_cell(x+isize,y)]        \
+		)/2)
+
+	// Centre value becomes the average of all other values + possible random variance.
+	var/current_cell = get_map_cell(x+hsize,y+hsize)
+	map[current_cell] =	round((map[get_map_cell(x+hsize,y+isize)]+map[get_map_cell(x+hsize,y)]+map[get_map_cell(x,y+hsize)]+map[get_map_cell(x+isize,y)])/4)
+
+	if(prob(random_variance_chance))
+		map[current_cell] *= (rand(1,2)==1 ? (1.0-random_element) : (1.0+random_element))
+		map[current_cell] = max(0,min(cell_range,map[current_cell]))
+
+ 	// Recurse until size is too small to subdivide.
+	if(isize>3)
+		sleep(-1)
+		iteration++
+		iterate(iteration, x,       y,       hsize)
+		iterate(iteration, x+hsize, y,       hsize)
+		iterate(iteration, x,       y+hsize, hsize)
+		iterate(iteration, x+hsize, y+hsize, hsize)
+
+/datum/random_map/ore/apply_to_map()
+	for(var/x = 0, x < real_size, x++)
+		if((origin_x + x) > limit_x) continue
+		for(var/y = 0, y < real_size, y++)
+			if((origin_y + y) > limit_y) continue
+			sleep(-1)
+			apply_to_turf(x,y)
+
+/datum/random_map/ore/apply_to_turf(var/x,var/y)
+
+	var/tx = origin_x+((x-1)*chunk_size)
+	var/ty = origin_y+((y-1)*chunk_size)
+
+	for(var/i=0,i<chunk_size,i++)
+		if(ty+i>limit_y)
+			continue
+		for(var/j=0,j<chunk_size,j++)
+			if(tx+j>limit_x)
+				continue
+
+			var/turf/T = locate(tx+j, ty+i, origin_z)
+			if(!T || !T.has_resources)
+				continue
+
+			sleep(-1)
+
+			T.resources = list()
+			T.resources["silicates"] = rand(3,5)
+			T.resources["carbonaceous rock"] = rand(3,5)
+
+			var/current_cell = map[get_map_cell(x,y)]
+			if(current_cell < rare_val)      // Surface metals.
+				T.resources["iron"] =     rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+				T.resources["gold"] =     rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
+				T.resources["silver"] =   rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
+				T.resources["uranium"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
+				T.resources["diamond"] =  0
+				T.resources["phoron"] =   0
+				T.resources["osmium"] =   0
+				T.resources["hydrogen"] = 0
+			else if(current_cell < deep_val) // Rare metals.
+				T.resources["gold"] =     rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["silver"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["uranium"] =  rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["phoron"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["osmium"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["hydrogen"] = 0
+				T.resources["diamond"] =  0
+				T.resources["iron"] =     0
+			else                             // Deep metals.
+				T.resources["uranium"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
+				T.resources["diamond"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
+				T.resources["phoron"] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+				T.resources["osmium"] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+				T.resources["hydrogen"] = rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources["iron"] =     0
+				T.resources["gold"] =     0
+				T.resources["silver"] =   0
+
+	return
+
+/datum/random_map/ore/cleanup()
+	return 1
+
+#undef MIN_SURFACE_COUNT
+#undef MIN_RARE_COUNT
+#undef MIN_DEEP_COUNT
+#undef RESOURCE_HIGH_MAX
+#undef RESOURCE_HIGH_MIN
+#undef RESOURCE_MID_MAX
+#undef RESOURCE_MID_MIN
+#undef RESOURCE_LOW_MAX
+#undef RESOURCE_LOW_MIN

code/modules/random_map/random_map.dm

@@ -0,0 +1,173 @@
+#define ORE_COUNT 1000
+/*
+	This module is used to generate the debris fields/distribution maps/procedural stations.
+*/
+
+var/global/list/random_maps = list()
+
+/datum/random_map
+	var/descriptor = "asteroid"      // Display name.
+	var/real_size = 246             // Size of each edge (must be square :().
+	var/cell_range = 2              // Random range for initial cells.
+	var/iterations = 5              // Number of times to apply the automata rule.
+	var/max_attempts = 5            // Fail if a sane map isn't generated by this point.
+	var/raw_map_size                // Used for creating new maps each iteration. Value must be real_size^2
+	var/list/map = list()           // Actual map.
+	var/origin_x = 1                // Origin point, left.
+	var/origin_y = 1                // Origin point, bottom.
+	var/origin_z = 1                // Target Z-level.
+	var/limit_x = 256               // Maximum x bound.
+	var/limit_y = 256               // Maximum y bound.
+	var/iterate_before_fail = 120   // Infinite loop safeguard.
+
+/datum/random_map/proc/get_map_cell(var/x,var/y)
+	return ((y-1)*real_size)+x
+
+/datum/random_map/proc/display_map(atom/user)
+
+	if(!user)
+		user = world
+
+	for(var/x = 1, x <= real_size, x++)
+		var/line = ""
+		for(var/y = 1, y <= real_size, y++)
+			var/current_cell = get_map_cell(x,y)
+			if(within_bounds(current_cell))
+				if(map[current_cell] == 2)
+					line += "#"
+				else
+					line += "."
+		user << line
+
+/datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly)
+
+	// Store this for debugging.
+	random_maps |= src
+
+	// Initialize map.
+	set_map_size()
+
+	// Get origins for applying the map later.
+	if(tx)  origin_x = tx
+	if(ty)  origin_y = ty
+	if(tz)  origin_z = tz
+	if(tlx) limit_x = tlx
+	if(tly) limit_y = tly
+
+	// testing needed to see how reliable this is (asynchronous calls, called during worldgen), DM ref is not optimistic
+	if(seed) rand_seed(seed)
+
+	var/start_time = world.timeofday
+	world << "<span class='danger'>Generating [descriptor].</span>"
+	for(var/i = 0;i<max_attempts;i++)
+		if(generate())
+			world << "<span class='danger'>[capitalize(descriptor)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds.</span>"
+			return
+	world << "<span class='danger'>[capitalize(descriptor)] generation failed in [round(0.1*(world.timeofday-start_time),0.1)] seconds: could not produce sane map.</span>"
+
+/datum/random_map/proc/within_bounds(var/val)
+	return (val>0) && (val<=raw_map_size)
+
+/datum/random_map/proc/set_map_size(var/raw_size)
+	if(!raw_size)
+		raw_size = real_size * real_size
+	raw_map_size = raw_size
+	map.len = raw_map_size
+
+/datum/random_map/proc/seed_map()
+	for(var/x = 1, x <= real_size, x++)
+		for(var/y = 1, y <= real_size, y++)
+			var/current_cell = get_map_cell(x,y)
+			if(prob(55))
+				map[current_cell] = 2
+			else
+				map[current_cell] = 1
+
+/datum/random_map/proc/clear_map()
+	for(var/x = 1, x <= real_size, x++)
+		for(var/y = 1, y <= real_size, y++)
+			map[get_map_cell(x,y)] = 0
+
+/datum/random_map/proc/generate()
+	seed_map()
+	for(var/i=1;i<=iterations;i++)
+		iterate(i)
+	if(check_map_sanity())
+		cleanup()
+		apply_to_map()
+		return 1
+	return 0
+
+/datum/random_map/proc/iterate(var/iteration)
+	var/list/next_map[raw_map_size]
+	for(var/x = 1, x <= real_size, x++)
+		for(var/y = 1, y <= real_size, y++)
+			var/current_cell = get_map_cell(x,y)
+			// Sanity check.
+			if(!within_bounds(current_cell))
+				continue
+			// Copy over original value.
+			next_map[current_cell] = map[current_cell]
+			// Check all neighbors.
+			var/count = 0
+			for(var/cell in list(current_cell,get_map_cell(x+1,y+1),get_map_cell(x-1,y-1),get_map_cell(x+1,y-1),get_map_cell(x-1,y+1),get_map_cell(x-1,y),get_map_cell(x,y-1),get_map_cell(x+1,y),get_map_cell(x,y+1)))
+				if(within_bounds(cell) && map[cell] == 2)
+					count++
+			if(count>=5)
+				next_map[current_cell] = 2 // becomes a wall
+			else
+				next_map[current_cell] = 1 // becomes a floor
+	map = next_map
+
+/datum/random_map/proc/check_map_sanity()
+	return 1
+
+/datum/random_map/proc/apply_to_map()
+	for(var/x = 0, x < real_size, x++)
+		if((origin_x + x) > limit_x) continue
+		for(var/y = 0, y < real_size, y++)
+			if((origin_y + y) > limit_y) continue
+			sleep(-1)
+			apply_to_turf(origin_x+x,origin_y+y)
+
+/datum/random_map/proc/apply_to_turf(var/x,var/y)
+	var/current_cell = get_map_cell(x,y)
+	if(!within_bounds(current_cell))
+		return
+	var/turf/T = locate(x,y,origin_z)
+	if(!T || !istype(T,/turf/unsimulated/mask))
+		return
+	switch(map[current_cell])
+		if(1)
+			T.ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
+		if(2)
+			T.ChangeTurf(/turf/simulated/mineral)
+		if(3)
+			T.ChangeTurf(/turf/simulated/mineral/random)
+		if(4)
+			T.ChangeTurf(/turf/simulated/mineral/random/high_chance)
+
+/datum/random_map/proc/cleanup()
+
+	sleep(-1)
+	// Create ore.
+	var/ore_count = ORE_COUNT
+	while(ore_count)
+		var/check_cell = get_map_cell(rand(1,real_size),rand(1,real_size))
+		if(!(within_bounds(check_cell)) || map[check_cell] != 2)
+			continue
+		if(prob(25))
+			map[check_cell] = 4
+		else
+			map[check_cell] = 3
+		ore_count--
+
+	sleep(-1)
+
+	// Place random asteroid rooms.
+	var/rooms_placed = 0
+	for(var/i = 0, i < max_secret_rooms, i++)
+		if(make_mining_asteroid_secret())
+			rooms_placed++
+	world << "<span class='danger'>Placed [rooms_placed] secrets.</span>"
+	return 1

code/modules/random_map/setpiece.dm

@@ -0,0 +1,125 @@
+/datum/setpiece
+	var/descriptor
+	var/base_x
+	var/base_y
+	var/origin_x
+	var/origin_y
+	var/origin_z
+	var/x_bound
+	var/y_bound
+	var/list/map
+	var/min_x = 32
+	var/min_y = 32
+
+/datum/setpiece/New(var/x, var/y, var/x_size, var/y_size)
+
+	// Get operating paramaters.
+	if(x_size)
+		x_bound = x_size
+	else
+		x_bound = base_x
+	if(y_size)
+		y_bound = y_size
+	else
+		y_bound = base_y
+
+	origin_x = x
+	origin_y = y
+
+	// Initialize map.
+	map = list()
+	map.len = x_bound * y_bound
+
+	// Build.
+	if(is_buildable())
+		generate()
+		apply_to_map()
+		return 1
+	return 0
+
+/datum/setpiece/proc/is_buildable()
+	return 1
+
+/datum/setpiece/proc/apply_to_map()
+	return 1
+
+/datum/setpiece/proc/generate()
+	return 1
+
+/datum/setpiece/asteroid_secret
+	descriptor = "secret room"
+	base_x = 5
+	base_y = 5
+	min_x = 5
+	min_y = 5
+
+/datum/setpiece/asteroid_secret/is_buildable()
+
+	var/valid = 0
+	var/turf/T = null
+	var/sanity = 0
+	var/list/room = null
+	var/list/turfs = null
+
+	turfs = get_area_turfs(/area/mine/unexplored)
+
+	if(!turfs.len)
+		return 0
+
+	while(!valid)
+		valid = 1
+		sanity++
+		if(sanity > 100)
+			return 0
+
+		T=pick(turfs)
+		if(!T)
+			return 0
+
+		var/list/surroundings = list()
+
+		surroundings += range(7, locate(T.x,T.y,T.z))
+		surroundings += range(7, locate(T.x+size,T.y,T.z))
+		surroundings += range(7, locate(T.x,T.y+size,T.z))
+		surroundings += range(7, locate(T.x+size,T.y+size,T.z))
+
+		if(locate(/area/mine/explored) in surroundings)			// +5s are for view range
+			valid = 0
+			continue
+
+		if(locate(/turf/space) in surroundings)
+			valid = 0
+			continue
+
+		if(locate(/area/asteroid/artifactroom) in surroundings)
+			valid = 0
+			continue
+
+		if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings)
+			valid = 0
+			continue
+
+	if(!T)
+		return 0
+
+	room = spawn_room(T,size,size,,,1)
+
+	if(room)
+		T = pick(room["floors"])
+		if(T)
+			var/surprise = null
+			valid = 0
+			while(!valid)
+				surprise = pickweight(space_surprises)
+				if(surprise in spawned_surprises)
+					if(prob(20))
+						valid++
+					else
+						continue
+				else
+					valid++
+
+			spawned_surprises.Add(surprise)
+			new surprise(T)
+
+	return 1