less muck

Author: wonderinghost

code/__HELPERS/game.dm

@@ -67,11 +67,14 @@
 	return
 
 ///Returns the name of the area the atom is in
-/proc/get_area_name(atom/checked_atom, format_text = FALSE)
-	var/area/checked_area = isarea(checked_atom) ? checked_atom : get_area(checked_atom)
-	if(!checked_area)
+/proc/get_area_name(atom/X, format_text = FALSE, is_sensor = FALSE)
+	var/area/A = isarea(X) ? X : get_area(X)
+	if(!A)
 		return null
-	return format_text ? format_text(checked_area.name) : checked_area.name
+	var/name = A.name
+	if (is_sensor && !A.show_on_sensors)
+		name = Gibberish(name, TRUE, 90)
+	return format_text ? format_text(name) : name
 
 /proc/get_cardinal_step_away(atom/start, atom/finish) //returns the position of a step from start away from finish, in one of the cardinal directions
 	//returns only NORTH, SOUTH, EAST, or WEST

code/game/machinery/computer/security.dm

@@ -37,7 +37,7 @@
 	radio = new(src)
 	radio.keyslot = new radio_key
 	radio.subspace_transmission = TRUE
-	radio.listening = FALSE
+	radio.set_listening(FALSE)
 	radio.use_command = TRUE
 	radio.independent = TRUE
 	radio.recalculateChannels()

code/game/machinery/telecomms/machine_interactions.dm

@@ -146,7 +146,13 @@
 		if("link")
 			if(heldmultitool)
 				var/obj/machinery/telecomms/tcomms_machine = multitool_get_buffer(src, heldmultitool)
-				. = add_new_link(T, operator)
+				if(istype(tcomms_machine) && tcomms_machine != src)
+					if(!(src in tcomms_machine.links))
+						tcomms_machine.links += src
+					if(!(tcomms_machine in links))
+						links += tcomms_machine
+						log_game("[key_name(operator)] linked [src] for [tcomms_machine] at [AREACOORD(src)].")
+						
 		if("buffer") // Yogs start -- holotool support
 			if(heldmultitool)
 				multitool_set_buffer(usr, heldmultitool, src)

code/game/mecha/mecha.dm

@@ -12,7 +12,6 @@
 	light_system = MOVABLE_LIGHT_DIRECTIONAL
 	light_range = 8
 	light_on = FALSE
-	flags_1 = HEAR_1
 	demolition_mod = 3 // mech punch go brr
 	var/weather_protection = WEATHER_STORM
 	var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
@@ -171,6 +170,7 @@
 	diag_hud_set_mechoverheat()
 	RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
 	ADD_TRAIT(src, TRAIT_SHIELDBUSTER, INNATE_TRAIT) // previously it didn't even check shields at all, now it still doesn't but does some fun stuff in the process
+	become_hearing_sensitive()
 
 /// Special light eater handling
 /obj/mecha/proc/on_light_eater(obj/vehicle/sealed/source, datum/light_eater)
@@ -203,6 +203,7 @@
 		else
 			M.forceMove(loc)
 	force_eject_occupant()
+	lose_hearing_sensitivity()
 	for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
 		E.detach(loc)
 		qdel(E)
@@ -537,7 +538,7 @@
 /obj/mecha/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list())
 	. = ..()
 	if(speaker == occupant)
-		if(radio?.broadcasting)
+		if(radio?.get_broadcasting())
 			radio.talk_into(speaker, text, , spans, message_language, message_mods)
 		//flick speech bubble
 		var/list/speech_bubble_recipients = list()

code/game/mecha/mecha_topic.dm

@@ -116,12 +116,12 @@
 						<div class='header'>Electronics</div>
 						<div class='links'>
 						<b>Radio settings:</b><br>
-						Microphone: [radio? "<a href='?src=[REF(src)];rmictoggle=1'><span id=\"rmicstate\">[radio.broadcasting?"Engaged":"Disengaged"]</span></a>":"Error"]<br>
-						Speaker: [radio? "<a href='?src=[REF(src)];rspktoggle=1'><span id=\"rspkstate\">[radio.listening?"Engaged":"Disengaged"]</span></a>":"Error"]<br>
+						Microphone: [radio? "<a href='?src=[REF(src)];rmictoggle=1'><span id=\"rmicstate\">[radio.get_broadcasting() ?"Engaged":"Disengaged"]</span></a>":"Error"]<br>
+						Speaker: [radio? "<a href='?src=[REF(src)];rspktoggle=1'><span id=\"rspkstate\">[radio.get_listening() ?"Engaged":"Disengaged"]</span></a>":"Error"]<br>
 						Frequency:
 						[radio? "<a href='?src=[REF(src)];rfreq=-10'>-</a>":"-"]
 						[radio? "<a href='?src=[REF(src)];rfreq=-2'>-</a>":"-"]
