Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro

code/game/machinery/alarm.dm

@@ -135,9 +135,9 @@
 		if(!istype(location))	return//returns if loc is not simulated
 
 		var/datum/gas_mixture/environment = location.return_air()
-		var/temperature_dangerlevel = get_danger_level(environment.temperature, TLV["temperature"])
+
 		//Handle temperature adjustment here.
-		if(temperature_dangerlevel || regulating_temperature)
+		if(environment.temperature < target_temperature - 10 || environment.temperature > target_temperature + 10 || regulating_temperature)
 			//If it goes too far, we should adjust ourselves back before stopping.
 			if(!regulating_temperature)
 				regulating_temperature = 1
@@ -368,7 +368,8 @@
 					send_signal(device_id, list("power"= 0) )
 
 	proc/apply_danger_level(var/new_danger_level)
-		alarm_area.atmosalm = new_danger_level
+		if (alarm_area.atmosalert(new_danger_level))
+			post_alert(new_danger_level)
 
 		for (var/area/A in alarm_area.related)
 			for (var/obj/machinery/alarm/AA in A)
@@ -382,6 +383,26 @@
 
 		update_icon()
 
+	proc/post_alert(alert_level)
+		var/datum/radio_frequency/frequency = radio_controller.return_frequency(alarm_frequency)
+		if(!frequency)
+			return
+
+		var/datum/signal/alert_signal = new
+		alert_signal.source = src
+		alert_signal.transmission_method = 1
+		alert_signal.data["zone"] = alarm_area.name
+		alert_signal.data["type"] = "Atmospheric"
+
+		if(alert_level==2)
+			alert_signal.data["alert"] = "severe"
+		else if (alert_level==1)
+			alert_signal.data["alert"] = "minor"
+		else if (alert_level==0)
+			alert_signal.data["alert"] = "clear"
+
+		frequency.post_signal(src, alert_signal)
+
 	proc/refresh_danger_level()
 		var/level = 0
 		for (var/area/A in alarm_area.related)
@@ -828,12 +849,12 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 
 			if (AALARM_SCREEN_MODE)
 				output += "<a href='?src=\ref[src];screen=[AALARM_SCREEN_MAIN]'>Main menu</a><br><b>Air machinery mode for the area:</b><ul>"
-				var/list/modes = list(AALARM_MODE_SCRUBBING   = "Filtering",\
-					AALARM_MODE_REPLACEMENT = "<font color='blue'>REPLACE AIR</font>",\
-					AALARM_MODE_PANIC       = "<font color='red'>PANIC</font>",\
-					AALARM_MODE_CYCLE       = "<font color='red'>CYCLE</font>",\
-					AALARM_MODE_FILL        = "<font color='green'>FILL</font>",\
-					AALARM_MODE_OFF         = "<font color='blue'>OFFF</font>",)
+				var/list/modes = list(AALARM_MODE_SCRUBBING   = "Filtering - Scrubs out contaminants",\
+					AALARM_MODE_REPLACEMENT = "<font color='blue'>Replace Air - Siphons out air while replacing</font>",\
+					AALARM_MODE_PANIC       = "<font color='red'>Panic - Siphons air out of the room</font>",\
+					AALARM_MODE_CYCLE       = "<font color='red'>Cycle - Siphons air before replacing</font>",\
+					AALARM_MODE_FILL        = "<font color='green'>Fill - Shuts off scrubbers and opens vents</font>",\
+					AALARM_MODE_OFF         = "<font color='blue'>Off - Shuts off vents and scrubbers</font>",)
 				for (var/m=1,m<=modes.len,m++)
 					if (mode==m)
 						output += "<li><A href='?src=\ref[src];mode=[m]'><b>[modes[m]]</b></A> (selected)</li>"

code/game/machinery/computer/HolodeckControl.dm

@@ -96,6 +96,36 @@
 				if(target)
 					loadProgram(target)
 
+			else if(href_list["desert"])
+				target = locate(/area/holodeck/source_desert)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["space"])
+				target = locate(/area/holodeck/source_space)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["picnicarea"])
+				target = locate(/area/holodeck/source_picnicarea)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["snowfield"])
+				target = locate(/area/holodeck/source_snowfield)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["theatre"])
+				target = locate(/area/holodeck/source_theatre)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["meetinghall"])
+				target = locate(/area/holodeck/source_meetinghall)
+				if(target)
+					loadProgram(target)
+
 			else if(href_list["turnoff"])
 				target = locate(/area/holodeck/source_plating)
 				if(target)

code/game/machinery/iv_drip.dm

@@ -112,7 +112,8 @@
 
 			if (B)
 				beaker.reagents.reagent_list |= B
