Merge remote-tracking branch 'upstream/master' into fluffclean

Conflicts:
	paradise.dme

code/modules/admin/verbs/adminjump.dm

@@ -6,7 +6,12 @@
 		src << "Only administrators may use this command."
 		return
 
-	usr.loc = pick(get_area_turfs(A))
+	var/list/area_turfs = get_area_turfs(A)
+	if(area_turfs && area_turfs.len)
+		usr.loc = pick(area_turfs)
+	else
+		src << "That area has no turfs to jump to!"
+		return
 	log_admin("[key_name(usr)] jumped to [A]")
 	message_admins("[key_name_admin(usr)] jumped to [A]", 1)
 	feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/debug.dm

@@ -1037,7 +1037,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/staff(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 
@@ -1049,7 +1049,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/staff(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 
@@ -1061,7 +1061,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/staff(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
 

code/modules/client/preferences.dm

@@ -970,7 +970,7 @@ datum/preferences
 					if("age")
 						age = rand(AGE_MIN, AGE_MAX)
 					if("hair")
-						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine")
+						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Wryn")
 							r_hair = rand(0,255)
 							g_hair = rand(0,255)
 							b_hair = rand(0,255)
@@ -996,7 +996,7 @@ datum/preferences
 						if(species == "Human")
 							s_tone = random_skin_tone()
 					if("s_color")
-						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
+						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People" || species == "Wryn")
 							r_skin = rand(0,255)
 							g_skin = rand(0,255)
 							b_skin = rand(0,255)

code/modules/clothing/clothing.dm

@@ -45,7 +45,7 @@
 	//Set species_restricted list
 	switch(target_species)
 		if("Human", "Skrell")	//humanoid bodytypes
-			species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox")
+			species_restricted = list("exclude","Unathi","Tajaran","Diona","Vox","Wryn")
 		else
 			species_restricted = list(target_species)
 
@@ -161,7 +161,7 @@ BLIND     // can't see anything
 	var/transfer_prints = FALSE
 	var/pickpocket = 0 //Master pickpocket?
 	var/clipped = 0
-	species_restricted = list("exclude","Unathi","Tajaran")
+	species_restricted = list("exclude","Unathi","Tajaran","Wryn")
 
 /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wirecutters))
@@ -295,7 +295,7 @@ BLIND     // can't see anything
 
 	permeability_coefficient = 0.50
 	slowdown = SHOES_SLOWDOWN
-	species_restricted = list("exclude","Unathi","Tajaran")
+	species_restricted = list("exclude","Unathi","Tajaran","Wryn")
 
 /obj/item/proc/negates_gravity()
 	return 0
@@ -328,7 +328,7 @@ BLIND     // can't see anything
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
-	species_restricted = list("exclude","Diona","Vox")
+	species_restricted = list("exclude","Diona","Vox","Wryn")
 	loose = 0 // What kind of idiot designs a pressurized suit where the helmet can fall off?
 	flash_protect = 2
 
@@ -351,7 +351,7 @@ BLIND     // can't see anything
 	heat_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
-	species_restricted = list("exclude","Diona","Vox")
+	species_restricted = list("exclude","Diona","Vox","Wryn")
 
 //Under clothing
 /obj/item/clothing/under

code/modules/clothing/spacesuits/rig.dm

@@ -13,7 +13,7 @@
 	action_button_name = "Toggle Helmet Light"
 
 	//Species-specific stuff.
-	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Diona","Vox")
+	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Diona","Vox","Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -51,7 +51,7 @@
 	armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd)
 
-	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Diona","Vox")
+	species_restricted = list("exclude","Unathi","Tajaran","Skrell","Diona","Vox","Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',

code/modules/clothing/under/color.dm

@@ -3,7 +3,7 @@
 
 /obj/item/clothing/under/color/random/New()
 	..()
-	var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball)
+	var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball, /obj/item/clothing/under/color/red/jersey, /obj/item/clothing/under/color/blue/jersey)
 	var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - excluded)
 	name = initial(C.name)
 	icon_state = initial(C.icon_state)
@@ -173,3 +173,19 @@
 	icon_state = "darkred"
 	_color = "darkred"
 	flags = ONESIZEFITSALL
+
+/obj/item/clothing/under/color/red/jersey
+	name = "red team jersey"
+	desc = "The jersey of the Nanotrasen Phi-ghters!"
+	icon_state = "redjersey"
+	item_state = "r_suit"
+	_color = "redjersey"
+	flags = ONESIZEFITSALL
+
+/obj/item/clothing/under/color/blue/jersey
+	name = "blue team jersey"
+	desc = "The jersey of the Nanotrasen Pi-rates!"
+	icon_state = "bluejersey"
+	item_state = "b_suit"
+	_color = "bluejersey"
+	flags = ONESIZEFITSALL

code/modules/computer3/computers/prisoner.dm

@@ -43,7 +43,7 @@
 				if(!T.implanted) continue
 				var/loc_display = "Unknown"
 				var/mob/living/carbon/M = T.imp_in
-				if(M.z == 1 && !istype(M.loc, /turf/space))
+				if(M.z == ZLEVEL_STATION && !istype(M.loc, /turf/space))
 					var/turf/mob_loc = get_turf(M)
 					loc_display = mob_loc.loc
 				if(T.malfunction)

code/modules/food/candy_maker.dm

@@ -33,7 +33,11 @@
 	if (!available_recipes)
 		available_recipes = new
 		for (var/type in (typesof(/datum/recipe/candy)-/datum/recipe/candy))
-			available_recipes+= new type
+			var/datum/recipe/recipe = new type
+			if(recipe.result) // Ignore recipe subtypes that lack a result
+				available_recipes += recipe
+			else
+				del(recipe)
 		acceptable_items = new
 		acceptable_reagents = new
 		for (var/datum/recipe/candy/recipe in available_recipes)

code/modules/food/grill_new.dm

@@ -34,7 +34,11 @@
 	if (!available_recipes)
 		available_recipes = new
 		for (var/type in (typesof(/datum/recipe/grill)-/datum/recipe/grill))
-			available_recipes+= new type
+			var/datum/recipe/recipe = new type
+			if(recipe.result) // Ignore recipe subtypes that lack a result
+				available_recipes += recipe
+			else
+				del(recipe)
 		acceptable_items = new
 		acceptable_reagents = new
 		for (var/datum/recipe/grill/recipe in available_recipes)

code/modules/food/oven_new.dm

@@ -34,7 +34,11 @@
 	if (!available_recipes)
 		available_recipes = new
 		for (var/type in (typesof(/datum/recipe/oven)-/datum/recipe/oven))
-			available_recipes+= new type
+			var/datum/recipe/recipe = new type
+			if(recipe.result) // Ignore recipe subtypes that lack a result
+				available_recipes += recipe
+			else
+				del(recipe)
 		acceptable_items = new
 		acceptable_reagents = new
 		for (var/datum/recipe/oven/recipe in available_recipes)

code/modules/hydroponics/grown.dm

@@ -54,9 +54,24 @@
 				rtotal += round(potency/reagent_data[2])
 			reagents.add_reagent(rid,max(1,rtotal))
 	update_desc()
+	update_trash()
 	if(reagents.total_volume > 0)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_trash()
+	if(!seed)
+		return
+	trash = seed.trash_type
+	if(seed.kitchen_tag)
+		if(seed.kitchen_tag == "watermelon")	// 15% chance to leave behind a pack of watermelon seeds
+			if(prob(15))
+				var/obj/item/seeds/seeds = new()
+				seeds.seed = seed
+				seeds.update_seed()
+				trash = seeds
+			else
+				trash = null
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_desc()
 
 	if(!seed)
@@ -186,6 +201,8 @@
 				del(src)
 				return
 		else if(W.sharp)
+			var/reagents_per_slice
+			var/obj/slice
 			if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
 				user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
 				new /obj/item/clothing/head/hardhat/pumpkinhead (user.loc)
@@ -193,23 +210,31 @@
 				return
 			else if(seed.kitchen_tag == "potato")
 				user << "You slice \the [src] into sticks."
-				new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
+				reagents_per_slice = reagents.total_volume
+				slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
+				reagents.trans_to(slice, reagents_per_slice)
 				del(src)
 				return
 			else if(seed.kitchen_tag == "carrot")
 				user << "You slice \the [src] into sticks."
-				new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
+				reagents_per_slice = reagents.total_volume
+				slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
+				reagents.trans_to(slice, reagents_per_slice)
 				del(src)
 				return
 			else if(seed.kitchen_tag == "watermelon")
 				user << "You slice \the [src] into large slices."
+				reagents_per_slice = reagents.total_volume/5
 				for(var/i=0,i<5,i++)
-					new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src))
+					slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src))
+					reagents.trans_to(slice, reagents_per_slice)
 				del(src)
 				return
 			else if(seed.kitchen_tag == "soybeans")
 				user << "You roughly chop up \the [src]."
-				new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
+				reagents_per_slice = reagents.total_volume
+				slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
+				reagents.trans_to(slice, reagents_per_slice)
 				del(src)
 				return
 			else if(seed.chems)

code/modules/hydroponics/seed.dm

@@ -281,7 +281,7 @@
 	if(!light_supplied)
 		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in current_turf
 		if(L)
-			light_supplied = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-5)
+			light_supplied = L.get_clamped_lum()*10
 		else
 			light_supplied =  5
 
@@ -689,7 +689,8 @@
 			else
 				product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
 			if(get_trait(TRAIT_PRODUCT_COLOUR))
-				product.color = get_trait(TRAIT_PRODUCT_COLOUR)
+				if(!has_mob_product || (has_mob_product && has_mob_product != /mob/living/carbon/monkey/diona))
+					product.color = get_trait(TRAIT_PRODUCT_COLOUR)
 				if(istype(product,/obj/item/weapon/reagent_containers/food))
 					var/obj/item/weapon/reagent_containers/food/food = product
 					food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)

code/modules/hydroponics/seed_mobs.dm

@@ -13,7 +13,7 @@
 	spawn(75)
 		if(!host.ckey && !host.client)
 			host.death()  // This seems redundant, but a lot of mobs don't
-			host.stat = 2 // handle death() properly. Better safe than etc.
+			host.stat = DEAD // handle death() properly. Better safe than etc.
 			host.visible_message("<span class='danger'>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.</span>")
 
 			var/total_yield = rand(1,3)

code/modules/hydroponics/spreading/spreading.dm

@@ -1,7 +1,7 @@
 #define DEFAULT_SEED "glowshroom"
 #define VINE_GROWTH_STAGES 5
 
-/proc/spacevine_infestation()
+/proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15)
 	spawn() //to stop the secrets panel hanging
 		var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas
 		for(var/areapath in typesof(/area/hallway))
@@ -14,8 +14,15 @@
 			var/turf/simulated/floor/T = pick(turfs)
 			var/datum/seed/seed = plant_controller.create_random_seed(1)
 			seed.set_trait(TRAIT_SPREAD,2)             // So it will function properly as vines.
