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/game/gamemodes/changeling/changeling_powers.dm

@@ -344,7 +344,7 @@
 	set category = "Changeling"
 	set name = "Regenerative Stasis (20)"
 
-	var/datum/changeling/changeling = changeling_power(20,0,100,UNCONSCIOUS)
+	var/datum/changeling/changeling = changeling_power(20,0,100,DEAD)
 	if(!changeling)	return
 
 	changeling.chem_charges -= 20

code/game/gamemodes/changeling/modularchangling.dm

@@ -27,8 +27,8 @@ var/list/datum/power/changeling/powerinstances = list()
 
 /datum/power/changeling/fakedeath
 	name = "Regenerative Stasis"
-	desc = "We fake our death while we regenerate our form, even through death."
-	helptext = "Must be used before death."
+	desc = "We become weakened to a death-like state, where we will rise again from death."
+	helptext = "Can be used before or after death. Duration varies greatly."
 	genomecost = 0
 	allowduringlesserform = 1
 	verbpath = /mob/proc/changeling_fakedeath
@@ -56,7 +56,7 @@ var/list/datum/power/changeling/powerinstances = list()
 /datum/power/changeling/silence_sting
 	name = "Silence Sting"
 	desc = "We silently sting a human, completely silencing them for a short time."
-	helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and can not."
+	helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and cannot."
 	genomecost = 2
 	allowduringlesserform = 1
 	verbpath = /mob/proc/changeling_silence_sting
@@ -64,6 +64,7 @@ var/list/datum/power/changeling/powerinstances = list()
 /datum/power/changeling/transformation_sting
 	name = "Transformation Sting"
 	desc = "We silently sting a human, injecting a retrovirus that forces them to transform into another."
+	helptext = "Does not provide a warning to others. The victim will transform much like a changeling would."
 	genomecost = 3
 	verbpath = /mob/proc/changeling_transformation_sting
 

code/game/gamemodes/cult/cult_structures.dm

@@ -24,7 +24,7 @@
 	name = "Desk"
 	desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl"
 	icon_state = "tomealtar"
-	luminosity = 5
+//	luminosity = 5
 
 //sprites for this no longer exist	-Pete
 //(they were stolen from another game anyway)

code/game/gamemodes/events.dm

@@ -92,14 +92,13 @@
 			IonStorm()
 		if(14)
 			spacevine_infestation()
-		// TODO: Uncomment this after feature freeze -Giacom
-		//if(15)
-		//	communications_blackout()
+		if(15)
+			communications_blackout()
 
-/proc/communications_blackout()
+/proc/communications_blackout(var/silent = 1)
 
 	//Uncomment below if you want communication blackouts to have a warning.
-	//command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
+	if(!silent) command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
 	for(var/obj/machinery/telecomms/T in telecomms_list)
 		T.emp_act(1)
 

code/game/gamemodes/gameticker.dm

@@ -137,11 +137,12 @@ var/global/datum/controller/gameticker/ticker
 	if(admins_number == 0)
 		send2irc("Server", "Round just started with no admins online!")
 
-	spawn() supply_ticker() // Added to kick-off the supply shuttle regenerating points -- TLE
+	supply_shuttle.process() 		//Start the supply shuttle regenerating points -- TLE
+	master_controller.process()		//Start master_controller.process()
+	lighting_controller.process()	//Start processing DynamicAreaLighting updates
 
-	//Start master_controller.process()
-	spawn master_controller.process()
-	if (config.sql_enabled)
+
+	if(config.sql_enabled)
 		spawn(3000)
 		statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE
 

code/game/gamemodes/meteor/meteors.dm

@@ -163,51 +163,4 @@
 	if(istype(W, /obj/item/weapon/pickaxe))
 		del(src)
 		return
-	..()
-
-/*
-//Testing purposes only!
-/obj/item/weapon/meteorgun
-	name = "Meteor Gun"
-	desc = "This beast fires meteors!. TESTING PURPOSES ONLY, This gun is <b>incomplete</b>!"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "lasercannon"
-	item_state = "gun"
-
-/obj/item/weapon/meteorgun/attack_self()
-	var/start_x = usr.loc.x
-	var/start_y = usr.loc.y
-	var/start_z = usr.loc.z
-	var/end_x = 0
-	var/end_y = 0
-	var/end_z = 0
-
-	switch(usr.dir)
-		if(NORTH)
-			end_x = start_x
-			end_y = world.maxy-TRANSITIONEDGE
-		if(SOUTH)
-			end_x = start_x
-			end_y = TRANSITIONEDGE
-		if(EAST)
-			end_x = world.maxx-TRANSITIONEDGE
-			end_y = start_y
-		if(WEST)
-			end_x = TRANSITIONEDGE
-			end_y = start_y
-		else //north
-			end_x = start_x
-			end_y = TRANSITIONEDGE
-	end_z = start_z
-
-	var/start = locate(start_x, start_y, start_z)
-	var/end = locate(end_x, end_y, end_z)
-	var/obj/effect/meteor/M = new /obj/effect/meteor(start)
-
-	M.dest = end
-
-	spawn(0)
-		walk_towards(M, M.dest, 1)
-
-	return
-*/
+	..()