Merge conflict resolution.

code/modules/client/client procs.dm

@@ -105,7 +105,7 @@
 /client/New(TopicData)
 	TopicData = null							//Prevent calls to client.Topic from connect
 
-	if(connection != "seeker")					//Invalid connection type.
+	if(!(connection in list("seeker", "web")))					//Invalid connection type.
 		return null
 	if(byond_version < MIN_CLIENT_VERSION)		//Out of date client.
 		return null
@@ -298,5 +298,6 @@
 		'icons/spideros_icons/sos_11.png',
 		'icons/spideros_icons/sos_12.png',
 		'icons/spideros_icons/sos_13.png',
-		'icons/spideros_icons/sos_14.png'
+		'icons/spideros_icons/sos_14.png',
+		'html/images/ntlogo.png'
 		)

code/modules/client/preferences.dm

@@ -1574,25 +1574,23 @@ datum/preferences
 	// Destroy/cyborgize organs
 
 	for(var/name in organ_data)
-		var/datum/organ/external/O = character.organs_by_name[name]
-		var/datum/organ/internal/I = character.internal_organs_by_name[name]
-		var/status = organ_data[name]
 
-		if(!I || !O)
-			continue
-
-		if(status == "amputated")
-			O.amputated = 1
-			O.status |= ORGAN_DESTROYED
-			O.destspawn = 1
-		if(status == "cyborg")
-			O.status |= ORGAN_ROBOT
-		if(status == "assisted")
-			I.mechassist()
-		else if(status == "mechanical")
-			I.mechanize()
-
-		else continue
+		var/status = organ_data[name]		
+		var/datum/organ/external/O = character.organs_by_name[name]		
+		if(O)
+			if(status == "amputated")
+				O.amputated = 1
+				O.status |= ORGAN_DESTROYED
+				O.destspawn = 1
+			else if(status == "cyborg")
+				O.status |= ORGAN_ROBOT
+		else			
+			var/datum/organ/internal/I = character.internal_organs_by_name[name]
+			if(I)
+				if(status == "assisted")
+					I.mechassist()
+				else if(status == "mechanical")
+					I.mechanize()
 
 	if(underwear > underwear_m.len || underwear < 1)
 		underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES

code/modules/clothing/spacesuits/ninja.dm

@@ -8,6 +8,7 @@
 	siemens_coefficient = 0.2
 	species_restricted = null
 	body_parts_covered = HEAD|FACE
+	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 
 /obj/item/clothing/suit/space/space_ninja
 	name = "ninja suit"
@@ -20,6 +21,7 @@
 	siemens_coefficient = 0.2
 	species_restricted = null //Workaround for spawning alien ninja without internals.
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	supporting_limbs = list()
 
 	// Hardsuit breaching data

code/modules/clothing/suits/miscellaneous.dm

@@ -379,7 +379,7 @@
 	item_state = "blueponcho"
 
 /obj/item/clothing/suit/storage/bomber
-	name = "bomber jacker"
+	name = "bomber jacket"
 	desc = "A thick, well-worn WW2 leather bomber jacket."
 	icon_state = "bomber"
 	item_state = "bomber"

code/modules/hydroponics/seed_mobs.dm

@@ -25,7 +25,7 @@
 /datum/seed/proc/request_player(var/mob/living/host)
 	if(!host) return
 	for(var/mob/dead/observer/O in player_list)
-		if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist))
+		if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(O, "Diona") && config.usealienwhitelist))
 			continue
 		if(O.client)
 			if(O.client.prefs.be_special & BE_PLANT && !(O.client in currently_querying))

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

@@ -26,7 +26,7 @@
 	cold_level_2 = -1
 	cold_level_3 = -1
 
-	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON
+	flags = NO_BREATHE | NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON
 
 	reagent_tag = IS_XENOS
 

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

@@ -229,7 +229,7 @@
 						return alert("Communications circuits remain uninitialized.")
 
 					var/target = locate(href_list["target"])
-					pda.create_message(src, target)
+					pda.create_message(src, target, 1)
 
 		// Accessing medical records
 		if("medicalrecord")

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -22,7 +22,8 @@
 		/obj/item/weapon/rack_parts,
 		/obj/item/weapon/camera_assembly,
 		/obj/item/weapon/tank,