-			seed.set_trait(TRAIT_POTENCY,rand(70,100)) // Guarantee a wide spread and powerful effects.
-			new /obj/effect/plant(T,seed)
+			seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects.
+			seed.set_trait(TRAIT_MATURATION,rand(maturation_min, maturation_max))
+
+			//make vine zero start off fully matured
+			var/obj/effect/plant/vine = new(T,seed)
+			vine.health = vine.max_health
+			vine.mature_time = 0
+			vine.process()
+
 			message_admins("<span class='notice'>Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])</span>")
 
 /obj/effect/dead_plant
@@ -56,6 +63,7 @@
 	var/spread_chance = 40
 	var/spread_distance = 3
 	var/evolve_chance = 2
+	var/mature_time
 	var/last_tick = 0
 	var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/plant
 
@@ -114,7 +122,8 @@
 	if(max_growth > 2 && prob(50))
 		max_growth-- //Ensure some variation in final sprite, makes the carpet of crap look less wonky.
 
-	spread_chance = seed.get_trait(TRAIT_POTENCY) * 4
+	mature_time = world.time + seed.get_trait(TRAIT_MATURATION) + 15 //prevent vines from maturing until at least a few seconds after they've been created.
+	spread_chance = seed.get_trait(TRAIT_POTENCY) * 3
 	spread_distance = ((growth_type>0) ? round(spread_chance*0.6) : round(spread_chance*0.3))
 	update_icon()
 
@@ -180,7 +189,8 @@
 
 	if(growth>2 && growth == max_growth)
 		layer = 5
-		opacity = 1
+		if(seed.get_trait(TRAIT_SPREAD) == 2)
+			opacity = 1
 		if(!isnull(seed.chems["woodpulp"]))
 			density = 1
 	else
@@ -257,4 +267,4 @@
 		die_off()
 
 /obj/effect/plant/proc/is_mature()
-	return (health >= (max_health/3))
+	return (health >= (max_health/3) && world.time > mature_time)

code/modules/hydroponics/spreading/spreading_growth.dm

@@ -72,7 +72,10 @@
 		update_neighbors()
 
 	if(is_mature() && neighbors.len && prob(spread_chance))
-		for(var/i=1,i<=seed.get_trait(TRAIT_YIELD),i++)
+		//spread to 1-3 adjacent turfs depending on yield trait.
+		var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3)
+
+		for(var/i in 1 to max_spread)
 			if(prob(spread_chance))
 				sleep(rand(3,5))
 				if(!neighbors.len)

code/modules/hydroponics/spreading/spreading_response.dm

@@ -7,8 +7,11 @@
 	if(!istype(M))
 		return
 
-	if(!buckled_mob && !M.buckled && !M.anchored && (M.small || prob(round(seed.get_trait(TRAIT_POTENCY)/2))))
-		entangle(M)
+	if(!buckled_mob && !M.buckled && !M.anchored && (M.small || prob(round(seed.get_trait(TRAIT_POTENCY)/6))))
+		//wait a tick for the Entered() proc that called HasProximity() to finish (and thus the moving animation),
+		//so we don't appear to teleport from two tiles away when moving into a turf adjacent to vines.
+		spawn(1)
+			entangle(M)
 
 /obj/effect/plant/attack_hand(mob/user as mob)
 	// Todo, cause damage.
@@ -60,13 +63,11 @@
 	if(buckled_mob)
 		return
 
-	if(!Adjacent(victim))
+	if(victim.buckled)
 		return
 
-	victim.buckled = src
-	victim.update_canmove()
-	buckled_mob = victim
-	if(!victim.anchored && !victim.buckled && victim.loc != get_turf(src))
+	//grabbing people
+	if(!victim.anchored && Adjacent(victim) && victim.loc != get_turf(src))
 		var/can_grab = 1
 		if(istype(victim, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = victim
@@ -75,4 +76,10 @@
 		if(can_grab)
 			src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
 			victim.loc = src.loc
-	victim << "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>"
+
+	//entangling people
+	if(victim.loc == src.loc)
+		victim.buckled = src
+		victim.update_canmove()
+		buckled_mob = victim
+		victim << "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>"

code/modules/hydroponics/trays/tray.dm

@@ -810,7 +810,7 @@
 			var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
 			var/light_available
 			if(L)
-				light_available = max(0,min(10,L.lum_r + L.lum_g + L.lum_b)-5)
+				light_available = L.get_clamped_lum()*10
 			else
 				light_available =  5
 			light_string = "a light level of [light_available] lumens"
@@ -830,3 +830,21 @@
 	closed_system = !closed_system
 	user << "You [closed_system ? "close" : "open"] the tray's lid."
 	update_icon()
+
+/obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb()
+	set name = "Eject Internal Tank"
+	set category = "Object"
+	set src in view(1)
+	eject_tank(usr)
+
+/obj/machinery/portable_atmospherics/hydroponics/proc/eject_tank(var/mob/living/user)
+	if(!user || user.stat || user.restrained())
+		return
+
+	if(!holding)
+		usr << "\red There is no tank loaded into [src] to eject."
+
+	if(istype(holding, /obj/item/weapon/tank))
+		usr << "\blue You eject [holding.name] from [src]."
+		holding.loc = loc
+		holding = null

code/modules/hydroponics/trays/tray_soil.dm

@@ -9,6 +9,8 @@
 /obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(istype(O,/obj/item/weapon/tank))
 		return
+	else if(istype(O,/obj/item/weapon/crowbar))
+		return
 	else
 		..()
 
@@ -17,6 +19,7 @@
 	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb
 	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/remove_label
 	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/setlight
+	verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb
 
 /obj/machinery/portable_atmospherics/hydroponics/soil/CanPass()
 	return 1

code/modules/hydroponics/trays/tray_tools.dm

@@ -301,6 +301,7 @@
 	throw_speed = 2
 	throw_range = 3
 	w_class = 4.0
+	var/extend = 1
 	flags = NOSHIELD
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
@@ -309,12 +310,71 @@
 
 /obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return
-	if(istype(A, /obj/effect/plant))
+	if(istype(A, /obj/effect/plant) && extend == 1)
 		for(var/obj/effect/plant/B in orange(A,1))
 			if(prob(80))
 				B.die_off(1)
 			qdel(A)
 
+/obj/item/weapon/scythe/tele
+	icon_state = "tscythe0"
+	name = "telescopic scythe"
+	desc = "A sharp and curved blade on a collapsable fibremetal handle, this tool is the pinnacle of covert reaping technology."
+	force = 3.0
+	sharp = 0
+	edge = 0
+	throw_speed = 2
+	throw_range = 3
+	w_class = 2.0
+	extend = 0
+	flags = NOSHIELD
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=3;combat=3"
+	attack_verb = list("chopped", "sliced", "cut", "reaped")
+	hitsound = "swing_hit"
+
+/obj/item/weapon/scythe/tele/attack_self(mob/user as mob)
+	extend = !extend
+	if(extend)
+		user << "<span class ='warning'>With a flick of the wrist, you extend the scythe. It's reaping time!</span>"
+		icon_state = "tscythe1"
+		item_state = "scythe0"
+		slot_flags &= ~SLOT_BELT
+		w_class = 4 //doesnt fit in backpack when its on for balance
+		force = 13 //normal scythe damage
+		attack_verb = list("chopped", "sliced", "cut", "reaped")
+		hitsound = 'sound/weapons/bladeslice.ogg'
+		//Extend sound (blade unsheath)
+		playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1)	//Sound credit to Qat of Freesound.org
+	else
+		user << "<span class ='notice'>You collapse the scythe, folding it for easy storage.</span>"
+		icon_state = "tscythe0"
+		item_state = "tscythe0" //no sprite in other words
+		slot_flags |= SLOT_BELT
+		w_class = 2
+		force = 3 //not so robust now
+		attack_verb = list("hit", "poked")
+		hitsound = "swing_hit"
+		//Collapse sound (blade sheath)
+		playsound(src.loc, 'sound/weapons/blade_sheath.ogg', 50, 1)		//Sound credit to Q.K. of Freesound.org
+	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)
+	if (!blood_DNA) return
+	if(blood_overlay && (blood_DNA.len >= 1)) //updates blood overlay, if any
+		overlays.Cut()//this might delete other item overlays as well but eeeeeeeh
+
+		var/icon/I = new /icon(src.icon, src.icon_state)
+		I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD)
+		I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"),ICON_MULTIPLY)
+		blood_overlay = I
+
+		overlays += blood_overlay
+
+	return
+
 /obj/item/weapon/rsp
 	name = "\improper Rapid-Seed-Producer (RSP)"
 	desc = "A device used to rapidly deploy seeds."

code/modules/lighting/light_source.dm

@@ -50,8 +50,8 @@
 /datum/light_source/proc/destroy()
 	destroyed = 1
 	force_update()
-	if(source_atom) source_atom.light_sources -= src
-	if(top_atom) top_atom.light_sources -= src
+	if(source_atom && source_atom.light_sources) source_atom.light_sources -= src
+	if(top_atom && top_atom.light_sources) top_atom.light_sources -= src
 
 /datum/light_source/proc/update(atom/new_top_atom)
 	if(new_top_atom && new_top_atom != top_atom)
@@ -69,7 +69,7 @@
 	lighting_update_lights += src
 
 /datum/light_source/proc/check()
-	if(!source_atom)
+	if(!source_atom || !light_range || !light_power)
 		destroy()
 		return 1
 

code/modules/lighting/lighting_overlay.dm

@@ -3,7 +3,7 @@
 	mouse_opacity = 0
 	simulated = 0
 	anchored = 1
-
+	flags = NOREACT
 	icon = LIGHTING_ICON
 	layer = LIGHTING_LAYER
 	invisibility = INVISIBILITY_LIGHTING
@@ -25,6 +25,15 @@
 	. = ..()
 	verbs.Cut()
 
+/atom/movable/lighting_overlay/proc/get_clamped_lum(var/minlum = 0, var/maxlum = 1)
+	var/lum = max(lum_r, lum_g, lum_b)
+	if(lum <= minlum)
+		return 0
+	else if(lum >= maxlum)
+		return 1
+	else
+		return (lum - minlum) / (maxlum - minlum)
+
 /atom/movable/lighting_overlay/proc/update_lumcount(delta_r, delta_g, delta_b)
 	lum_r += delta_r
 	lum_g += delta_g

code/modules/lighting/lighting_process.dm

@@ -1,3 +1,4 @@
+
 /datum/controller/process/lighting/setup()
 	name = "lighting"
 	schedule_interval = LIGHTING_INTERVAL
@@ -7,17 +8,21 @@
 /datum/controller/process/lighting/doWork()
 	for(var/datum/light_source/L in lighting_update_lights)
 		if(L.needs_update)
-			if(L.destroyed)
+			if(L.destroyed || L.check() || L.force_update)
 				L.remove_lum()
-			else if(L.check() || L.force_update)
-				L.remove_lum()
-				L.apply_lum()
+				if(!L.destroyed) L.apply_lum()
 				L.force_update = 0
 			L.needs_update = 0
