Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm

code/ZAS/Controller.dm

@@ -281,8 +281,8 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
 	var/direct = !(block & ZONE_BLOCKED)
 	var/space = !istype(B)
 
-	if(direct && !space)
-		if(min(A.zone.contents.len, B.zone.contents.len) <= ZONE_MIN_SIZE || equivalent_pressure(A.zone,B.zone) || current_cycle == 0)
+	if(!space)
+		if(min(A.zone.contents.len, B.zone.contents.len) < ZONE_MIN_SIZE || (direct && (equivalent_pressure(A.zone,B.zone) || current_cycle == 0)))
 			merge(A.zone,B.zone)
 			return
 

code/game/area/Space Station 13 areas.dm

@@ -98,6 +98,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "space"
 	requires_power = 1
 	always_unpowered = 1
+	lighting_use_dynamic = 0
 	power_light = 0
 	power_equip = 0
 	power_environ = 0

code/modules/admin/verbs/adminsay.dm

@@ -29,10 +29,10 @@
 	if (!msg)
 		return
 
-	var/sender_name = src.key
+	var/sender_name = key_name(usr, 1)
 	if(check_rights(R_ADMIN, 0))
 		sender_name = "<span class='admin'>[sender_name]</span>"
 	for(var/client/C in admins)
-		C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[key_name(usr, 1)]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
+		C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
 
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

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

@@ -207,7 +207,7 @@
 
 
 /mob/living/carbon/human/show_inv(mob/user as mob)
-	if(user.incapacitated())
+	if(user.incapacitated()  || !user.Adjacent(src))
 		return
 
 	var/obj/item/clothing/under/suit = null

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

@@ -3,7 +3,7 @@
 	if(!slot_to_strip || !istype(user))
 		return
 
-	if(user.incapacitated())
+	if(user.incapacitated()  || !user.Adjacent(src))
 		user << browse(null, text("window=mob[src.name]"))
 		return
 

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

@@ -208,7 +208,7 @@ var/global/list/damage_icon_parts = list()
 			O.update_icon()
 			if(O.damage_state == "00") continue
 			var/icon/DI
-			var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]"
+			var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.get_bodytype()]"
 			if(damage_icon_parts[cache_index] == null)
 				DI = new /icon(species.damage_overlays, O.damage_state)			// the damage icon for whole human
 				DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY)	// mask with this organ's pixels

code/modules/nano/nanoui.dm

@@ -347,7 +347,7 @@ nanoui is used to open and update nano browser uis
 		template_data_json = list2json(templates)
 
 	var/list/send_data = get_send_data(initial_data)
-	var/initial_data_json = replacetext(list2json_usecache(send_data), "'", "'")
+	var/initial_data_json = replacetext(replacetext(list2json_usecache(send_data), """, """), "'", "'")
 
 	var/url_parameters_json = list2json(list("src" = "\ref[src]"))
 

code/modules/organs/organ.dm

@@ -345,6 +345,7 @@ var/list/organ_cache = list()
 	user.drop_from_inventory(src)
 	var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src))
 	O.name = name
+	O.icon = icon
 	O.icon_state = icon_state
 
 	// Pass over the blood.

code/modules/power/lighting.dm

@@ -166,6 +166,10 @@
 	desc = "A small lighting fixture."
 	light_type = /obj/item/weapon/light/bulb
 
+/obj/machinery/light/small/emergency
+	brightness_range = 6
+	brightness_power = 2
+	brightness_color = "#da0205"
 
 /obj/machinery/light/spot
 	name = "spotlight"