Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

code/game/objects/buckling.dm

@@ -42,6 +42,7 @@
 	M.facing_dir = null
 	M.set_dir(buckle_dir ? buckle_dir : dir)
 	M.update_canmove()
+	M.update_floating( M.Check_Dense_Object() )
 	buckled_mob = M
 
 	post_buckle_mob(M)
@@ -53,6 +54,7 @@
 		buckled_mob.buckled = null
 		buckled_mob.anchored = initial(buckled_mob.anchored)
 		buckled_mob.update_canmove()
+		buckled_mob.update_floating( buckled_mob.Check_Dense_Object() )
 		buckled_mob = null
 
 		post_buckle_mob(.)

code/game/objects/items/devices/defib.dm

@@ -75,7 +75,7 @@
 			if(user.r_hand && user.l_hand)
 				cell.forceMove(get_turf(user))
 			else
-				cell.forceMove(user.put_in_hands(cell))
+				user.put_in_hands(cell)
 			cell = null
 			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		else
@@ -141,14 +141,15 @@
 							sleep(15 SECONDS)
 							break
 
-				if(patient.client)
-					patient.adjustOxyLoss(-20) //Look, blood stays oxygenated for quite some time, but I'm not recoding the entire oxy system
-					patient.stat = CONSCIOUS //Note that if whatever killed them in the first place wasn't fixed, they're likely to die again.
-					dead_mob_list -= patient
-					living_mob_list += patient
-					patient.timeofdeath = null
-					patient.visible_message("<span class='notice'>[patient]'s eyes open!</span>")
-					log_and_message_admins("[patient] was revived.")
+				if(!(HUSK in patient.mutations)) // Husked people can't come back with a Defib.
+					if(patient.client)
+						patient.adjustOxyLoss(-20) //Look, blood stays oxygenated for quite some time, but I'm not recoding the entire oxy system
+						patient.stat = CONSCIOUS //Note that if whatever killed them in the first place wasn't fixed, they're likely to die again.
+						dead_mob_list -= patient
+						living_mob_list += patient
+						patient.timeofdeath = null
+						patient.visible_message("<span class='notice'>[patient]'s eyes open!</span>")
+						log_and_message_admins("[patient] was revived by a defib.")
 			cell.charge -= charge_cost //Always charge the cost after any attempt, failed or not
 		sleep(20) //Wait 2 seconds before next attempt
 		statechange(1,patient) //Back to ready

code/game/objects/items/devices/flashlight.dm

@@ -73,7 +73,7 @@
 		if(brightness_level == "low")
 			set_light(brightness_on/2)
 		else if(brightness_level == "high")
-			set_light(brightness_on*4)
+			set_light(brightness_on*1.5)
 		else
 			set_light(brightness_on)
 

code/game/objects/items/devices/radio/jammer.dm

@@ -16,9 +16,9 @@ var/global/list/active_radio_jammers = list()
 /obj/item/device/radio_jammer
 	name = "subspace jammer"
 	desc = "Primarily for blocking subspace communications, preventing the use of headsets, PDAs, and communicators."
-	icon = 'icons/obj/device_alt.dmi'
-	icon_state = "shield0"
-	var/active_state = "shield1"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "jammer0"
+	var/active_state = "jammer1"
 
 	var/on = 0
 	var/jam_range = 7

code/game/objects/items/weapons/storage/bags.dm

@@ -34,15 +34,16 @@
 
 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_SMALL
+	max_storage_space = ITEMSIZE_SMALL * 21
 	can_hold = list() // any
 	cant_hold = list(/obj/item/weapon/disk/nuclear)
 
 /obj/item/weapon/storage/bag/trash/update_icon()
 	if(contents.len == 0)
 		icon_state = "trashbag0"
-	else if(contents.len < 12)
+	else if(contents.len < 9)
 		icon_state = "trashbag1"
-	else if(contents.len < 21)
+	else if(contents.len < 18)
 		icon_state = "trashbag2"
 	else icon_state = "trashbag3"