+
+		scheck()
+
 	lighting_update_lights.Cut()
 
 	for(var/atom/movable/lighting_overlay/O in lighting_update_overlays)
 		if(O.needs_update)
 			O.update_overlay()
 			O.needs_update = 0
+
+		scheck()
+
 	lighting_update_overlays.Cut()

code/modules/mining/equipment_locker.dm

@@ -422,7 +422,7 @@
 			playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
 			if(creator)
 				for(var/mob/living/L in src.loc)
-					add_logs(creator, L, "used a resonator field on", object="resonator")
+					add_logs(L, creator, "used a resonator field on", object="resonator")
 					L << "<span class='danger'>The [src.name] ruptured with you in it!</span>"
 					L.adjustBruteLoss(resonance_damage)
 			else

code/modules/mining/ore.dm

@@ -84,7 +84,7 @@
 /obj/item/weapon/ore/New()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
-	if(src.z == ASTEROID_Z) score_oremined++ //When ore spawns, increment score.  Only include ore spawned on mining asteroid (No Clown Planet)
+	if(src.z == ZLEVEL_ASTEROID) score_oremined++ //When ore spawns, increment score.  Only include ore spawned on mining asteroid (No Clown Planet)
 
 /obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W,/obj/item/device/core_sampler))

code/modules/mining/surprises/tg.dm

@@ -82,7 +82,7 @@
 		/obj/item/weapon/storage/belt/soulstone=1,
 		/obj/item/trash/candle=3,
 		/obj/item/weapon/dice=3,
-		/obj/item/weapon/staff=2,
+		/obj/item/weapon/twohanded/staff=2,
 		/obj/effect/decal/cleanable/dirt=3,
 	)
 

code/modules/mob/dead/observer/observer.dm

@@ -229,6 +229,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(A)
 		A.Entered(src)
 
+/mob/dead/observer/experience_pressure_difference()
+	return 0
+
 /mob/dead/observer/examine()
 	if(usr)
 		usr << desc

code/modules/mob/language.dm

@@ -326,6 +326,26 @@
 	key = "0"
 	syllables = list ("honk","squeak","bonk","toot","narf","zub","wee","wub","norf")
 
+/datum/language/wryn
+	name = "Wryn Hivemind"
+	desc = "Wryn have the strange ability to commune over a psychic hivemind."
+	speech_verb = "chitters"
+	ask_verb = "chitters"
+	exclaim_verb = "chitters"
+	colour = "alien"
+	key = "y"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/wryn/check_special_condition(var/mob/other)
+
+	var/mob/living/carbon/M = other
+	if(!istype(M))
+		return 1
+	if(locate(/obj/item/organ/wryn/hivenode) in M.internal_organs)
+		return 1
+
+	return 0
+
 /datum/language/xenocommon
 	name = "Xenomorph"
 	colour = "alien"

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -151,7 +151,7 @@
 				"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
 		adjustBruteLoss(damage)
-		add_logs(M, src, "attacked", admin=0)
+		add_logs(src, M, "attacked", admin=0)
 		updatehealth()
 
 

code/modules/mob/living/carbon/brain/MMI.dm

@@ -22,6 +22,9 @@
 	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+		if(istype(O, /obj/item/organ/brain/crystal ))
+			user << "<span class='warning'> This brain is too malformed to be able to use with the [src].</span>"
+			return
 		if(istype(O,/obj/item/organ/brain) && !brainmob) //Time to stick a brain in it --NEO
 			if(!O:brainmob)
 				user << "\red You aren't sure where this brain came from, but you're pretty sure it's a useless brain."

code/modules/mob/living/carbon/carbon.dm

@@ -275,14 +275,16 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	if(!Adjacent(clicked_on))
 		return
 
-	var/IsVentcrawler = 1
+	var/ventcrawlerlocal = 0
+	if(ventcrawler)
+		ventcrawlerlocal = ventcrawler
+
 	if(!ventcrawler)
-		IsVentcrawler = 0
 		if(ishuman(src))
 			var/mob/living/carbon/human/H = src
-			if(!H.species.ventcrawler)	IsVentcrawler = 1
+			if(!H.species.ventcrawler)	ventcrawlerlocal = H.species.ventcrawler
 
-	if(!IsVentcrawler)	return
+	if(!ventcrawlerlocal)	return
 
 	if(stat)
 		src << "You must be conscious to do this!"
@@ -322,11 +324,13 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 			if(!client)
 				return
 
-			if(iscarbon(src) && contents.len && ventcrawler < 2)//It must have atleast been 1 to get this far
+			if(iscarbon(src) && contents.len && ventcrawlerlocal < 2)//It must have atleast been 1 to get this far
 				for(var/obj/item/I in contents)
 					var/failed = 0
 					if(istype(I, /obj/item/weapon/implant))
 						continue
+					if(istype(I, /obj/item/organ))
+						continue
 					else
 						failed++
 

code/modules/mob/living/carbon/human/human.dm

@@ -110,6 +110,14 @@
 	h_style = "Bald"
 	..(new_loc, "Golem")
 
+/mob/living/carbon/human/wryn/New(var/new_loc)
+	h_style = "Antennae"
+	..(new_loc, "Wryn")
+
+/mob/living/carbon/human/nucleation/New(var/new_loc)
+	h_style = "Nucleation Crystals"
+	..(new_loc, "Nucleation")
+
 /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
 	if ((!( yes ) || now_pushing))
 		return
@@ -244,12 +252,15 @@
 
 				var/limbs_affected = pick(2,3,4)
 				var/obj/item/organ/external/processing_dismember
+				var/list/valid_limbs = organs.Copy()
 
-				while(limbs_affected != 0)
-					processing_dismember = pick(organs)
+				while(limbs_affected != 0 && valid_limbs.len > 0)
+					processing_dismember = pick(valid_limbs)
 					if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin")
 						processing_dismember.droplimb(1,pick(0,1,2),0,1)
+						valid_limbs -= processing_dismember
 						limbs_affected -= 1
+					else valid_limbs -= processing_dismember
 
 
 			//return
@@ -262,28 +273,25 @@
 
 			f_loss += 60
 
+			var/limbs_affected = 0
+			var/obj/item/organ/external/processing_dismember
+			var/list/valid_limbs = organs.Copy()
+
 			if (prob(getarmor(null, "bomb")))
 				b_loss = b_loss/1.5
 				f_loss = f_loss/1.5
 
-				var/limbs_affected = pick(1, 1, 2)
-				var/obj/item/organ/external/processing_dismember
-
-				while(limbs_affected != 0)
-					processing_dismember = pick(organs)
-					if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin")
-						processing_dismember.droplimb(1,pick(0,2),0,1)
-						limbs_affected -= 1
-
+				limbs_affected = pick(1, 1, 2)
 			else
-				var/limbs_affected = pick(1, 2, 3)
-				var/obj/item/organ/external/processing_dismember
+				limbs_affected = pick(1, 2, 3)
 
-				while(limbs_affected != 0)
-					processing_dismember = pick(organs)
-					if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin")
-						processing_dismember.droplimb(1,pick(0,2),0,1)
-						limbs_affected -= 1
+			while(limbs_affected != 0 && valid_limbs.len > 0)
+				processing_dismember = pick(valid_limbs)
+				if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin")
+					processing_dismember.droplimb(1,pick(0,2),0,1)
+					valid_limbs -= processing_dismember
+					limbs_affected -= 1
+				else valid_limbs -= processing_dismember
 
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 30
@@ -300,12 +308,15 @@
 
 				var/limbs_affected = pick(0, 1)
 				var/obj/item/organ/external/processing_dismember
+				var/list/valid_limbs = organs.Copy()
 
-				while(limbs_affected != 0)
-					processing_dismember = pick(organs)
+				while(limbs_affected != 0 && valid_limbs.len > 0)
+					processing_dismember = pick(valid_limbs)
 					if(processing_dismember.limb_name != "chest" && processing_dismember.limb_name != "head" && processing_dismember.limb_name != "groin")
 						processing_dismember.droplimb(1,1,0,1)
+						valid_limbs -= processing_dismember
 						limbs_affected -= 1
+					else valid_limbs -= processing_dismember
 
 			if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
 				ear_damage += 15
@@ -656,13 +667,16 @@
 /mob/living/carbon/human/Topic(href, href_list)
 	var/pickpocket = 0
 
+	if(ishuman(usr))
+		var/mob/living/carbon/human/H = usr
+		var/obj/item/clothing/gloves/G = H.gloves
+		if(G)
+			pickpocket = G.pickpocket
+
 	if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr))
 
 		// if looting pockets with gloves, do it quietly
 		if(href_list["pockets"])
-			if(usr:gloves)
-				var/obj/item/clothing/gloves/G = usr:gloves
-				pickpocket = G.pickpocket
 			var/pocket_side = href_list["pockets"]
 			var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store)
 			var/obj/item/pocket_item = (pocket_id == slot_r_store ? src.r_store : src.l_store)
@@ -701,9 +715,6 @@
 		if(href_list["item"])
 			var/itemTarget = href_list["item"]
 			if(itemTarget == "id")
-				if(usr:gloves)
-					var/obj/item/clothing/gloves/G = usr:gloves
-					pickpocket = G.pickpocket
 				if(pickpocket)
 					var/obj/item/worn_id = src.wear_id
 					var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty
@@ -748,9 +759,6 @@
 
 	if ((href_list["item"] && !( usr.stat ) && usr.canmove && !( usr.restrained() ) && in_range(src, usr) && ticker)) //if game hasn't started, can't make an equip_e
 		var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
-		if(ishuman(usr) && usr:gloves)
-			var/obj/item/clothing/gloves/G = usr:gloves
-			pickpocket = G.pickpocket
 		if(!pickpocket || href_list["item"] != "id")  // Stop the non-stealthy verbose strip if pickpocketing id.
 			O.source = usr
 			O.target = src

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -55,6 +55,8 @@
 
 	var/datum/martial_art/attacker_style = M.martial_art
 
+	species.handle_attack_hand(src,M)
+
 	switch(M.a_intent)
 		if("help")
 			if(health >= config.health_threshold_crit)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -492,10 +492,8 @@ emp_act
 
 /mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction)
 	if(shoes)
-		if(istype(shoes,/obj/item/clothing/shoes/magboots)) //TODO: Make a not-shit shoe var system to negate airflow.
-			var/obj/item/clothing/shoes/magboots/MB = shoes
-			if(MB.magpulse)
-				return 0
+		if(istype(shoes,/obj/item/clothing/shoes/magboots) && (shoes.flags & NOSLIP)) //TODO: Make a not-shit shoe var system to negate airflow.
+			return 0
 	..()
 
 /mob/living/carbon/human/water_act(volume, temperature, source)

code/modules/mob/living/carbon/human/human_movement.dm

@@ -10,6 +10,8 @@
 
 	if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
 
+	if(flying) return -1
+
 	if(embedded_flag)
 		handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
 
@@ -77,6 +79,11 @@
 	//Can we act
 	if(restrained())	return 0
 
+	//Are we flying?
+	if(flying)
+		inertia_dir = 0
+		return 1
+
 	//Do we have a working jetpack
 	if(istype(back, /obj/item/weapon/tank/jetpack))
 		var/obj/item/weapon/tank/jetpack/J = back