-						<span id="rfreq">[radio?"[format_frequency(radio.frequency)]":"Error"]</span>
+						<span id="rfreq">[radio?"[format_frequency(radio.get_frequency())]":"Error"]</span>
 						[radio? "<a href='?src=[REF(src)];rfreq=2'>+</a>":"+"]
 						[radio? "<a href='?src=[REF(src)];rfreq=10'>+</a><br>":"+"]
 						</div>
@@ -332,19 +332,22 @@
 			send_byjax(usr,"exosuit.browser","eq_list",src.get_equipment_list())
 
 	if(href_list["rmictoggle"])
-		radio.broadcasting = !radio.broadcasting
-		send_byjax(usr,"exosuit.browser","rmicstate",(radio.broadcasting?"Engaged":"Disengaged"))
+		radio.set_broadcasting(!radio.get_broadcasting())
+		send_byjax(usr,"exosuit.browser","rmicstate",(radio.get_broadcasting()?"Engaged":"Disengaged"))
+		return
 
 	if(href_list["rspktoggle"])
-		radio.listening = !radio.listening
-		send_byjax(usr,"exosuit.browser","rspkstate",(radio.listening?"Engaged":"Disengaged"))
+		radio.set_listening(!radio.get_listening())
+		send_byjax(usr,"exosuit.browser","rspkstate",(radio.get_listening()?"Engaged":"Disengaged"))
+		return
 
 	if(href_list["rfreq"])
-		var/new_frequency = (radio.frequency + text2num(href_list["rfreq"]))
-		if (!radio.freerange || (radio.frequency < MIN_FREE_FREQ || radio.frequency > MAX_FREE_FREQ))
+		var/new_frequency = (radio.get_frequency() + text2num(href_list["rfreq"]))
+		if (!radio.freerange || (radio.get_frequency() < MIN_FREE_FREQ || radio.get_frequency() > MAX_FREE_FREQ))
 			new_frequency = sanitize_frequency(new_frequency)
 		radio.set_frequency(new_frequency)
-		send_byjax(usr,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]")
+		send_byjax(usr,"exosuit.browser","rfreq","[format_frequency(radio.get_frequency())]")
+		return
 
 	if (href_list["change_name"])
 		var/userinput = stripped_input(occupant, "Choose new exosuit name", "Rename exosuit", "", MAX_NAME_LEN)

code/game/mecha/working/clarke.dm

@@ -14,7 +14,7 @@
 	facing_modifiers = list(FRONT_ARMOUR = 1.2, SIDE_ARMOUR = 1, BACK_ARMOUR = 0.8) // omnidirectional, less significant difference between attack directions
 	light_power = 7
 	deflect_chance = 10
-	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
+	flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
 	armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 0, BOMB = 60, BIO = 0, RAD = 100, FIRE = 100, ACID = 100)
 	max_equip = 7
 	enter_delay = 40
@@ -29,9 +29,11 @@
 	var/obj/item/mecha_parts/mecha_equipment/orebox_manager/ME = new(src)
 	ME.attach(src)
 	AddComponent(/datum/component/armor_plate, 5, /obj/item/stack/sheet/animalhide/weaver_chitin, list(MELEE = 5, BULLET = 2, LASER = 2))
+	become_hearing_sensitive()
 
 /obj/mecha/working/clarke/Destroy()
 	box.dump_box_contents()
+	lose_hearing_sensitivity()
 	return ..()
 
 /obj/mecha/working/clarke/moved_inside(mob/living/carbon/human/H)

code/game/mecha/working/ripley.dm

@@ -32,6 +32,7 @@
 		A.forceMove(drop_location())
 		step_rand(A)
 	cargo.Cut()
+	lose_hearing_sensitivity()
 	return ..()
 
 /obj/mecha/working/ripley/go_out()
@@ -61,6 +62,7 @@
 /obj/mecha/working/ripley/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list(MELEE = 10, BULLET = 5, LASER = 5))
+	become_hearing_sensitive()
 
 /obj/mecha/working/ripley/firefighter
 	desc = "Autonomous Power Loader Unit MK-II. This model is fitted with a pressurized cabin and thermal protection."
@@ -74,7 +76,7 @@
 	step_in = 3
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	weather_protection = WEATHER_LAVA|WEATHER_STORM
-	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
+	flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
 	armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 60, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
 	enclosed = TRUE
 	enter_delay = 40

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

@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 		return
 	if(radio_sounds.len) //Sephora - Radios make small static sounds now.
 		var/sound/radio_sound = pick(radio_sounds)
-		playsound(M.loc, radio_sound, 50, 1)
+		playsound(talking_movable.loc, radio_sound, 50, 1)
 
 	if(use_command)
 		spans |= SPAN_COMMAND