-				beaker.reagents.update_total()
+				beaker.reagents.del_reagent("clonexadone")	//Fix for infinite meat spawning when taking blood from human
+				beaker.reagents.update_total()				//to an IV drip full of clonex
 				beaker.on_reagent_change()
 				beaker.reagents.handle_reactions()
 				update_icon()

code/game/mecha/equipment/tools/tools.dm

@@ -1053,4 +1053,16 @@
 			set_ready_state(0)
 			chassis.use_power(energy_drain)
 			do_after_cooldown()
-		return 1
+		return 1
+
+/obj/item/weapon/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs.
+	name = "mecha customisation kit"
+	desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech."
+	icon = 'custom_items.dmi'
+	icon_state = "royce_kit"
+
+	var/new_name = "mech"    //What is the variant called?
+	var/new_desc = "A mech." //How is the new mech described?
+	var/new_icon = "ripley"  //What base icon will the new mech use?
+	var/removable = null     //Can the kit be removed?
+	var/list/allowed_types = list() //Types of mech that the kit will work on.

code/game/mecha/mech_fabricator.dm

@@ -44,7 +44,12 @@
 						/obj/item/robot_parts/l_arm,
 						/obj/item/robot_parts/r_arm,
 						/obj/item/robot_parts/l_leg,