code/modules/mob/living/carbon/human/life.dm

@@ -264,6 +264,16 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				gene.OnMobLife(src)
 
 		if (radiation)
+
+			if((locate(src.internal_organs_by_name["resonant crystal"]) in src.internal_organs))
+				var/rads = radiation/25
+				radiation -= rads
+				radiation -= 0.1
+				reagents.add_reagent("radium", rads/10)
+				if( prob(10) )
+					src << "\blue You feel relaxed."
+				return
+
 			if (radiation > 100)
 				radiation = 100
 				if(!(species.flags & RAD_ABSORB))
@@ -276,7 +286,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				radiation = 0
 
 			else
-
 				if(species.flags & RAD_ABSORB)
 					var/rads = radiation/25
 					radiation -= rads
@@ -746,7 +755,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				var/turf/T = loc
 				var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
 				if(L)
-					light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+					light_amount = (L.get_clamped_lum()*10) - 5 //hardcapped so it's not abused by having a ton of flashlights
 				else
 					light_amount =  5
 			nutrition += light_amount
@@ -768,7 +777,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				var/turf/T = loc
 				var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
 				if(L)
-					light_amount = L.lum_r + L.lum_g + L.lum_b //hardcapped so it's not abused by having a ton of flashlights
+					light_amount = L.get_clamped_lum()*10
 				else
 					light_amount =  10
 			if(light_amount > species.light_dam) //if there's enough light, start dying
@@ -1034,6 +1043,14 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(jitteriness)
 				do_jitter_animation(jitteriness)
 
+			//Flying
+			if(flying)
+				spawn()
+					animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING)
+				spawn(10)
+					if(flying)
+						animate(src, pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING)
+
 			//Other
 			handle_statuses()
 

code/modules/mob/living/carbon/human/species/apollo.dm

@@ -0,0 +1,110 @@
+/datum/species/wryn
+	name = "Wryn"
+	icobase = 'icons/mob/human_races/r_wryn.dmi'
+	deform = 'icons/mob/human_races/r_wryn.dmi'
+	language = "Wryn Hivemind"
+	tail = "wryntail"
+	unarmed_type = /datum/unarmed_attack/punch/weak
+	primitive = /mob/living/carbon/monkey/wryn
+	darksight = 3
+	slowdown = 1
+	warning_low_pressure = -300
+	hazard_low_pressure = 1
+	blurb = "The wryn (r-in, singular r-in) are a humanoid race that possess many bee-like features. Originating from Alveare they \
+	have adapted extremely well to cold environments though have lost most of their muscles over generations.\
+	In order to communicate and work with multi-species crew Wryn were forced to take on names. Wryn have tended towards using only \
+	first names, these names are generally simplistic and easy to pronounce. Wryn have rarely had to communicate using their mouths, \
+	so in order to integrate with the multi-species crew they have been taught broken sol?."
+
+	cold_level_1 = 200 //Default 260 - Lower is better
+	cold_level_2 = 150 //Default 200
+	cold_level_3 = 115 //Default 120
+
+	heat_level_1 = 300 //Default 360 - Higher is better
+	heat_level_2 = 310 //Default 400
+	heat_level_3 = 317 //Default 1000
+
+	body_temperature = 286
+
+	has_organ = list(
+		"heart" =    /obj/item/organ/heart,
+		"brain" =    /obj/item/organ/brain,
+		"eyes" =     /obj/item/organ/eyes,
+		"appendix" = /obj/item/organ/appendix,
+		"antennae" =    /obj/item/organ/wryn/hivenode
+		)
+
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | NO_BREATHE | HAS_SKIN_COLOR | NO_SCAN | NO_SCAN | HIVEMIND
+
+
+	base_color = "#704300"
+	flesh_color = "#704300"
+	blood_color = "#FFFF99"
+
+
+/datum/species/wryn/handle_death(var/mob/living/carbon/human/H)
+	for(var/mob/living/carbon/C in living_mob_list)
+		if(locate(/obj/item/organ/wryn/hivenode) in C.internal_organs)
+			C << "<span class='danger'><B>Your antennae tingle as you are overcome with pain...</B></span>"
+			C << "<span class='danger'>It feels like part of you has died.</span>"
+
+/datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M)
+	if(M.a_intent == "harm")
+		if(H.handcuffed)
+			if(!(locate(H.internal_organs_by_name["antennae"]) in H.internal_organs))	return
+			var/turf/p_loc = M.loc
+			var/turf/p_loc_m = H.loc
+
+			M.visible_message("<span class='notice'>[M] begins to violently pull off [H]'s antennae.</span>")
+			H << "<span class='danger'><B>[M] grips your antennae and starts violently pulling!<B></span>"
+			do_after(H, 250)
+			if(p_loc == M.loc && p_loc_m == H.loc)
+				del(H.internal_organs_by_name["antennae"])
+				H.remove_language("Wryn Hivemind")
+				new /obj/item/organ/wryn/hivenode(M.loc)
+				M << "<span class='notice'>You hear a loud crunch as you mercilessly pull off [H]'s antennae.</span>"
+				H << "<span class='danger'><B>You hear a loud crunch as your antennae is ripped off your head by [M].</span></B>"
+				H << "<span class='danger'><span class='danger'><B>It's so quiet...</B></span>"
+				H.h_style = "Bald"
+				H.update_hair()
+
+				M.attack_log += text("\[[time_stamp()]\] <font color='red'>removed antennae [H.name] ([H.ckey])</font>")
+				H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their antennae removed by [M.name] ([M.ckey])</font>")
+				msg_admin_attack("[key_name(M)] removed [key_name(H)]'s antennae")
+			return 0
+
+/datum/species/nucleation
+	name = "Nucleation"
+	icobase = 'icons/mob/human_races/r_nucleation.dmi'
+	unarmed_type = /datum/unarmed_attack/punch
+	blurb = "A sub-race of unforunates who have been exposed to too much supermatter radiation. As a result, \
+	supermatter crystal clusters have begun to grow across their bodies. Research to find a cure for this ailment \
+	has been slow, and so this is a common fate for veteran engineers. The supermatter crystals produce oxygen, \
+	negating the need for the individual to breath. Their massive change in biology, however, renders most medicines \
+	obselete. Ionizing radiation seems to cause resonance in some of their crystals, which seems to encourage regeneration \
+	and produces a calming effect on the individual. Nucleations are highly stigmatized, and are treated much in the same \
+	way as lepers were back on Earth."
+	language = "Sol Common"
+	burn_mod = 4 // holy shite, poor guys wont survive half a second cooking smores
+	brute_mod = 2 // damn, double wham, double dam
+	flags = IS_WHITELISTED | NO_BREATHE | NO_BLOOD | NO_PAIN | HAS_LIPS | NO_SCAN
+
+	has_organ = list(
+		"heart" =    /obj/item/organ/heart,
+		"crystalized brain" =    /obj/item/organ/brain/crystal,
+		"eyes" =     /obj/item/organ/eyes/luminescent_crystal,
+		"strange crystal" = /obj/item/organ/nucleation/strange_crystal,
+		"resonant crystal" = /obj/item/organ/nucleation/resonant_crystal
+		)
+
+/datum/species/nucleation/handle_post_spawn(var/mob/living/carbon/human/H)
+	H.light_color = "#1C1C00"
+	H.set_light(2)
+	return ..()
+
+/datum/species/nucleation/handle_death(var/mob/living/carbon/human/H)
+	var/turf/T = get_turf(H)
+	H.visible_message("\red[H]'s body explodes, leaving behind a pile of microscopic crystals!")
+	supermatter_delamination(T, 2, 0, 0) // Create a small supermatter burst upon death
+	new /obj/item/weapon/shard/supermatter( T )
+	del(H)

code/modules/mob/living/carbon/metroid/say.dm

@@ -28,7 +28,7 @@
 		speech_buffer.Add(lowertext(html_decode(message)))
 	..()
 
-/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
+/mob/living/carbon/slime/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="", var/atom/follow_target)
 	if (speaker in Friends)
 		speech_buffer = list()
 		speech_buffer.Add(speaker)

code/modules/mob/living/carbon/monkey/life.dm

@@ -442,7 +442,7 @@
 				var/turf/T = loc
 				var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
 				if(L)
-					light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+					light_amount = (L.get_clamped_lum()*10) - 5 //hardcapped so it's not abused by having a ton of flashlights
 				else
 					light_amount =  5
 
@@ -672,4 +672,4 @@
 	proc/handle_wetness()
 		if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
 			wetlevel = max(wetlevel - 1,0)
-		return
+		return

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -38,6 +38,13 @@
 	icon_state = "stokkey1"
 	uni_append = list(0x044,0xC5D) // 044C5D
 
+/mob/living/carbon/monkey/wryn
+	name = "lajavi"
+	voice_name = "lajavi"
+	speak_emote = list("hisses")
+	icon_state = "wrynkey1"
+	uni_append = list(0x022,0xF5D) // 022F5D
+
 /mob/living/carbon/monkey/New()
 	var/datum/reagents/R = new/datum/reagents(330)
 	reagents = R

code/modules/mob/living/carbon/species.dm

@@ -301,6 +301,8 @@
 /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
 	return
 
+/datum/species/proc/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M) //Handles any species-specific attackhand events.
+	return
 
 /datum/species/proc/say_filter(mob/M, message, datum/language/speaking)
 	return message
@@ -726,10 +728,10 @@
 		if (organ_name == "head")			// do the head last as that's when the user will be transfered to the posibrain
 			continue
 		var/obj/item/organ/external/O = H.organs_by_name[organ_name]
-		if((O.body_part != UPPER_TORSO) && (O.body_part != LOWER_TORSO))  // We're making them fall apart, not gibbing them!
+		if(O && (O.body_part != UPPER_TORSO) && (O.body_part != LOWER_TORSO))  // We're making them fall apart, not gibbing them!
 			O.droplimb(1)
 	var/obj/item/organ/external/O = H.organs_by_name["head"]
-	O.droplimb(1)
+	if(O) O.droplimb(1)
 
 
 //Species unarmed attacks
@@ -745,6 +747,10 @@
 /datum/unarmed_attack/punch
 	attack_verb = list("punch")
 
+/datum/unarmed_attack/punch/weak
+	attack_verb = list("flail")
+	damage = 1
+
 /datum/unarmed_attack/diona
 	attack_verb = list("lash", "bludgeon")
 

code/modules/mob/living/living.dm

@@ -529,8 +529,8 @@
 		for(var/atom/A in M.contents)
 			if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
 				return
+		M.status_flags &= ~PASSEMOTES
 
