Merge pull request #191 from LordLag/master

Borer and others

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

@@ -178,9 +178,9 @@ REAGENT SCANNER
 			user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
 //	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
 //		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
-	if (M.has_brain_worms())
-		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
-	else if (M.getBrainLoss() >= 100 || !M.has_brain())
+//	if (M.has_brain_worms())
+//		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") //Cortical borer disable
+	if (M.getBrainLoss() >= 100 || !M.has_brain())
 		user.show_message("\red Subject is brain dead.")
 	else if (M.getBrainLoss() >= 60)
 		user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.")

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/monkey.dm

@@ -19,4 +19,4 @@
 /datum/language/tajaran/monkey
 	name = "Farwa"
 	desc = "Meow meow meow."
-	key = "9"
+	key = "^"

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 = "9"
 	flags = WHITELISTED
 	syllables = list("kic","klic","\'tic","kit","lit","xic","vil","xrit","tshh","qix","qlit","zix","\'","!")
 

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

@@ -1635,13 +1635,13 @@
 			holder2.icon_state = "hudxeno"
 		else if(foundVirus)
 			holder.icon_state = "hudill"
-		else if(has_brain_worms())
-			var/mob/living/simple_animal/borer/B = has_brain_worms()
+	/*	else if(has_brain_worms())
+			var/mob/living/simple_animal/borer/B = has_brain_worms() //Cotrical borer disable
 			if(B.controlling)
 				holder.icon_state = "hudbrainworm"
 			else
 				holder.icon_state = "hudhealthy"
-			holder2.icon_state = "hudbrainworm"
+			holder2.icon_state = "hudbrainworm" */
 		else
 			holder.icon_state = "hudhealthy"
 			if(virus2.len)

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
 

code/modules/mob/living/simple_animal/borer/borer_powers.dm

@@ -126,7 +126,7 @@
 		src << "They are no longer in range!"
 		return
 
-/*
+
 /mob/living/simple_animal/borer/verb/devour_brain()
 	set category = "Abilities"
 	set name = "Devour Brain"
@@ -150,7 +150,7 @@
 
 	src << "<span class = 'danger'>It only takes a few moments to render the dead host brain down into a nutrient-rich slurry...</span>"
 	replace_brain()
-*/
+
 
 // BRAIN WORM ZOMBIES AAAAH.
 /mob/living/simple_animal/borer/proc/replace_brain()

code/modules/projectiles/guns/energy/temperature.dm

@@ -1,18 +1,18 @@
 /obj/item/weapon/gun/energy/temperature
-	name = "temperature gun"
+	name = "freeze ray"
 	icon_state = "freezegun"
 	fire_sound = 'sound/weapons/pulse3.ogg'
-	desc = "A gun that changes temperatures. It has a small label on the side, 'More extreme temperatures will cost more charge!'"
-	var/temperature = T20C
-	var/current_temperature = T20C
-	charge_cost = 100
+	desc = "For when somebody won't let it go."
+	//var/temperature = T20C
+	//var/current_temperature = T20C
+	charge_cost = 25 //20 shots, exact replica of old code (WAS 100)
 	origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
 	slot_flags = SLOT_BELT|SLOT_BACK
 
 	projectile_type = /obj/item/projectile/temp
-	cell_type = /obj/item/weapon/cell/high
-
+	cell_type = /obj/item/weapon/cell/crap //WAS High, but brought down to match energy use
 
+/*
 /obj/item/weapon/gun/energy/temperature/New()
 	..()
 	processing_objects.Add(src)
@@ -38,7 +38,7 @@
 
 	user << browse(dat, "window=freezegun;size=450x300;can_resize=1;can_close=1;can_minimize=1")
 	onclose(user, "window=freezegun", src)
-
+*/
 
 /obj/item/weapon/gun/energy/temperature/Topic(href, href_list)
 	if (..())
@@ -47,7 +47,7 @@
 	src.add_fingerprint(usr)
 
 
-
+/*
 	if(href_list["temp"])
 		var/amount = text2num(href_list["temp"])
 		if(amount > 0)
@@ -77,3 +77,4 @@
 				temperature += 10
 		else
 			temperature = current_temperature
+*/

code/modules/projectiles/projectile/special.dm

@@ -28,7 +28,7 @@
 	name ="high-ex round"
 	icon_state= "bolter"
 	damage = 15
-	
+
 	on_hit(var/atom/target, var/blocked = 0)
 		explosion(target, -1, 0, 2)
 		sleep(0)
@@ -44,13 +44,13 @@
 	damage_type = BURN
 	nodamage = 1
 	check_armour = "energy"
-	var/temperature = 300
+	//var/temperature = 300
 
 
 	on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
 		if(istype(target, /mob/living))
 			var/mob/M = target
-			M.bodytemperature = temperature
+			M.bodytemperature = -273
 		return 1
 
 /obj/item/projectile/meteor

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

@@ -0,0 +1,8 @@
+author: Lord Lag
+
+delete-after: True
+
+changes: 
+  - rscadd: "Glasses may once again be combined with HUDs"
+  - rscadd: "Borers have a full compliment of abilities once more."
+  - bugfix: ":9 is the new new Vaurcese hotkey."

html/changelogs/[Lord Lag]-[Fixes #120].yml

@@ -0,0 +1,7 @@
+author: Lord Lag
+
+delete-after: True
+
+changes: 
+  - tweak: "The broken Temperature gun has been replaced with the Freeze ray"
+