-		/obj/item/weapon/circuitboard
+		/obj/item/weapon/circuitboard,
+		/obj/item/weapon/smes_coil
 		)
 
 	//Item currently being held.

code/modules/mob/login.dm

@@ -11,7 +11,7 @@
 				var/matches
 				if( (M.lastKnownIP == client.address) )
 					matches += "IP ([client.address])"
-				if( (M.computer_id == client.computer_id) )
+				if( (client.connection != "web") && (M.computer_id == client.computer_id) )
 					if(matches)	matches += " and "
 					matches += "ID ([client.computer_id])"
 					spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")

code/modules/organs/organ_external.dm

@@ -247,8 +247,8 @@ This function completely restores a damaged organ to perfect condition.
 				W.open_wound(damage)
 				if(prob(25))
 					//maybe have a separate message for BRUISE type damage?
-					owner.visible_message("\red The wound on [owner.name]'s [display_name] widens with a nasty ripping voice.",\
-					"\red The wound on your [display_name] widens with a nasty ripping voice.",\
+					owner.visible_message("\red The wound on [owner.name]'s [display_name] widens with a nasty ripping noise.",\
+					"\red The wound on your [display_name] widens with a nasty ripping noise.",\
 					"You hear a nasty ripping noise, as if flesh is being torn apart.")
 				return
 

code/modules/paperwork/paper.dm

@@ -225,7 +225,7 @@
 		t = replacetext(t, "\[/grid\]", "</td></tr></table>")
 		t = replacetext(t, "\[row\]", "</td><tr>")
 		t = replacetext(t, "\[cell\]", "<td>")
-		t = replacetext(t, "\[logo\]", "<img src = http://baystation12.net/wiki/logo.png>")
+		t = replacetext(t, "\[logo\]", "<img src = html/images/ntlogo.png>")
 
 		t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
 	else // If it is a crayon, and he still tries to use these, make them empty!

code/modules/power/breaker_box.dm

@@ -8,6 +8,7 @@
 	name = "Breaker Box"
 	icon = 'icons/obj/power.dmi'
 	icon_state = "bbox_off"
+	directwired = 0
 	var/icon_state_on = "bbox_on"
 	var/icon_state_off = "bbox_off"
 	flags = FPRINT

code/modules/power/cable.dm

@@ -486,7 +486,8 @@ obj/structure/cable/proc/avail()
 	icon_state = "coil"
 	amount = MAXCOIL
 	max_amount = MAXCOIL
-	item_color = COLOR_RED
+	color = COLOR_RED
+	//item_color = COLOR_RED Use regular "color" var instead. No need to have it duplicate in two vars. Causes confusion.
 	desc = "A coil of power cable."
 	throwforce = 10
 	w_class = 2.0
@@ -508,10 +509,8 @@ obj/structure/cable/proc/avail()
 /obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null)
 	..()
 	src.amount = length
-	if (param_color)
+	if (param_color) // It should be red by default, so only recolor it if parameter was specified.
 		color = param_color
-	else
-		color = item_color
 	pixel_x = rand(-2,2)
 	pixel_y = rand(-2,2)
 	update_icon()
@@ -548,7 +547,6 @@ obj/structure/cable/proc/avail()
 /obj/item/stack/cable_coil/update_icon()
 	if (!color)
 		color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
-		item_color = color
 	if(amount == 1)
 		icon_state = "coil1"
 		name = "cable piece"
@@ -588,8 +586,8 @@ obj/structure/cable/proc/avail()
 			usr << "\red You need at least 15 lengths to make restraints!"
 			return
 		var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc)
-		B.icon_state = "cuff_[item_color]"
-		usr << "\blue You wind some cable together to make some restraints."
+		B.color = color
+		usr << "<span class='notice'>You wind some cable together to make some restraints.</span>"
 		src.use(15)
 	else
 		usr << "\blue You cannot do that."
@@ -602,7 +600,7 @@ obj/structure/cable/proc/avail()
 	..()
 	if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
 		src.amount--
-		new/obj/item/stack/cable_coil(user.loc, 1,item_color)
+		new/obj/item/stack/cable_coil(user.loc, 1,color)
 		user << "You cut a piece off the cable coil."
 		src.update_icon()
 		return