-	M.status_flags &= ~PASSEMOTES
 	return
 
 /* resist_borer allows a mob to regain control of their body after a borer has assumed control.

code/modules/mob/living/living_defense.dm

@@ -362,7 +362,7 @@
 			user << "<span class='notice'>You already grabbed [src].</span>"
 			return
 
-	add_logs(user, src, "grabbed", addition="passively")
+	add_logs(src, user, "grabbed", addition="passively")
 
 	var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
 	if(buckled)

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -77,6 +77,9 @@
 			return
 		return ai.eyeobj.loc
 
+/mob/aiEye/experience_pressure_difference()
+	return 0
+
 // AI MOVEMENT
 
 // The AI's "eye". Described on the top of the page.

code/modules/mob/living/silicon/ai/nano.dm

@@ -1,4 +1,5 @@
-var/obj/nano_module/crew_monitor/crew_monitor
+/mob/living/silicon/ai
+  var/obj/nano_module/crew_monitor/crew_monitor
 
 /mob/living/silicon/ai/proc/init_subsystems()
 	crew_monitor = new(src)

code/modules/mob/living/silicon/pai/pai.dm

@@ -457,8 +457,9 @@
 	if(istype(T)) T.visible_message("<b>[src]</b> neatly folds inwards, compacting down to a rectangular card.")
 
 	src.stop_pulling()
-	src.client.perspective = EYE_PERSPECTIVE
-	src.client.eye = card
+	if(src.client)
+		src.client.perspective = EYE_PERSPECTIVE
+		src.client.eye = card
 
 	//This seems redundant but not including the forced loc setting messes the behavior up.
 	src.loc = card

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -23,11 +23,9 @@
 	health = 40
 	melee_damage_lower = 1
 	melee_damage_upper = 5
-	var/datum/reagents/udder = null
+	var/milk_content = 0
 
 /mob/living/simple_animal/hostile/retaliate/goat/New()
-	udder = new(50)
-	udder.my_atom = src
 	..()
 
 /mob/living/simple_animal/hostile/retaliate/goat/Life()
@@ -42,9 +40,8 @@
 			LoseTarget()
 			src.visible_message("\blue [src] calms down.")
 
-		if(stat == CONSCIOUS)
-			if(udder && prob(5))
-				udder.add_reagent("milk", rand(5, 10))
+		if(stat == CONSCIOUS && prob(5))
+			milk_content = min(50, milk_content+rand(5, 10))
 
 		if(locate(/obj/effect/plant) in loc)
 			var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
@@ -75,12 +72,15 @@
 /mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
 		user.changeNext_move(CLICK_CD_MELEE)
-		user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
 		var/obj/item/weapon/reagent_containers/glass/G = O
-		var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
-		if(G.reagents.total_volume >= G.volume)
-			user << "\red The [O] is full."
-		if(!transfered)
+		var/transfered = min(milk_content, rand(5,10), (G.volume - G.reagents.total_volume))
+		if(transfered > 0)
+			user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
+			G.reagents.add_reagent("milk", transfered)
+			milk_content -= transfered
+		else if(G.reagents.total_volume >= G.volume)
+			user << "\red \The [O] is full."
+		else
 			user << "\red The udder is dry. Wait a bit longer..."
 	else
 		..()
@@ -106,30 +106,31 @@
 	response_harm   = "kicks the"
 	attacktext = "kicks"
 	health = 50
-	var/datum/reagents/udder = null
+	var/milk_content = 0
 
 /mob/living/simple_animal/cow/New()
-	udder = new(50)
-	udder.my_atom = src
 	..()
 
 /mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params, params)
 	if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
-		user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
+		user.changeNext_move(CLICK_CD_MELEE)
 		var/obj/item/weapon/reagent_containers/glass/G = O
-		var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
-		if(G.reagents.total_volume >= G.volume)
-			user << "\red The [O] is full."
-		if(!transfered)
+		var/transfered = min(milk_content, rand(5,10), (G.volume - G.reagents.total_volume))
+		if(transfered > 0)
+			user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
+			G.reagents.add_reagent("milk", transfered)
+			milk_content -= transfered
+		else if(G.reagents.total_volume >= G.volume)
+			user << "\red \The [O] is full."
+		else
 			user << "\red The udder is dry. Wait a bit longer..."
 	else
 		..()
 
 /mob/living/simple_animal/cow/Life()
 	. = ..()
-	if(stat == CONSCIOUS)
-		if(udder && prob(5))
-			udder.add_reagent("milk", rand(5, 10))
+	if(stat == CONSCIOUS && prob(5))
+		milk_content = min(50, milk_content+rand(5, 10))
 
 /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob)
 	if(!stat && M.a_intent == "disarm" && icon_state != icon_dead)

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -116,19 +116,19 @@
 	var/DLlight_amount
 	var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
 	if(L)
-		light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+		light_amount = L.lum_r + L.lum_g + L.lum_b
 	else
 		light_amount =  5
 	var/atom/movable/lighting_overlay/DL = locate(/atom/movable/lighting_overlay) in destination
 	if(DL)
-		DLlight_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+		DLlight_amount = DL.lum_r + DL.lum_g + DL.lum_b
 	else
 		DLlight_amount =  5
 	if(T && destination)
 		// Don't check it twice if our destination is the tile we are on or we can't even get to our destination
 		if(T == destination)
 			destination = null
-		else if(light_amount <= 1 && DLlight_amount <= 1) // No one can see us in the darkness, right?
+		else if(light_amount < 0.1 && DLlight_amount < 0.1) // No one can see us in the darkness, right?
 			return null
 
 	// We aren't in darkness, loop for viewers.

code/modules/mob/living/simple_animal/parrot.dm

@@ -723,10 +723,10 @@
 
 
 
-/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0)
+/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/atom/follow_target)
 	if(prob(50))
 		parrot_hear("[pick(available_channels)] [message]")
-	..(message,verb,language,part_a,part_b,speaker,hard_to_hear)
+	..()
 
 
 /mob/living/simple_animal/parrot/proc/parrot_hear(var/message="")

code/modules/mob/mob_defines.dm

@@ -102,6 +102,7 @@
 	var/drowsyness = 0.0//Carbon
 	var/dizziness = 0//Carbon
 	var/jitteriness = 0//Carbon
+	var/flying = 0
 	var/charges = 0.0
 	var/nutrition = 400.0//Carbon
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -689,6 +689,51 @@
 		icon_state = "vox_keetquills"
 		species_allowed = list("Vox")
 
+// Apollo-specific
+
+	//Wryn antennae
+
+	wry_antennae_default
+		name = "Antennae"
+		icon_state = "wryn_antennae"
+		species_allowed = list("Wryn")
+
+	//Nucleation "hairstyles"
+
+	nuc_crystals
+		name = "Nucleation Crystals"
+		icon_state = "nuc_crystal"
+		species_allowed = list("Nucleation")
+
+	nuc_betaburns
+		name = "Nucleation Beta Burns"
+		icon_state = "nuc_betaburns"
+		species_allowed = list("Nucleation")
+
+	nuc_fallout
+		name = "Nucleation Fallout"
+		icon_state = "nuc_fallout"
+		species_allowed = list("Nucleation")
+
+	nuc_frission
+		name = "Nucleation Frission"
+		icon_state = "nuc_frission"
+		species_allowed = list("Nucleation")
+
+	nuc_radical
+		name = "Nucleation Free Radical"
+		icon_state = "nuc_radical"
+		species_allowed = list("Nucleation")
+
+	nuc_gammaray
+		name = "Nucleation Gamma Ray"
+		icon_state = "nuc_gammaray"
+		species_allowed = list("Nucleation")
+
+	nuc_neutron
+		name = "Nucleation Neutron Bomb"
+		icon_state = "nuc_neutron"
+		species_allowed = list("Nucleation")
 
 /datum/sprite_accessory/facial_hair
 

code/modules/organs/organ.dm

@@ -77,10 +77,11 @@ var/list/organ_cache = list()
 		owner = null
 
 	if(!owner)
-		var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list
-		if(B && prob(40))
-			reagents.remove_reagent("blood",0.1)
-			blood_splatter(src,B,1)
+		if(reagents)
+			var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list
+			if(B && prob(40))
+				reagents.remove_reagent("blood",0.1)
+				blood_splatter(src,B,1)
 		if(prob(5)) //How about we not have organs become completely useless less than a minute after removal?
 			damage += 1
 

code/modules/organs/organ_alien.dm

@@ -336,3 +336,51 @@
 	name = "vox cortical stack"
 
 /obj/item/organ/stack/vox/stack
+
+
+//WRYN ORGAN
+
+/obj/item/organ/wryn/hivenode
+	name = "antennae"
+	parent_organ = "head"
+
+/obj/item/organ/wryn/hivenode
+	name = "antennae"
+	organ_tag = "antennae"
+	icon = 'icons/mob/human_races/r_wryn.dmi'
+	icon_state = "antennae"
+
+
+//NUCLEATION ORGAN
+
+/obj/item/organ/nucleation
+	name = "nucleation organ"
+	icon = 'icons/obj/surgery.dmi'
+	desc = "A crystalized human organ. /red It has a strangely iridescent glow."
+
+/obj/item/organ/nucleation/resonant_crystal
+	name = "resonant crystal"
+	icon_state = "resonant-crystal"
+	organ_tag = "resonant crystal"
+	parent_organ = "head"
+
+/obj/item/organ/nucleation/strange_crystal
+	name = "strange crystal"
+	icon_state = "strange-crystal"
+	organ_tag = "strange crystal"
+	parent_organ = "chest"
+
+/obj/item/organ/eyes/luminescent_crystal
+	name = "luminescent eyes"
+	icon_state = "crystal-eyes"
+	organ_tag = "luminescent eyes"
+	light_color = "#1C1C00"
+	parent_organ = "head"
+
+	New()
+		set_light(2)
+
+/obj/item/organ/brain/crystal
+	name = "crystalized brain"
+	icon_state = "crystal-brain"
+	organ_tag = "crystalized brain"

code/modules/organs/organ_external.dm

@@ -220,7 +220,7 @@
 				else
 					droplimb(0,DROPLIMB_BLUNT)
 
-	owner_old.updatehealth()
+	if(owner_old) owner_old.updatehealth()
 	return update_icon()
 
 /obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
@@ -984,7 +984,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 	can_grasp = 1
 
 /obj/item/organ/external/hand/removed()
-	owner.unEquip(owner.gloves)
+	if(owner) owner.unEquip(owner.gloves)
 	..()
 
 /obj/item/organ/external/hand/right

code/modules/power/apc.dm

@@ -119,7 +119,7 @@
 	if (building==0)
 		init()
 	else
-		area = src.loc.loc:master
+		area = src.loc.loc
 		area.apc |= src
 		opened = 1
 		operating = 0

code/modules/power/lighting.dm

@@ -560,11 +560,9 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(75))
-				broken()
+			broken()
 		if(3.0)
-			if (prob(50))
-				broken()
+			broken()
 	return
 
 //blob effect

code/modules/power/singularity/singularity.dm

@@ -5,6 +5,7 @@ var/global/narsie_cometh = 0
 var/global/list/uneatable = list(
 	/turf/space,
 	/obj/effect/overlay,
+	/atom/movable/lighting_overlay,
 	/mob/dead,
 	/mob/camera,
 	/mob/new_player
@@ -222,6 +223,7 @@ var/global/list/uneatable = list(
 	for(var/atom/X in orange(grav_pull,src))
 		// N3X: Move this up here since get_dist is slow.
 		if(is_type_in_list(X, uneatable))	continue
+		if(!X.simulated)	continue
 
 		var/dist = get_dist(X, src)
 
@@ -265,6 +267,8 @@ var/global/list/uneatable = list(
 	var/gain = 0
 	if(is_type_in_list(A, uneatable))
 		return 0
+	if(!A.simulated)
+		return 0
 	if (istype(A,/mob/living))//Mobs get gibbed
 		var/mob/living/M = A
 		gain = 20
@@ -561,6 +565,8 @@ var/global/list/uneatable = list(
 /obj/machinery/singularity/narsie/consume(var/atom/A)
 	if(is_type_in_list(A, uneatable))
 		return 0
+	if(!A.simulated)
+		return 0
 	if (istype(A,/mob/living))//Mobs get gibbed
 		A:gib()
 	else if(istype(A,/obj))

code/modules/reagents/Chemistry-Colours.dm

@@ -1,66 +1,31 @@
-/proc/mix_color_from_reagents(var/list/reagent_list)
-	if(!reagent_list || !length(reagent_list))
-		return 0
+/*
+ * Returns:
+ * 	#RRGGBB(AA) on success, null on failure
+ */
+/proc/mix_color_from_reagents(const/list/reagent_list)
+	if(!istype(reagent_list))
+		return
 