-						/obj/item/robot_parts/r_leg
+						/obj/item/robot_parts/r_leg,
+						/obj/item/robot_parts/robot_component/binary_communication_device,
+						/obj/item/robot_parts/robot_component/radio,
+						/obj/item/robot_parts/robot_component/actuator,
+						/obj/item/robot_parts/robot_component/diagnosis_unit,
+						/obj/item/robot_parts/robot_component/camera
 					),
 	"Ripley"=list(
 						/obj/item/mecha_parts/chassis/ripley,

code/game/mecha/mecha.dm

@@ -759,6 +759,34 @@
 		user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")
 		return
 
+	else if(istype(W, /obj/item/weapon/paintkit))
+
+		if(occupant)
+			user << "You can't customize a mech while someone is piloting it - that would be unsafe!"
+			return
+
+		var/obj/item/weapon/paintkit/P = W
+		var/found = null
+
+		for(var/type in P.allowed_types)
+			if(type==src.initial_icon)
+				found = 1
+				break
+
+		if(!found)
+			user << "That kit isn't meant for use on this class of exosuit."
+			return
+
+		user.visible_message("[user] opens [P] and spends some quality time customising [src].")
+
+		src.name = P.new_name
+		src.desc = P.new_desc
+		src.initial_icon = P.new_icon
+		src.reset_icon()
+
+		user.drop_item()
+		del(P)
+
 	else
 		call((proc_res["dynattackby"]||src), "dynattackby")(W,user)
 /*

code/game/mecha/mecha_construction_paths.dm

@@ -571,6 +571,7 @@
 	custom_action(step, atom/used_atom, mob/user)
 		user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]")
 		holder.overlays += used_atom.icon_state+"+o"
+		user.drop_item()
 		del used_atom
 		return 1
 

code/game/mecha/working/ripley.dm

@@ -2,6 +2,7 @@
 	desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world."
 	name = "APLU \"Ripley\""
 	icon_state = "ripley"
+	initial_icon = "ripley"
 	step_in = 6
 	max_temperature = 20000
 	health = 200
@@ -19,6 +20,7 @@
 	desc = "Standart APLU chassis was refitted with additional thermal protection and cistern."
 	name = "APLU \"Firefighter\""
 	icon_state = "firefighter"
+	initial_icon = "firefighter"
 	max_temperature = 65000
 	health = 250
 	lights_power = 8
@@ -107,18 +109,4 @@
 			T.Entered(A)
 		step_rand(A)
 	..()
-	return
-
-
-/obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/fluff/sven_fjeltson_1))//this shit broke ripleys
-		src.icon_state = "earth"
-		src.initial_icon = "earth"
-		src.name = "APLU \"Strike the Earth!\""
-		src.desc = "Looks like an over worked, under maintained Ripley with some horrific damage."
-		user << "You pick up your old \"Strike the Earth!\" APLU."
-		user.drop_item()
-		del(W)
-		return
-	else
-		..()
+	return

code/game/objects/effects/aliens.dm

@@ -110,6 +110,11 @@
 		for(var/mob/O in oviewers(src))
 			O.show_message("\red [usr] destroys the [name]!", 1)
 		health = 0
+	else
+		usr << "\blue You claw at the [name]."
+		for(var/mob/O in oviewers(src))
+			O.show_message("\red [usr] claws at the [name]!", 1)
+		health -= rand(5,10)
 	healthcheck()
 	return
 

code/game/objects/effects/barsign.dm

@@ -4,5 +4,5 @@
 	anchored = 1
 
 	New()
-		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")
+		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt")
 		src.icon_state = "[pick(valid_states)]"

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

@@ -850,7 +850,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		P.overlays.Cut()
 		P.overlays += image('icons/obj/pda.dmi', "pda-r")
 	else
-		U << "<span class='notice'>ERROR: Server isn't responding.</span>"
+		U << "<span class='notice'>ERROR: Messaging server is not responding.</span>"
 
 
 /obj/item/device/pda/verb/verb_remove_id()
@@ -1162,7 +1162,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		plist[text("[name]")] = P
 	return plist
-	
+
 
 //Some spare PDAs in a box
 /obj/item/weapon/storage/box/PDAs

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

@@ -4,18 +4,35 @@
 	icon_state = "voice0"
 	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
 
 	var/spamcheck = 0
-
+	var/emagged = 0
+	var/insults = 0//just in case
 
 /obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
 	if (spamcheck)
 		return
 
-	playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
-	user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
+	if(emagged)
+		if(insults >= 1)
+			playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)//hueheuheuheuheuheuhe
+			user.visible_message("<span class='warning'>[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"</span>")
+			insults--
+		else
+			user << "\red *BZZZZcuntZZZZT*"
+	else
+		playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
+		user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
 
 	spamcheck = 1
 	spawn(20)
-		spamcheck = 0
+		spamcheck = 0
+
+/obj/item/device/hailer/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+		user << "\red You overload \the [src]'s voice synthesizer."
+		emagged = 1
+		insults = rand(1, 3)//to prevent dickflooding
+		return
+	return

code/game/objects/items/robot/robot_parts.dm

@@ -8,6 +8,7 @@
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)
 	var/list/part = null
+	var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
 
 /obj/item/robot_parts/l_arm
 	name = "robot left arm"
@@ -161,7 +162,7 @@
 		else
 			user << "\blue You need to attach a flash to it first!"
 
-	if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain))
+	if(istype(W, /obj/item/device/mmi))
 		var/obj/item/device/mmi/M = W
 		if(check_completion())
 			if(!istype(loc,/turf))
@@ -193,7 +194,7 @@
 				user << "\red This [W] does not seem to fit."
 				return
 
-			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc))
+			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
 			if(!O)	return
 
 			user.drop_item()
@@ -278,3 +279,13 @@
 		del(src)
 		return
 	return
+
+/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/card/emag))
+		if(sabotaged)
+			user << "\red [src] is already sabotaged!"
+		else
+			user << "\red You slide [W] into the dataport on [src] and short out the safeties."
+			sabotaged = 1
+		return
+	..()

code/game/objects/items/weapons/surgery_tools.dm

@@ -19,7 +19,7 @@
 	m_amt = 10000
 	g_amt = 5000
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 
 /*HAHA, SUCK IT, 2000 LINES OF SPAGHETTI CODE!
@@ -133,7 +133,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "pinched")
 
@@ -268,7 +268,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("burnt")
 
@@ -360,7 +360,7 @@ LOOK FOR SURGERY.DM*/
 	g_amt = 10000
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("drilled")
 
@@ -379,7 +379,7 @@ LOOK FOR SURGERY.DM*/
 	icon_state = "scalpel"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 10.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
@@ -631,7 +631,7 @@ LOOK FOR SURGERY.DM*/
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
@@ -797,6 +797,7 @@ LOOK FOR SURGERY.DM*/
 	icon = 'surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
+	w_class = 2.0
 	throwforce = 1.0
 
 /obj/item/weapon/FixOVein
@@ -806,6 +807,7 @@ LOOK FOR SURGERY.DM*/
 	force = 0
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=3"
+	w_class = 2.0
 	var/usage_amount = 10
 
 /obj/item/weapon/bonesetter
@@ -816,4 +818,5 @@ LOOK FOR SURGERY.DM*/
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
+	w_class = 2.0
 	attack_verb = list("attacked", "hit", "bludgeoned")

code/game/objects/storage/coat.dm

@@ -211,8 +211,14 @@
 	orient2hud()
 	return
 
-/obj/item/weapon/storage/emp_act(severity)
+/obj/item/clothing/suit/emp_act(severity)
 	if(!istype(src.loc, /mob/living))
 		for(var/obj/O in contents)
 			O.emp_act(severity)
-	..()
+	..()
+
+/obj/item/clothing/suit/hear_talk(mob/M, var/msg)
+	for (var/atom/A in src)
+		if(istype(A,/obj/))
+			var/obj/O = A
+			O.hear_talk(M, msg)