Adds #183, Vaurca is back to P (not fixed), Slime damage tweaked.

code/modules/clothing/glasses/glasses.dm

@@ -110,6 +110,24 @@
 	prescription = 1
 	body_parts_covered = 0
 
+/obj/item/clothing/glasses/regular/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/clothing/glasses/hud/health))
+		user.drop_item()
+		del(W)
+		user << "<span class='notice'>You attach a set of medical HUDs to your glasses.</span>"
+		var/turf/T = get_turf(src)
+		new /obj/item/clothing/glasses/hud/health/prescription(T)
+		user.drop_from_inventory(src)
+		del(src)
+	if(istype(W, /obj/item/clothing/glasses/hud/security))
+		user.drop_item()
+		del(W)
+		user << "<span class='notice'>You attach a set of security HUDs to your glasses.</span>"
+		var/turf/T = get_turf(src)
+		new /obj/item/clothing/glasses/hud/security/prescription(T)
+		user.drop_from_inventory(src)
+		del(src)
+
 /obj/item/clothing/glasses/regular/scanners
 	name = "Scanning Goggles"
 	desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it."

code/modules/clothing/glasses/hud.dm

@@ -20,6 +20,21 @@
 /obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
 	process_med_hud(M, 1)
 
+/obj/item/clothing/glasses/hud/health/prescription
+	name = "prescription glasses/HUD assembly"
+	desc = "A medical HUD clipped onto the side of prescription glasses."
+	prescription = 1
+	icon_state = "healthhudpresc"
+	item_state = "healthhudpresc"
+
+/obj/item/clothing/glasses/hud/health/prescription/attack_self(mob/user)
+	user << "<span class='notice'>You detach a set of medical HUDs form your glasses.</span>"
+	var/turf/T = get_turf(src)
+	new /obj/item/clothing/glasses/hud/health(T)
+	new /obj/item/clothing/glasses/regular(T)
+	user.drop_item(src)
+	del(src)
+
 /obj/item/clothing/glasses/hud/security
 	name = "Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
@@ -27,6 +42,21 @@
 	body_parts_covered = 0
 	var/global/list/jobs[0]
 
+/obj/item/clothing/glasses/hud/security/prescription
+	name = "prescription glasses/HUD assembly"
+	desc = "A security HUD clipped onto the side of prescription glasses."
+	prescription = 1
+	icon_state = "sechudpresc"
+	item_state = "sechudpresc"
+
+/obj/item/clothing/glasses/hud/security/prescription/attack_self(mob/user)
+	user << "<span class='notice'>You detach a set of security HUDs form your glasses.</span>"
+	var/turf/T = get_turf(src)
+	new /obj/item/clothing/glasses/hud/health(T)
+	new /obj/item/clothing/glasses/regular(T)
+	user.drop_item(src)
+	del(src)
+
 /obj/item/clothing/glasses/hud/security/jensenshades
 	name = "Augmented shades"
 	desc = "Polarized bioneural eyewear, designed to augment your vision."

code/modules/mob/language/station.dm

@@ -71,7 +71,7 @@
 	desc = "Vaurca native language made of clicks and sputters, \"It's a bugs life.\""
 	speech_verb = "clicks"
 	colour = "vaurca"
-	key = "m"
+	key = "p"
 	flags = WHITELISTED
 	syllables = list("kic","klic","\'tic","kit","lit","xic","vil","xrit","tshh","qix","qlit","zix","\'","!")
 

code/modules/mob/living/carbon/metroid/life.dm

@@ -52,13 +52,13 @@
 
 	//Account for massive pressure differences
 
-	if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc
+	if(bodytemperature < hurt_temperature) // start calculating temperature damage etc
 
-		if(bodytemperature <= (T0C - 50)) // hurt temperature
-			if(bodytemperature <= 50) // sqrting negative numbers is bad
+		if(bodytemperature <= die_temperature)
+			if(bodytemperature <= 50)
 				adjustToxLoss(200)
 			else
-				adjustToxLoss(round(sqrt(bodytemperature)) * 2)
+				adjustToxLoss(30)
 
 	updatehealth()
 
@@ -234,7 +234,7 @@
 				if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 					targets += L // Possible target found!
 
-				if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men
+				if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men
 					var/mob/living/carbon/human/H = L
 					if(H.species.name == "Slime")
 						continue

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -48,6 +48,8 @@
 	var/Atkcool = 0 // attack cooldown
 	var/SStun = 0 // NPC stun variable. Used to calm them down when they are attacked while feeding, or they will immediately re-attach
 	var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while. The part about freeze gun is a lie
+	var/hurt_temperature = T0C-50 // slime keeps taking damage when its bodytemperature is below this
+	var/die_temperature = 50 // slime dies instantly when its bodytemperature is below this
 
 	///////////TIME FOR SUBSPECIES
 

html/changelogs/[Lord Lag]-[Adds #183].yml

@@ -0,0 +1,6 @@
+author: Lord Lag
+
+delete-after: True
+
+changes: 
+  - rscadd: "Glasses may once again be combined with HUDs"