-	var/contents = length(reagent_list)
-	var/list/weight = new /list(contents)
-	var/list/redcolor = new /list(contents)
-	var/list/greencolor = new /list(contents)
-	var/list/bluecolor = new /list(contents)
-	var/i
+	var/color
+	var/reagent_color
+	var/vol_counter = 0
+	var/vol_temp
+	// see libs/IconProcs/IconProcs.dm
+	for(var/datum/reagent/reagent in reagent_list)
+		if(reagent.id == "blood" && reagent.data["blood_colour"])
+			reagent_color = reagent.data["blood_colour"]
+		else
+			reagent_color = reagent.color
 
-	//fill the list of weights
-	for(i=1; i<=contents; i++)
-		var/datum/reagent/re = reagent_list[i]
-		var/reagentweight = re.volume
-		if(istype(re, /datum/reagent/paint))
-			reagentweight *= 20 //Paint colours a mixture twenty times as much
-		weight[i] = reagentweight
+		vol_temp = reagent.volume
+		vol_counter += vol_temp
+
+		if(isnull(color))
+			color = reagent.color
+		else if(length(color) >= length(reagent_color))
+			color = BlendRGB(color, reagent_color, vol_temp/vol_counter)
+		else
+			color = BlendRGB(reagent_color, color, vol_temp/vol_counter)
+	return color
 
 
-	//fill the lists of colours
-	for(i=1; i<=contents; i++)
-		var/datum/reagent/re = reagent_list[i]
-		var/hue = re.color
-		if(length(hue) != 7)
-			return 0
-		redcolor[i]=hex2num(copytext(hue,2,4))
-		greencolor[i]=hex2num(copytext(hue,4,6))
-		bluecolor[i]=hex2num(copytext(hue,6,8))
-
-	//mix all the colors
-	var/red = mixOneColor(weight,redcolor)
-	var/green = mixOneColor(weight,greencolor)
-	var/blue = mixOneColor(weight,bluecolor)
-
-	//assemble all the pieces
-	var/finalcolor = rgb(red, green, blue)
-	return finalcolor
-
-/proc/mixOneColor(var/list/weight, var/list/color)
-	if (!weight || !color || length(weight)!=length(color))
-		return 0
-
-	var/contents = length(weight)
-	var/i
-
-	//normalize weights
-	var/listsum = 0
-	for(i=1; i<=contents; i++)
-		listsum += weight[i]
-	for(i=1; i<=contents; i++)
-		weight[i] /= listsum
-
-	//mix them
-	var/mixedcolor = 0
-	for(i=1; i<=contents; i++)
-		mixedcolor += weight[i]*color[i]
-	mixedcolor = round(mixedcolor)
-
-	//until someone writes a formal proof for this algorithm, let's keep this in
-//	if(mixedcolor<0x00 || mixedcolor>0xFF)
-//		return 0
-	//that's not the kind of operation we are running here, nerd
-	mixedcolor=min(max(mixedcolor,0),255)
-
-	return mixedcolor

code/modules/reagents/Chemistry-Holder.dm

@@ -488,7 +488,7 @@ datum
 					R.holder = src
 					R.volume = amount
 //					SetViruses(R, data) // Includes setting data
-					R.data = data
+					if(data) R.data = data
 					//debug
 					//world << "Adding data"
 					//for(var/D in R.data)

code/modules/reagents/newchem/medicine.dm

@@ -106,7 +106,7 @@ datum/reagent/charcoal
 	id = "charcoal"
 	description = "Activated charcoal helps to absorb toxins."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#000000"
 
 datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom

code/modules/recycling/sortingmachinery.dm

@@ -6,24 +6,24 @@
 	density = 1
 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER
 	var/obj/wrapped = null
+	var/init_welded = 0
 	var/giftwrapped = 0
 	var/sortTag = 0
 
 
 /obj/structure/bigDelivery/attack_hand(mob/user as mob)
 	playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
-	qdel(src)
-
-/obj/structure/bigDelivery/Destroy()
-	if(wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
-		wrapped.loc = (get_turf(loc))
+	if(wrapped)
+		wrapped.loc = get_turf(src)
 		if(istype(wrapped, /obj/structure/closet))
 			var/obj/structure/closet/O = wrapped
-			O.welded = 0
+			O.welded = init_welded
 	var/turf/T = get_turf(src)
-	for(var/atom/movable/AM in contents)
+	for(var/atom/movable/AM in src)
 		AM.loc = T
-	..()
+
+	qdel(src)
+
 
 /obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/device/destTagger))
@@ -170,6 +170,7 @@
 		if(use(3))
 			var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc))
 			P.wrapped = O
+			P.init_welded = O.welded
 			O.welded = 1
 			O.loc = P
 		else

code/modules/research/rdconsole.dm

@@ -34,6 +34,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole
 	name = "R&D Console"
 	icon_state = "rdcomp"
+	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
 	var/obj/item/weapon/disk/tech_disk/t_disk = null	//Stores the technology disk.

code/modules/research/server.dm

@@ -181,6 +181,7 @@
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
 	icon_state = "rdcomp"
+	light_color = "#a96faa"
 	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0
 	var/obj/machinery/r_n_d/server/temp_server

code/modules/shuttles/whiteship.dm

@@ -0,0 +1,23 @@
+/obj/machinery/computer/shuttle_control/multi/whiteship
+	name = "medical ship control console"
+	req_access = list()
+	shuttle_tag = "White Ship"
+	circuit = "/obj/item/weapon/circuitboard/white_ship"
+	light_color = "#CC0000"
+
+/obj/machinery/computer/shuttle_control/multi/whiteship/attack_ai(user as mob)
+	user << "\red Access Denied."
+	return 1
+
+/obj/machinery/computer/shuttle_control/multi/whiteship/New()
+	var/area/A = get_area(src)
+	if(!istype(A,/area/shuttle/derelict/ship))
+		visible_message("<span class='warning'>\The [src] displays a message: No connectable systems located. Shutting down.</span>")
+		var/V = text2path(circuit)
+		new V(loc)
+
+		animate(src, alpha = 10, time = 20)
+		spawn(20)
+			visible_message("<span class='danger'>\The [src] fades out of existence!</span>")
+			qdel(src)
+	..()

code/modules/supermatter/supermatter.dm

@@ -1,23 +1,35 @@
 
-#define NITROGEN_RETARDATION_FACTOR 4        //Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 750               //Higher == more heat released during reaction
-#define PLASMA_RELEASE_MODIFIER 1500                //Higher == less plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 1500        //Higher == less oxygen released at high temperature/power
-#define REACTION_POWER_MODIFIER 1.1                //Higher == more overall power
+#define NITROGEN_RETARDATION_FACTOR 0.15	//Higher == N2 slows reaction more
+#define THERMAL_RELEASE_MODIFIER 750		//Higher == more heat released during reaction
+#define PLASMA_RELEASE_MODIFIER 1500		//Higher == less plasma released by reaction
+#define OXYGEN_RELEASE_MODIFIER 1500		//Higher == less oxygen released at high temperature/power
+#define REACTION_POWER_MODIFIER 1.1			//Higher == more overall power
+
+/*
+	How to tweak the SM
+
+	POWER_FACTOR		directly controls how much power the SM puts out at a given level of excitation (power var). Making this lower means you have to work the SM harder to get the same amount of power.
+	CRITICAL_TEMPERATURE	The temperature at which the SM starts taking damage.
+
+	CHARGING_FACTOR		Controls how much emitter shots excite the SM.
+	DAMAGE_RATE_LIMIT	Controls the maximum rate at which the SM will take damage due to high temperatures.
+*/
 
 //Controls how much power is produced by each collector in range - this is the main parameter for tweaking SM balance, as it basically controls how the power variable relates to the rest of the game.
-#define POWER_FACTOR 0.35              //Obtained from testing. Aiming to make the ideal running output (600 kW) run the SM to ~85% of the safety level.
-
-#define CHARGING_FACTOR 0.55
-#define DAMAGE_RATE_LIMIT 5                 //damage rate cap at power = 900, scales linearly with power
+#define POWER_FACTOR 1.0
+#define DECAY_FACTOR 700			//Affects how fast the supermatter power decays
+#define CRITICAL_TEMPERATURE 800	//K
+#define CHARGING_FACTOR 0.05
+#define DAMAGE_RATE_LIMIT 3			//damage rate cap at power = 300, scales linearly with power
 
 
 //These would be what you would get at point blank, decreases with distance
 #define DETONATION_RADS 200
 #define DETONATION_HALLUCINATION 600
 
+#define TRANSFORM_DISTANCE_MOD 2 // Size/this is maximum distance from SM during burst for transformation to Nucleation
 
-#define WARNING_DELAY 30 		//seconds between warnings.
+#define WARNING_DELAY 30			//seconds between warnings.
 
 /obj/machinery/power/supermatter
 	name = "Supermatter"
@@ -35,6 +47,7 @@
 	var/damage = 0
 	var/damage_archived = 0
 	var/safe_alert = "Crystaline hyperstructure returning to safe operating levels."
+	var/safe_warned = 0
 	var/warning_point = 100
 	var/warning_alert = "Danger! Crystal hyperstructure instability!"
 	var/emergency_point = 700
@@ -47,15 +60,20 @@
 
 	var/grav_pulling = 0
 	var/pull_radius = 14
+	// Time in ticks between delamination ('exploding') and exploding (as in the actual boom)
+	var/pull_time = 100
+	var/explosion_power = 8
 
 	var/emergency_issued = 0
 
-	var/explosion_power = 8
+	// Time in 1/10th of seconds since the last sent warning
+	var/lastwarning = 0
+
+	// This stops spawning redundand explosions. Also incidentally makes supermatter unexplodable if set to 1.
+	var/exploded = 0
 
-	var/lastwarning = 0                        // Time in 1/10th of seconds since the last sent warning
 	var/power = 0
