[MIRROR] A Junkdrawer of misc fixes (some ports from Skyrat) (#4981)

* A Junkdrawer of misc fixes (some ports from Skyrat) (#4341) * HUD prescription lenses do not lose their prescription when toggled on/off * Constrict buff * Anvil sound now linked to ambience pref * LT3's Flannel fix+ Includes the plain black flannel too * Update HUD_Glasses.dm * Fix missing newline here * Gags flannel DMI * Fixes Teshari ling transformation * Update changeling.dm * Update HUD_Glasses.dm * [MIRROR] A Junkdrawer of misc fixes (some ports from Skyrat) --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: StealsThePRs <[email protected]>
Fluffy-Frontier · Aug 31, 2024 · 84ea641 · 84ea641
1 parent 56c7148
commit 84ea641
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 15 deletions.
diff --git a/code/datums/mood.dm b/code/datums/mood.dm
@@ -369,7 +369,7 @@
 			if(SANITY_INSANE to SANITY_CRAZY)
 				msg += "[span_boldwarning("AHAHAHAHAHAHAHAHAHAH!!")]\n"
 	else
-		msg += span_notice("I don't really know.")
+		msg += "[span_notice("I don't really know.")]\n"
 	//NOVA EDIT CHANGE END
 
 	msg += span_notice("My current mood: ") //Short term

diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
@@ -551,6 +551,8 @@
 	new_profile.emissive_eyes = target.emissive_eyes
 	new_profile.scream_type = target.selected_scream?.type || /datum/scream_type/none
 	new_profile.laugh_type = target.selected_laugh?.type || /datum/laugh_type/none
+	new_profile.target_height = target.get_mob_height()
+	new_profile.target_mob_size = target.mob_size
 	//NOVA EDIT ADDITION END
 
 	//THE FLUFFY FRONTIER EDIT ADDITION BEGIN - Blooper
@@ -808,6 +810,8 @@
 	qdel(user.selected_laugh)
 	user.selected_scream = new chosen_profile.scream_type
 	user.selected_laugh = new chosen_profile.laugh_type
+	user.mob_size = chosen_profile.target_mob_size
+	user.set_mob_height(chosen_profile.target_height)
 
 	// Only certain quirks will be copied, to avoid making the changeling blind or wheelchair-bound when they can simply pretend to have these quirks.
 

diff --git a/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm b/modular_nova/master_files/code/modules/antagonists/changeling/changeling.dm
@@ -59,3 +59,7 @@
 	var/scream_type
 	/// The profile source laugh type
 	var/laugh_type
+	/// The profile source mob height scaling
+	var/target_height
+	/// the profile source mob's size
+	var/target_mob_size
diff --git a/modular_nova/master_files/icons/mob/clothing/suit.dmi b/modular_nova/master_files/icons/mob/clothing/suit.dmi
diff --git a/modular_nova/modules/GAGS/icons/suit.dmi b/modular_nova/modules/GAGS/icons/suit.dmi
diff --git a/modular_nova/modules/huds/code/designs.dm b/modular_nova/modules/huds/code/designs.dm
@@ -56,7 +56,7 @@
 		/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
 		/datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
 	)
-	build_path = /obj/item/clothing/glasses/hud/science/prescription
+	build_path = /obj/item/clothing/glasses/science/prescription
 	category = list(
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
 	)

diff --git a/modular_nova/modules/huds/code/glasses/HUD_Glasses.dm b/modular_nova/modules/huds/code/glasses/HUD_Glasses.dm
@@ -4,35 +4,45 @@
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_healthhud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
-	clothing_traits = list(TRAIT_MEDICAL_HUD, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/hud/health/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
 
 /obj/item/clothing/glasses/hud/diagnostic/prescription
 	name = "prescription diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has prescription lenses."
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_diagnostichud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
-	clothing_traits = list(TRAIT_DIAGNOSTIC_HUD, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/hud/diagnostic/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
 
 /obj/item/clothing/glasses/hud/security/prescription
 	name = "prescription security HUD"
 	desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. This one has prescription lenses."
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_securityhud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
-	clothing_traits = list(TRAIT_SECURITY_HUD, TRAIT_NEARSIGHTED_CORRECTED)
 
-/obj/item/clothing/glasses/hud/science/prescription
+/obj/item/clothing/glasses/hud/security/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
+
+/obj/item/clothing/glasses/science/prescription
 	name = "prescription science glasses"
 	desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has prescription lenses."
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_sciencehud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
-	flash_protect = FLASH_PROTECTION_NONE
 	glass_colour_type = /datum/client_colour/glass_colour/purple
-	resistance_flags = ACID_PROOF
 	armor_type = /datum/armor/prescription_science
-	clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/science/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
 
 /datum/armor/prescription_science
 	fire = 80
@@ -41,14 +51,23 @@
 /obj/item/clothing/glasses/meson/prescription
 	name = "prescription optical meson scanner"
 	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in."
-	clothing_traits = list(TRAIT_MADNESS_IMMUNE, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/meson/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
 
 /obj/item/clothing/glasses/meson/engine/prescription
 	name = "prescription engineering scanner goggles"
 	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. Each lens has been replaced with a corrective lens."
-	clothing_traits = list(TRAIT_MADNESS_IMMUNE, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/meson/engine/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
 
 /obj/item/clothing/glasses/meson/engine/tray/prescription
 	name = "prescription optical t-ray scanner"
 	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. This one has a lens that help correct eye sight."
-	clothing_traits = list(TRAIT_MADNESS_IMMUNE, TRAIT_NEARSIGHTED_CORRECTED)
+
+/obj/item/clothing/glasses/meson/engine/tray/prescription/Initialize(mapload)
+	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
+	return ..()
diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_glasses.dm
@@ -188,7 +188,7 @@
 
 /datum/loadout_item/glasses/science_glasses
 	name = "Prescription Science glasses"
-	item_path = /obj/item/clothing/glasses/hud/science/prescription
+	item_path = /obj/item/clothing/glasses/science/prescription
 	restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST)
 
 /datum/loadout_item/glasses/aviator_security

diff --git a/modular_nova/modules/modular_items/code/modular_glasses.dm b/modular_nova/modules/modular_items/code/modular_glasses.dm
@@ -95,13 +95,17 @@
 	if(!ishuman(user) || human.glasses != src) // Make sure they're a human wearing the glasses first
 		return
 	for(var/trait in clothing_traits)
+		if(trait == TRAIT_NEARSIGHTED_CORRECTED) // this isn't a HUD!
+			continue
 		ADD_CLOTHING_TRAIT(human, trait)
 
 /obj/item/clothing/glasses/hud/ar/proc/remove_hud(mob/user)
 	var/mob/living/carbon/human/human = user
 	if(!ishuman(user) || human.glasses != src) // Make sure they're a human wearing the glasses first
 		return
 	for(var/trait in clothing_traits)
+		if(trait == TRAIT_NEARSIGHTED_CORRECTED) // this isn't a HUD!
+			continue
 		REMOVE_CLOTHING_TRAIT(human, trait)
 
 /obj/item/clothing/glasses/hud/ar/proc/reset_vars()

diff --git a/modular_nova/modules/reagent_forging/code/anvil.dm b/modular_nova/modules/reagent_forging/code/anvil.dm
@@ -104,7 +104,7 @@
 
 			locate_obj.repair_damage(locate_obj.get_integrity() + 10)
 			user.mind.adjust_experience(/datum/skill/smithing, 5) //repairing does give some experience
-			playsound(src, 'modular_nova/modules/reagent_forging/sound/forge.ogg', 50, TRUE, ignore_walls = FALSE)
+			play_lewd_sound(src, 'modular_nova/modules/reagent_forging/sound/forge.ogg', 50, TRUE, pref_to_check = /datum/preference/toggle/sound_ambience)
 
 	return ITEM_INTERACT_SUCCESS
 

diff --git a/modular_nova/modules/taur_mechanics/code/constrict.dm b/modular_nova/modules/taur_mechanics/code/constrict.dm
@@ -18,7 +18,7 @@
 	/// The tail we use to constrict mobs with. Nullable, if inactive.
 	var/obj/structure/serpentine_tail/tail
 	/// The base time it takes for us to constrict a mob.
-	var/base_coil_delay = 3.25 SECONDS
+	var/base_coil_delay = 2.2 SECONDS
 
 /datum/action/innate/constrict/Destroy()
 	qdel(tail) // we already listen for COMSIG_QDELETING on our tail, so it already sets it to null via the signal