Merge tgstation13 r4570 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mining/mine_items.dm

@@ -262,7 +262,6 @@ proc/move_mining_shuttle()
 		icon_state = "diamonddrill"
 		item_state = "jackhammer"
 		digspeed = 15
-		force = 3
 		desc = ""
 
 /*****************************Shovel********************************/

code/modules/mining/mine_turfs.dm

@@ -185,17 +185,16 @@
 				shroom.pixel_x = 0
 				shroom.pixel_y = 0
 
-	W = new /turf/simulated/floor/plating/airless/asteroid( locate(src.x, src.y, src.z) )
-	W.dir = old_dir
-	W.fullUpdateMineralOverlays()
+	var/old_lumcount = lighting_lumcount - initial(lighting_lumcount)
+	W = new /turf/simulated/floor/plating/airless/asteroid(src)
+	W.lighting_lumcount += old_lumcount
+	if(old_lumcount != W.lighting_lumcount)
+		W.lighting_changed = 1
+		lighting_controller.changed_turfs += W
 
-	/*
-	W.icon_old = old_icon
-	if(old_icon) W.icon_state = old_icon
-	*/
-	W.opacity = 1
-	W.sd_SetOpacity(0)
-	W.sd_LumReset()
+	W.dir = old_dir
+
+	W.fullUpdateMineralOverlays()
 	W.levelupdate()
 	return W