-
-	var/oxygen = 0				  // Moving this up here for easier debugging.
+	var/oxygen = 0
 
 	//Temporary values so that we can optimize this
 	//How much the bullets damage should be multiplied by when it is added to the internal variables
@@ -67,21 +85,7 @@
 
 	var/obj/item/device/radio/radio
 
-	shard //Small subtype, less efficient and more sensitive, but less boom.
-		name = "Supermatter Shard"
-		desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it."
-		icon_state = "darkmatter_shard"
-		base_icon_state = "darkmatter_shard"
-
-		warning_point = 50
-		emergency_point = 500
-		explosion_point = 900
-
-		gasefficency = 0.125
-
-		pull_radius = 5
-		explosion_power = 3 //3,6,9,12? Or is that too small?
-
+	var/debug = 0
 
 /obj/machinery/power/supermatter/New()
 	. = ..()
@@ -93,17 +97,46 @@
 	. = ..()
 
 /obj/machinery/power/supermatter/proc/explode()
+	message_admins("Supermatter exploded at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+	log_game("Supermatter exploded at ([x],[y],[z])")
 	anchored = 1
 	grav_pulling = 1
-	spawn(100)
-		explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1)
+	exploded = 1
+	spawn(pull_time)
+		var/turf/epicenter = get_turf(src)
+		explosion(epicenter, explosion_power, explosion_power*2, explosion_power*3, explosion_power*4, 1)
+		supermatter_delamination( epicenter, explosion_power*4, 1 )
 		del src
 		return
 
-//Changes color and luminosity of the light to these values if they were not already set
+//Changes color and light_range of the light to these values if they were not already set
 /obj/machinery/power/supermatter/proc/shift_light(var/lum, var/clr)
-	if(lum != light_range || clr != light_color)
-		set_light(lum, l_color = clr)
+	if(light_color != clr)
+		light_color = clr
+	if(light_range != lum)
+		set_light(lum)
+
+/obj/machinery/power/supermatter/proc/announce_warning()
+	var/integrity = damage / explosion_point
+	integrity = round(100 - integrity * 100)
+	integrity = integrity < 0 ? 0 : integrity
+	var/alert_msg = " Integrity at [integrity]%"
+
+	if(damage > emergency_point)
+		alert_msg = emergency_alert + alert_msg
+		lastwarning = world.timeofday - WARNING_DELAY * 4
+	else if(damage >= damage_archived) // The damage is still going up
+		safe_warned = 0
+		alert_msg = warning_alert + alert_msg
+		lastwarning = world.timeofday
+	else if(!safe_warned)
+		safe_warned = 1 // We are safe, warn only once
+		alert_msg = safe_alert
+		lastwarning = world.timeofday
+	else
+		alert_msg = null
+	if(alert_msg)
+		radio.autosay(alert_msg, "Supermatter Monitor")
 
 /obj/machinery/power/supermatter/process()
 
@@ -115,105 +148,85 @@
 	if(!istype(L)) 	//We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
 		return  //Yeah just stop.
 
-	if(istype(L, /turf/space)) // Stop processing this stuff if we've been ejected.
-		return
-
-	if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
-
-		shift_light(5, warning_color)
-		if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY)
-			var/stability = num2text(round((damage / explosion_point) * 100))
-
-			if(damage > emergency_point)
-				shift_light(7, emergency_color)
-				radio.autosay(addtext(emergency_alert, " Instability: ",stability,"%"), "Supermatter Monitor")
-				lastwarning = world.timeofday
-
-			else if(damage >= damage_archived) // The damage is still going up
-				radio.autosay(addtext(warning_alert," Instability: ",stability,"%"), "Supermatter Monitor")
-				lastwarning = world.timeofday - 150
-
-			else                                                 // Phew, we're safe
-				radio.autosay(safe_alert, "Supermatter Monitor")
-				lastwarning = world.timeofday
-
-		if(damage > explosion_point)
-			for(var/mob/living/mob in living_mob_list)
-				if(loc.z == mob.loc.z)
-					if(istype(mob, /mob/living/carbon/human))
-						//Hilariously enough, running into a closet should make you get hit the hardest.
-						var/mob/living/carbon/human/H = mob
-						H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)) ) )
-					var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) )
-					mob.apply_effect(rads, IRRADIATE)
-
+	if(damage > explosion_point)
+		if(!exploded)
+			if(!istype(L, /turf/space))
+				announce_warning()
 			explode()
+	else if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
+		shift_light(5, warning_color)
+		if(damage > emergency_point)
+			shift_light(7, emergency_color)
+		if(!istype(L, /turf/space) && (world.timeofday - lastwarning) >= WARNING_DELAY * 10)
+			announce_warning()
 	else
 		shift_light(4,initial(light_color))
 	if(grav_pulling)
 		supermatter_pull()
 
-		//Ok, get the air from the turf
-	var/datum/gas_mixture/env = L.return_air()
+	//Ok, get the air from the turf
+	var/datum/gas_mixture/removed = null
+	var/datum/gas_mixture/env = null
 
-	//Remove gas from surrounding area
-	var/datum/gas_mixture/removed = env.remove(gasefficency * env.total_moles())
+	//ensure that damage doesn't increase too quickly due to super high temperatures resulting from no coolant, for example. We dont want the SM exploding before anyone can react.
+	//We want the cap to scale linearly with power (and explosion_point). Let's aim for a cap of 5 at power = 300 (based on testing, equals roughly 5% per SM alert announcement).
+	var/damage_inc_limit = (power/300)*(explosion_point/1000)*DAMAGE_RATE_LIMIT
 
-	if(!removed || !removed.total_moles())
-		damage += max((power-1600)/10, 0)
-		power = min(power, 1600)
-		return 1
+	if(!istype(L, /turf/space))
+		env = L.return_air()
+		removed = env.remove(gasefficency * env.total_moles())	//Remove gas from surrounding area
 
-	damage_archived = damage
-	damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 )
-	//Ok, 100% oxygen atmosphere = best reaction
-	//Maxes out at 100% oxygen pressure
-	oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
-
-	var/temp_factor = 50
-
-	if(oxygen > 0.8)
-		// with a perfect gas mix, make the power less based on heat
-		icon_state = "[base_icon_state]_glow"
+	if(!env || !removed || !removed.total_moles())
+		damage += max((power - 15*POWER_FACTOR)/10, 0)
+	else if (grav_pulling) //If supermatter is detonating, remove all air from the zone
+		env.remove(env.total_moles())
 	else
-		// in normal mode, base the produced energy around the heat
-		temp_factor = 30
-		icon_state = base_icon_state
+		damage_archived = damage
 
-	power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload
+		damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
+		//Ok, 100% oxygen atmosphere = best reaction
+		//Maxes out at 100% oxygen pressure
+		oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles(), 1), 0)
 
-	//We've generated power, now let's transfer it to the collectors for storing/usage
-	transfer_energy()
+		//calculate power gain for oxygen reaction
+		var/temp_factor
+		var/equilibrium_power
+		if (oxygen > 0.8)
+			//If chain reacting at oxygen == 1, we want the power at 800 K to stabilize at a power level of 400
+			equilibrium_power = 400
+			icon_state = "[base_icon_state]_glow"
+		else
+			//If chain reacting at oxygen == 1, we want the power at 800 K to stabilize at a power level of 250
+			equilibrium_power = 250
+			icon_state = base_icon_state
 
-	var/device_energy = power * REACTION_POWER_MODIFIER
+		temp_factor = ( (equilibrium_power/DECAY_FACTOR)**3 )/800
+		power = max( (removed.temperature * temp_factor) * oxygen + power, 0)
 
-	//To figure out how much temperature to add each tick, consider that at one atmosphere's worth
-	//of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
-	//that the device energy is around 2140. At that stage, we don't want too much heat to be put out
-	//Since the core is effectively "cold"
+		//We've generated power, now let's transfer it to the collectors for storing/usage
+		transfer_energy()
 
-	//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
-	//is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
-	removed.temperature += (device_energy / THERMAL_RELEASE_MODIFIER)
+		var/device_energy = power * REACTION_POWER_MODIFIER
 
-	removed.temperature = max(0, min(removed.temperature, 2500))
 
-	//Calculate how much gas to release
-	removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0)
+		//Calculate how much gas to release
+		removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0)
 
-	removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
+		removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
 
-	env.merge(removed)
+		env.merge(removed)
 
-	for(var/mob/living/carbon/human/l in view(src, min(7, round(power ** 0.25)))) // If they can see it without mesons on.  Bad on them.
+
+	for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on.  Bad on them.
 		if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
-			l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1, get_dist(l, src)) ) ) )
+			l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
 
-	for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
-		var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src),1) )
-		l.apply_effect(irradiate=rads)
+	//adjusted range so that a power of 300 (pretty high) results in 8 tiles, roughly the distance from the core to the engine monitoring room.
+	for(var/mob/living/l in range(src, round(sqrt(power / 5))))
+		var/rads = (power / 10) * sqrt( 1 / get_dist(l, src) )
+		l.apply_effect(rads, IRRADIATE)
 
-	power -= (power/500)**3
+	power -= (power/DECAY_FACTOR)**3		//energy losses due to radiation
 
 	return 1
 
@@ -225,17 +238,12 @@
 				// Then bring it inside to explode instantly upon landing on a valid turf.
 
 
-	if(Proj.flag != "bullet")
-		power += Proj.damage * config_bullet_energy	* CHARGING_FACTOR
+	if(istype(Proj, /obj/item/projectile/beam))
+		power += Proj.damage * config_bullet_energy	* CHARGING_FACTOR / POWER_FACTOR
 	else
 		damage += Proj.damage * config_bullet_energy
 	return 0
 
-
-/obj/machinery/power/supermatter/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
-
 /obj/machinery/power/supermatter/attack_robot(mob/user as mob)
 	if(Adjacent(user))
 		return attack_hand(user)
@@ -247,6 +255,9 @@
 	user << "<span class = \"warning\">You attempt to interface with the control circuits but find they are not connected to your network.  Maybe in a future firmware update.</span>"
 
 /obj/machinery/power/supermatter/attack_hand(mob/user as mob)
+	if(istype(user,/mob/living/carbon/human/nucleation)) // Nucleation's biology doesn't react to this
+		return
+
 	user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.</span>",\
 		"<span class=\"danger\">You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
 		"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
@@ -255,11 +266,13 @@
 
 /obj/machinery/power/supermatter/proc/transfer_energy()
 	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
-		if(get_dist(R, src) <= 15) // Better than using orange() every process
-			R.receive_pulse(power * POWER_FACTOR)
+		var/distance = get_dist(R, src)
+		if(distance <= 15)
+			//for collectors using standard plasma tanks at 1013 kPa, the actual power generated will be this power*POWER_FACTOR*20*29 = power*POWER_FACTOR*580
+			R.receive_pulse(power * POWER_FACTOR * (min(3/distance, 1))**2)
 	return
 