@@ -699,7 +697,7 @@ obj/structure/cable/proc/avail()
 			var/obj/structure/cable/C = new(F)
 			var/obj/structure/cable/D = new(temp.floorbelow)
 
-			C.cableColor(item_color)
+			C.cableColor(color)
 
 			C.d1 = 11
 			C.d2 = dirn
@@ -712,7 +710,7 @@ obj/structure/cable/proc/avail()
 			C.mergeConnectedNetworks(C.d2)
 			C.mergeConnectedNetworksOnTurf()
 
-			D.cableColor(item_color)
+			D.cableColor(color)
 
 			D.d1 = 12
 			D.d2 = 0
@@ -732,7 +730,7 @@ obj/structure/cable/proc/avail()
 
 			var/obj/structure/cable/C = new(F)
 
-			C.cableColor(item_color)
+			C.cableColor(color)
 
 			//set up the new cable
 			C.d1 = 0 //it's a O-X node cable
@@ -797,7 +795,7 @@ obj/structure/cable/proc/avail()
 					return
 
 			var/obj/structure/cable/NC = new(U)
-			NC.cableColor(item_color)
+			NC.cableColor(color)
 
 			NC.d1 = 0
 			NC.d2 = fdirn
@@ -843,7 +841,7 @@ obj/structure/cable/proc/avail()
 				return
 
 
-		C.cableColor(item_color)
+		C.cableColor(color)
 
 		C.d1 = nd1
 		C.d2 = nd2
@@ -889,26 +887,26 @@ obj/structure/cable/proc/avail()
 	update_wclass()
 
 /obj/item/stack/cable_coil/yellow
-	item_color = COLOR_YELLOW
+	color = COLOR_YELLOW
 
 /obj/item/stack/cable_coil/blue
-	item_color = COLOR_BLUE
+	color = COLOR_BLUE
 
 /obj/item/stack/cable_coil/green
-	item_color = COLOR_GREEN
+	color = COLOR_GREEN
 
 /obj/item/stack/cable_coil/pink
-	item_color = COLOR_PINK
+	color = COLOR_PINK
 
 /obj/item/stack/cable_coil/orange
-	item_color = COLOR_ORANGE
+	color = COLOR_ORANGE
 
 /obj/item/stack/cable_coil/cyan
-	item_color = COLOR_CYAN
+	color = COLOR_CYAN
 
 /obj/item/stack/cable_coil/white
-	item_color = COLOR_WHITE
+	color = COLOR_WHITE
 
 /obj/item/stack/cable_coil/random/New()
-	item_color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()

code/modules/power/smes.dm

@@ -11,6 +11,7 @@
 	density = 1
 	anchored = 1
 	use_power = 0
+	directwired = 0
 	var/output = 50000		//Amount of power it tries to output
 	var/lastout = 0			//Amount of power it actually outputs to the powernet
 	var/loaddemand = 0		//For use in restore()
@@ -60,7 +61,9 @@
 
 	overlays += image('icons/obj/power.dmi', "smes-op[online]")
 
-	if(charging)
+	if(charging == 2)
+		overlays += image('icons/obj/power.dmi', "smes-oc2")
+	else if (charging == 1)
 		overlays += image('icons/obj/power.dmi', "smes-oc1")
 	else
 		if(chargemode)
@@ -95,9 +98,11 @@
 			var/actual_load = draw_power(target_load)		// add the load to the terminal side network
 			charge += actual_load * SMESRATE	// increase the charge
 
-			if (actual_load >= target_load) // did the powernet have enough power available for us?
+			if (actual_load >= target_load) // Did we charge at full rate?
+				charging = 2
+			else if (actual_load) // If not, did we charge at least partially?
 				charging = 1
-			else
+			else // Or not at all?
 				charging = 0
 
 	if(online)		// if outputting
@@ -222,6 +227,7 @@
 				"<span class='notice'>You added cables to the [src].</span>")
 		terminal.connect_to_network()
 		stat = 0
+		return 0
 
 	else if(istype(W, /obj/item/weapon/wirecutters) && terminal && !building_terminal)
 		building_terminal = 1
@@ -245,6 +251,7 @@
 						"<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
 					del(terminal)
 		building_terminal = 0
+		return 0
 	return 1
 
 /obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)

