TGS Test Merge (#8291)

code/game/area/almayer.dm

@@ -68,6 +68,11 @@
 	icon_state = "airoom"
 	fake_zlevel = 1 // upperdeck
 
+/area/almayer/command/cicconference
+	name = "\improper CIC Conference Room"
+	icon_state = "cic"
+	fake_zlevel = 1 // upperdeck
+
 /area/almayer/command/airoom
 	name = "\improper AI Core"
 	icon_state = "airoom"
@@ -80,7 +85,7 @@
 	resin_construction_allowed = FALSE
 
 /area/almayer/command/securestorage
-	name = "\improper Upper Deck Secure Storage"
+	name = "\improper Computer Lab Secure Storage"
 	icon_state = "corporatespace"
 	fake_zlevel = 1 // upperdeck
 
@@ -560,11 +565,6 @@
 	icon_state = "livingspace"
 	fake_zlevel = 2
 
-/area/almayer/living/auxiliary_officer_office
-	name = "\improper Lower Deck Auxiliary Support Officer office"
-	icon_state = "livingspace"
-	fake_zlevel = 2
-
 /area/almayer/living/cryo_cells
 	name = "\improper Lower Deck Cryo Cells"
 	icon_state = "cryo"
@@ -615,6 +615,16 @@
 	icon_state = "officerstudy"
 	fake_zlevel = 1 // upperdeck
 
+/area/almayer/living/auxiliary_officer_office
+	name = "\improper Upper Deck Auxiliary Support Officer office"
+	icon_state = "livingspace"
+	fake_zlevel = 1 // upperdeck
+
+/area/almayer/living/intel
+	name = "\improper Intelligence Officer's Bunks"
+	icon_state = "livingspace"
+	fake_zlevel = 1 // upperdeck
+
 /area/almayer/living/cafeteria_port
 	name = "\improper Cafeteria Port"
 	icon_state = "food"
@@ -640,6 +650,11 @@
 	icon_state = "briefing"
 	fake_zlevel = 2 // lowerdeck
 
+/area/almayer/living/offices/cryo
+	name = "\improper Support Crew Cryogenics Bay"
+	icon_state = "cryo"
+	fake_zlevel = 2 // lowerdeck
+
 /area/almayer/living/offices/flight
 	name = "\improper Flight Office"
 

code/modules/clothing/glasses/hud.dm

@@ -108,6 +108,19 @@
 		if(report)
 			report.read_paper(user)
 
+/obj/item/clothing/glasses/hud/health/basic
+	name = "\improper Basic HealthMate HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. This one is a simpler model."
+	hud_type = MOB_HUD_MEDICAL_BASIC
+	req_skill = NONE
+	req_skill_level = NONE
+	actions_types = list(/datum/action/item_action/toggle)
+
+/obj/item/clothing/glasses/hud/health/basic/prescription
+	name = "\improper Prescription Basic HealthMate HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. This simpler model contains prescription lenses."
+	prescription = TRUE
+
 /obj/item/clothing/glasses/hud/health/science
 	name = "custom HealthMate HUD" // combined HealthMateHUD and Reagent Scanner HUD for CMO
 	desc = "These HealthMate HUD googles are modified with a light-weight titantium-alloy frame that is custom fitted with extra wiring and low profile components from a reagent analyzer, allowing them to combine the functionality of a HealthMate and reagent scanner HUD without compromising on the form of the googles."