-/obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
+/obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
 	user.visible_message("<span class=\"warning\">\The [user] touches \a [W] to \the [src] as a silence fills the room...</span>",\
 		"<span class=\"danger\">You touch \the [W] to \the [src] when everything suddenly goes silent.\"</span>\n<span class=\"notice\">\The [W] flashes into dust as you flinch away from \the [src].</span>",\
 		"<span class=\"warning\">Everything suddenly goes silent.</span>")
@@ -272,6 +285,8 @@
 
 /obj/machinery/power/supermatter/Bumped(atom/AM as mob|obj)
 	if(istype(AM, /mob/living))
+		if(istype(AM,/mob/living/carbon/human/nucleation)) // Nucleation's biology doesn't react to this
+			return
 		AM.visible_message("<span class=\"warning\">\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\
 		"<span class=\"danger\">You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\
 		"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
@@ -283,6 +298,9 @@
 
 
 /obj/machinery/power/supermatter/proc/Consume(var/mob/living/user)
+	if(istype(user,/mob/living/carbon/human/nucleation)) // Nucleation's biology doesn't react to this
+		return
+
 	if(istype(user))
 		user.dust()
 		power += 200
@@ -299,11 +317,10 @@
 		else
 			l.show_message("<span class=\"warning\">You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.</span>", 2)
 		var/rads = 500 * sqrt( 1 / (get_dist(l, src) + 1) )
-		l.apply_effect(rads, IRRADIATE, 0) // Permit blocking
+		l.apply_effect(rads, IRRADIATE)
 
 
 /obj/machinery/power/supermatter/proc/supermatter_pull()
-
 	//following is adapted from singulo code
 	if(defer_powernet_rebuild != 2)
 		defer_powernet_rebuild = 1
@@ -335,4 +352,110 @@
 
 	if(defer_powernet_rebuild != 2)
 		defer_powernet_rebuild = 0
-	return
+	return
+
+
+proc/supermatter_delamination(var/turf/epicenter, var/size, var/transform_mobs = 0, var/adminlog = 1)
+	spawn(0)
+		var/start = world.timeofday
+		epicenter = get_turf(epicenter)
+		if(!epicenter) return
+
+		if(adminlog)
+			message_admins("Supermatter delamination with size ([size]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[epicenter.x];Y=[epicenter.y];Z=[epicenter.z]'>JMP</a>)")
+			log_game("Supermatter delamination with size ([size]) in area [epicenter.loc.name] ")
+
+		playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(size*2,1) )
+		playsound(epicenter, "explosion", 100, 1, round(size,1) )
+
+		if(defer_powernet_rebuild != 2)
+			defer_powernet_rebuild = 1
+
+		var/x = epicenter.x
+		var/y = epicenter.y
+		var/z = epicenter.z
+
+		epicenter.ChangeTurf( /turf/simulated/floor/plating/smatter )
+
+		for(var/mob/living/mob in orange( epicenter, size*2 )) // Irradiate area twice the size of the main blast
+			if(epicenter.z == mob.loc.z)
+				if( ishuman(mob) )
+					//Hilariously enough, running into a closet should make you get hit the hardest.
+					var/mob/living/carbon/human/H = mob
+					H.hallucination += max(50, min(size*10, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, epicenter) + 1)) ) )
+				var/rads = size*10 * sqrt( 1 / (get_dist(mob, epicenter) + 1) )
+				mob.apply_effect(rads, IRRADIATE)
+
+		for(var/i=0, i<size, i++) // An awful way to do this, but i'm tired
+			for(var/j=0, j<i, j++)
+				var/turf/cur_turf = locate((x-i)+j, y+j, z )
+				var/dist = get_dist( cur_turf, epicenter )
+				var/percent = min( 100, ((( size-dist )/size )*100 ))
+				blow_lights( cur_turf )
+				if( prob( percent ))
+					supermatter_convert( cur_turf, transform_mobs )
+
+				cur_turf = locate(x+j, (y+i)-j, z )
+				dist = get_dist( cur_turf, epicenter )
+				percent = min( 100, ((( size-dist )/size )*100 ))
+				blow_lights( cur_turf )
+				if( prob( percent ))
+					supermatter_convert( cur_turf, transform_mobs )
+
+				cur_turf = locate((x+i)-j, y-j, z )
+				dist = get_dist( cur_turf, epicenter )
+				percent = min( 100, ((( size-dist )/size )*100 ))
+				blow_lights( cur_turf )
+				if( prob( percent ))
+					supermatter_convert( cur_turf, transform_mobs )
+
+				cur_turf = locate(x-j, (y-i)+j, z )
+				dist = get_dist( cur_turf, epicenter )
+				percent = min( 100, ((( size-dist )/size )*100 ))
+				blow_lights( cur_turf )
+				if( prob( percent ))
+					supermatter_convert( cur_turf, transform_mobs )
+
+		if(defer_powernet_rebuild != 2)
+			defer_powernet_rebuild = 0
+
+		diary << "## Supermatter delamination with size [size]. Took [(world.timeofday-start)/10] seconds."
+	return 1
+
+
+proc/supermatter_convert( var/turf/T, var/transform_mobs = 0 )
+	if( transform_mobs )
+		for( var/mob/item in T.contents )
+			if( ishuman( item ))
+				var/mob/living/carbon/human/M = item
+				if( istype(M.species, /datum/species/human ))
+					if( prob( 33 ))
+						M.set_species( "Nucleation", 1 )
+			item.ex_act( 3 )
+
+	if( istype( T, /turf/simulated/floor ))
+		new /obj/effect/supermatter_crystal(T)
+
+proc/blow_lights( var/turf/T )
+	for( var/obj/machinery/power/apc/apc in T )
+		apc.overload_lighting()
+
+
+/obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom.
+	name = "Supermatter Shard"
+	desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it."
+	icon_state = "darkmatter_shard"
+	base_icon_state = "darkmatter_shard"
+
+	warning_point = 50
+	emergency_point = 400
+	explosion_point = 600
+
+	gasefficency = 0.125
+
+	pull_radius = 5
+	pull_time = 45
+	explosion_power = 3
+
+/obj/machinery/power/supermatter/shard/announce_warning() //Shards don't get announcements
+	return

code/modules/supermatter/wall.dm

@@ -0,0 +1,74 @@
+/turf/simulated/floor/plating/smatter
+	name = "supermatter floor"
+	icon_state = "smatter"
+	light_color = "#8A8A00"
+
+/turf/simulated/floor/plating/smatter/New()
+	..()
+
+	var/r = rand( 0, 3 )
+	icon_state = "smatter[r]"
+
+	spawn(2)
+		var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
+		for(var/direction in step_overlays)
+			var/turf/turf_to_check = get_step(src,step_overlays[direction])
+			if((istype(turf_to_check,/turf/space) || istype(turf_to_check,/turf/simulated/floor)) && !istype(turf_to_check,/turf/simulated/floor/plating/smatter))
+				turf_to_check.overlays += image('icons/turf/floors.dmi', "smatter_side_[direction]")
+
+
+/turf/simulated/floor/plating/smatter/Destroy()
+	..()
+
+	var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
+	// Kill and update the space overlays around us.
+	for(var/direction in step_overlays)
+		var/turf/space/T = get_step(src, step_overlays[direction])
+		if(istype(T))
+			for(var/next_direction in step_overlays)
+				if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/floor/plating/smatter))
+					T.overlays += image('icons/turf/floors.dmi', "smatter_side_[next_direction]")
+
+/turf/simulated/wall/smatter
+	name = "supermatter"
+	desc = "thats a wall of supermatter"
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "smatter"
+	temperature = T20C+80
+	density = 1
+	opacity = 1
+	blocks_air = 1
+
+
+/turf/simulated/smatter/New()
+	..()
+
+	name = "supermatter"
+	desc = "thats a wall of supermatter"
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "smatter"
+	temperature = T20C+80
+	density = 1
+	opacity = 1
+	blocks_air = 1
+
+	spawn(2)
+		var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
+		for(var/direction in step_overlays)
+			var/turf/turf_to_check = get_step(src,step_overlays[direction])
+			if(istype(turf_to_check,/turf/space) || istype(turf_to_check,/turf/simulated/floor))
+				turf_to_check.overlays += image('icons/turf/walls.dmi', "smatter_side_[direction]")
+
+/turf/simulated/smatter/Destroy()
+	..()
+
+	var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
+	// Kill and update the space overlays around us.
+	for(var/direction in step_overlays)
+		var/turf/space/T = get_step(src, step_overlays[direction])
+		if(istype(T))
+			T.overlays.Cut()
+			for(var/next_direction in step_overlays)
+				if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/wall/smatter))
+					T.overlays += image('icons/turf/walls.dmi', "smatter_side_[next_direction]")
+

code/modules/surgery/tools.dm

@@ -3,10 +3,10 @@
 	desc = "Retracts stuff."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "retractor"
-	m_amt = 10000
-	g_amt = 5000
+	m_amt = 6000
+	g_amt = 3000
 	flags = CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 
 
@@ -28,8 +28,8 @@
 	desc = "This stops bleeding."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "cautery"
-	m_amt = 5000
-	g_amt = 2500
+	m_amt = 2500
+	g_amt = 750
 	flags = CONDUCT
 	w_class = 1.0
 	origin_tech = "materials=1;biotech=1"
@@ -42,8 +42,8 @@
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "drill"
 	hitsound = 'sound/weapons/circsawhit.ogg'
-	m_amt = 15000
-	g_amt = 10000
+	m_amt = 10000
+	g_amt = 6000
 	flags = CONDUCT
 	force = 15.0
 	w_class = 3.0
@@ -63,12 +63,14 @@
 	icon_state = "scalpel"
 	flags = CONDUCT
 	force = 10.0
+	sharp = 1
+	edge = 1
 	w_class = 1.0
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	m_amt = 10000
-	g_amt = 5000
+	m_amt = 4000
+	g_amt = 1000
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -84,7 +86,7 @@
 	name = "circular saw"
 	desc = "For heavy duty cutting."
 	icon = 'icons/obj/surgery.dmi'
-	icon_state = "saw"
+	icon_state = "saw3"
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	flags = CONDUCT
 	force = 15.0
@@ -92,12 +94,42 @@
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
-	m_amt = 20000
-	g_amt = 10000
+	m_amt = 10000
+	g_amt = 6000
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 
 
+//misc, formerly from code/defines/weapons.dm
+/obj/item/weapon/bonegel
+	name = "bone gel"
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "bone-gel"
+	force = 0
+	w_class = 2.0
+	throwforce = 1.0
+
+/obj/item/weapon/FixOVein
+	name = "FixOVein"
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "fixovein"
+	force = 0
+	throwforce = 1.0
+	origin_tech = "materials=1;biotech=3"
+	w_class = 2.0
+	var/usage_amount = 10
+
+/obj/item/weapon/bonesetter
+	name = "bone setter"
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "bone setter"
+	force = 8.0
+	throwforce = 9.0
+	throw_speed = 3
+	throw_range = 5
+	w_class = 2.0
+	attack_verb = list("attacked", "hit", "bludgeoned")
+
 /obj/item/weapon/surgical_drapes
 	name = "surgical drapes"
 	desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."