code/modules/power/smes_construction.dm

@@ -113,7 +113,8 @@
 				h_user << "Medium electrical sparks as you touch the [src], severely burning your hand!"
 				h_user.adjustFireLoss(rand(10,25))
 				h_user.Paralyse(5)
-			empulse(src.loc, 2, 4)
+			spawn(0)
+				empulse(src.loc, 2, 4)
 			charge = 0
 
 		if (36 to 60)
@@ -129,7 +130,8 @@
 				h_user << "Strong electrical arc sparks between you and [src], knocking you out for a while!"
 				h_user.adjustFireLoss(rand(35,75))
 				h_user.Paralyse(12)
-			empulse(src.loc, 8, 16)
+			spawn(0)
+				empulse(src.loc, 8, 16)
 			charge = 0
 			apcs_overload(1, 10)
 			src.visible_message("\icon[src] <b>[src]</b> beeps: \"Caution. Output regulators malfunction. Uncontrolled discharge detected.\"")
@@ -143,7 +145,8 @@
 			// Remember, we have few gigajoules of electricity here.. Turn them into crispy toast.
 			h_user.adjustFireLoss(rand(150,195))
 			h_user.Paralyse(25)
-			empulse(src.loc, 32, 64)
+			spawn(0)
+				empulse(src.loc, 32, 64)
 			charge = 0
 			apcs_overload(5, 25)
 			src.visible_message("\icon[src] <b>[src]</b> beeps: \"Caution. Output regulators malfunction. Significant uncontrolled discharge detected.\"")
@@ -228,7 +231,7 @@
 				for(var/obj/I in component_parts)
 					if(I.reliability != 100 && crit_fail)
 						I.crit_fail = 1
-						I.loc = src.loc
+					I.loc = src.loc
 				del(src)
 				return
 

code/modules/power/terminal.dm

@@ -33,3 +33,7 @@
 		invisibility = 0
 		icon_state = "term"
 
+// Needed so terminals are not removed from machines list.
+// Powernet rebuilds need this to work properly.
+/obj/machinery/power/terminal/process()
+	return 1

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -37,7 +37,7 @@
 			if(R.glass_center_of_mass)
 				center_of_mass = R.glass_center_of_mass
 			else
-				center_of_mass = list("x"=16, "y"=10)
+				center_of_mass = list("x"=16, "y"=10)
 		else
 			icon_state = "glass_empty"
 			name = "glass"

code/modules/shieldgen/emergency_shield.dm

@@ -160,8 +160,7 @@
 	idle_power_usage = 0
 
 /obj/machinery/shieldgen/Del()
-	for(var/obj/machinery/shield/shield_tile in deployed_shields)
-		del(shield_tile)
+	collapse_shields()
 	..()
 
 
@@ -184,8 +183,7 @@
 	src.active = 0
 	update_icon()
 
-	for(var/obj/machinery/shield/shield_tile in deployed_shields)
-		del(shield_tile)
+	collapse_shields()
 	
 	update_use_power(0)
 
@@ -197,8 +195,21 @@
 				deployed_shields += S
 				use_power(S.shield_generate_power)
 
+/obj/machinery/shieldgen/proc/collapse_shields()
+	for(var/obj/machinery/shield/shield_tile in deployed_shields)
+		del(shield_tile)
+
+/obj/machinery/shieldgen/power_change()
+	..()
+	if(!active) return
+	if (stat & NOPOWER)
+		collapse_shields()
+	else
+		create_shields()
+	update_icon()
+
 /obj/machinery/shieldgen/process()
-	if (!active)
+	if (!active || (stat & NOPOWER))
 		return
 	
 	if(malfunction)
@@ -224,6 +235,8 @@
 	if(health <= 30)
 		src.malfunction = 1
 	if(health <= 0)
+		spawn(0)
+			explosion(get_turf(src.loc), 0, 0, 1, 0, 0, 0)
 		del(src)
 	update_icon()
 	return
@@ -340,7 +353,7 @@
 
 
 /obj/machinery/shieldgen/update_icon()
-	if(active)
+	if(active && !(stat & NOPOWER))
 		src.icon_state = malfunction ? "shieldonbr":"shieldon"
 	else
 		src.icon_state = malfunction ? "shieldoffbr":"shieldoff"