Merge remote-tracking branch 'upstream/master' into nanites

code/datums/components/_component.dm

@@ -123,6 +123,8 @@
 	signal_enabled = TRUE
 
 /datum/proc/UnregisterSignal(datum/target, sig_type_or_types)
+	if(!target)
+		CRASH("[src] tried to unregister a signal without having a target.")
 	var/list/lookup = target.comp_lookup
 	if(!signal_procs || !signal_procs[target] || !lookup)
 		return

code/datums/components/chasm.dm

@@ -17,11 +17,13 @@
 		/obj/effect/hotspot,
 		/obj/effect/landmark,
 		/obj/effect/temp_visual,
+		/obj/effect/particle_effect,
 		/obj/effect/light_emitter/tendril,
 		/obj/effect/collapse,
 		/obj/effect/particle_effect/ion_trails,
 		/obj/effect/dummy/phased_mob,
-		/obj/effect/immovablerod
+		/obj/effect/immovablerod,
+		/obj/effect/crystalline_reentry
 		))
 
 /datum/component/chasm/Initialize(turf/target)

code/datums/looping_sounds/machinery_sounds.dm

@@ -46,6 +46,16 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+/datum/looping_sound/microwave_easteregg
+	start_sound = 'sound/machines/microwave/microwave-start.ogg'
+	start_length = 10
+	mid_sounds = list('sound/machines/microwave/microwave-eastereggmid1.ogg'=10, 'sound/machines/microwave/microwave-eastereggmid2.ogg'=1)
+	mid_length = 10
+	end_sound = 'sound/machines/microwave/microwave-eastereggend.ogg'
+	volume = 100
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 /datum/looping_sound/grill
 	mid_length = 2
 	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)

code/datums/traits/good.dm

@@ -16,6 +16,7 @@
 	desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
 	value = 1
 	category = CATEGORY_MOODS
+	mob_trait = TRAIT_APATHETIC
 	mood_quirk = TRUE
 	medical_record_text = "Patient was administered the Apathy Evaluation Scale but did not bother to complete it."
 
@@ -300,7 +301,7 @@
 
 /datum/quirk/draconicspeaker/remove()
 	var/mob/living/M = quirk_holder
-	M.remove_language(/datum/language/draconic)
+	M?.remove_language(/datum/language/draconic)
 
 /datum/quirk/slimespeaker
 	name = "Slime speaker"
@@ -316,7 +317,7 @@
 
 /datum/quirk/slimespeaker/remove()
 	var/mob/living/M = quirk_holder
-	M.remove_language(/datum/language/slime)
+	M?.remove_language(/datum/language/slime)
 
 /datum/quirk/tajaspeaker
 	name = "Siik-Tajr speaker"
@@ -332,7 +333,7 @@
 
 /datum/quirk/tajaspeaker/remove()
 	var/mob/living/M = quirk_holder
-	M.remove_language(/datum/language/tajara)
+	M?.remove_language(/datum/language/tajara)
 
 /datum/quirk/russianspeaker
 	name = "Neo-Russkiya speaker"
@@ -348,4 +349,4 @@
 
 /datum/quirk/russianspeaker/remove()
 	var/mob/living/M = quirk_holder
-	M.remove_language(/datum/language/spacerussian)
+	M?.remove_language(/datum/language/spacerussian)

code/datums/traits/negative.dm

@@ -429,8 +429,11 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 /datum/quirk/mute/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	mute = new
-	H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY)
-	H.gain_trauma(TRAIT_MUTE, TRAUMA_RESILIENCE_SURGERY)
+	H.gain_trauma(mute, TRAUMA_RESILIENCE_ABSOLUTE)
+
+/datum/quirk/mute/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE)
 
 /datum/quirk/mute/on_process()
 	if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))