TGS Test Merge (#6783)

code/game/machinery/ARES/ARES_interface_apollo.dm

@@ -1,6 +1,6 @@
 // #################### Working Joe Ticket Console #####################
 /obj/structure/machinery/computer/working_joe
-	name = "APOLLO Maintenance Controller"
+	name = "\improper APOLLO Maintenance Controller"
 	desc = "A console built to facilitate Working Joes and their operation, allowing for simple allocation of resources."
 	icon = 'icons/obj/structures/machinery/ares.dmi'
 	icon_state = "console"
@@ -473,3 +473,9 @@
 			to_chat(id_owner, SPAN_HELPFUL("AI visitation access granted."))
 			playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
 	return TRUE
+
+/obj/structure/machinery/computer/working_joe/bulky
+	desc = "The IBM series 10 computer retrofitted to work as a console to facilitate Working Joes and their operation, allowing for easy allocation of resources. While somewhat dated it still serves its purpose."
+	icon = 'icons/obj/structures/machinery/ares.dmi'
+	icon_state = "console_bulky"
+	density = TRUE

code/game/machinery/computer/camera_console.dm

@@ -315,12 +315,18 @@
 	network = list("NUKE")
 	circuit = null
 
-
 /obj/structure/machinery/computer/cameras/almayer
 	density = FALSE
 	icon_state = "security_cam"
 	network = list(CAMERA_NET_ALMAYER)
 
+/obj/structure/machinery/computer/cameras/almayer/bulky
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	desc = "The IBM series 10 computer retrofitted to work as a security cameras console for the ship. While somewhat dated it still serves its purpose."
+	icon_state = "cameras_bulky"
+	density = TRUE
+	circuit = null
+
 /obj/structure/machinery/computer/cameras/almayer/containment
 	name = "Containment Cameras"
 	network = list(CAMERA_NET_CONTAINMENT)

code/game/machinery/computer/medical.dm

@@ -507,3 +507,12 @@
 	desc = "Cheap Weyland-Yutani Laptop."
 	icon_state = "medlaptop"
 	density = FALSE
+
+/obj/structure/machinery/computer/med_data/bulky
+	name = "medical records computer"
+	desc = "The IBM series 10 computer retrofitted to be used to check the medical records of all crew. While somewhat dated it still serves its purpose."
+	icon_state = "medcomp_bulky"
+	deconstructible = FALSE
+	unslashable = TRUE
+	unacidable = TRUE
+	breakable = FALSE

code/game/supplyshuttle.dm

@@ -149,7 +149,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 			computer.black_market_lockout = TRUE
 
 /obj/structure/machinery/computer/ordercomp
-	name = "Supply ordering console"
+	name = "supply ordering console"
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "request"
 	density = TRUE
@@ -158,6 +158,15 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 	var/reqtime = 0 //Cooldown for requisitions - Quarxink
 	var/last_viewed_group = "categories"
 
+/obj/structure/machinery/computer/ordercomp/bulky
+	desc = "The IBM series 10 computer retrofitted to be used as a console for the Automated Storage Retrieval System. While somewhat dated it still serves its purpose."
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "request_bulky"
+	deconstructible = FALSE
+	unslashable = TRUE
+	unacidable = TRUE
+	breakable = FALSE
+
 /obj/structure/machinery/computer/supply_drop_console
 	name = "Supply Drop Console"
 	desc = "An old-fashioned computer hooked into the nearby Supply Drop system."

code/modules/cm_marines/altitude_control_console.dm

@@ -13,16 +13,27 @@ GLOBAL_VAR_INIT(alt_ctrl_disabled, FALSE)
 #define COOLING -10
 #define OVERHEAT_COOLING -5
 #define HEATING 10
+#define B_HEATING 20
 #define OVERHEAT 100
 
 //Has the ships temperature set to 0 on startup, sets the global default var to med
 GLOBAL_VAR_INIT(ship_temp, 0)
 GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 
 /obj/structure/machinery/computer/altitude_control_console
-	icon_state = "overwatch"
-	name = "Altitude Control Console"
-	desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science."
+	icon_state = "almayer_altitude"
+	name = "\improper Altitude Control Console"
+	desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science... or maybe it is."
+	density = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	breakable = FALSE
+
+/obj/structure/machinery/computer/altitude_control_console/ex_act()
+	return
+
+/obj/structure/machinery/computer/altitude_control_console/bullet_act()
+	return
 
 /obj/structure/machinery/computer/altitude_control_console/attack_hand()
 	. = ..()
@@ -44,34 +55,52 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 
 /obj/structure/machinery/computer/altitude_control_console/process()
 	. = ..()
+	//Updating temperature
 	var/temperature_change
-	if(GLOB.ship_temp >= OVERHEAT)
-		ai_silent_announcement("Attention: orbital correction no longer sustainable, moving to geo-synchronous orbit until engine cooloff.", ";", TRUE)
+	switch(GLOB.ship_alt)
+		if(SHIP_ALT_LOW)
+			if(prob(50))
+				temperature_change = HEATING
+			else
+				temperature_change = B_HEATING
+		if(SHIP_ALT_MED)
+			temperature_change = COOLING
+		if(SHIP_ALT_HIGH)
+			if(prob(75))
+				temperature_change = OVERHEAT_COOLING
+			else
+				temperature_change = COOLING
+	GLOB.ship_temp = clamp(GLOB.ship_temp += temperature_change, 0, OVERHEAT)
+
+	//Override orbit, announce low orbit
+	if(GLOB.ship_alt == SHIP_ALT_HIGH && GLOB.ship_temp == 0)
+		ai_silent_announcement("Attention: Engine cooloff completed, automatic stabilization to most optimal geo-synchronous orbit undergoing.", ";", TRUE)
+		GLOB.ship_alt = SHIP_ALT_MED
+		TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS)
+		for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
+			if(!is_mainship_level(current_mob.z))
+				continue
+			current_mob.apply_effect(3, SLOW)
+			shake_camera(current_mob, 10, 2)
+		return
+	if(GLOB.ship_alt == SHIP_ALT_LOW && GLOB.ship_temp >= OVERHEAT)
+		ai_silent_announcement("Attention: Low altitude orbital maneuver no longer sustainable, moving to furthest geo-synchronous orbit until engine cooloff.", ";", TRUE)
 		GLOB.ship_alt = SHIP_ALT_HIGH
-		temperature_change = OVERHEAT_COOLING
+		TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS)
 		for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 			if(!is_mainship_level(current_mob.z))
 				continue
-			current_mob.apply_effect(3, WEAKEN)
+			current_mob.apply_effect(3, SLOW)
 			shake_camera(current_mob, 10, 2)
-		ai_silent_announcement("Attention performing high-G maneuverer", ";", TRUE)
-	if(!temperature_change)
-		switch(GLOB.ship_alt)
-			if(SHIP_ALT_LOW)
-				temperature_change = HEATING
-			if(SHIP_ALT_MED)
-				temperature_change = COOLING
-			if(SHIP_ALT_HIGH)
-				temperature_change = COOLING
-	GLOB.ship_temp = clamp(GLOB.ship_temp += temperature_change, 0, 120)
+		return
 	if(prob(50))
 		return
-	if(GLOB.ship_alt == SHIP_ALT_LOW)
+	else if(GLOB.ship_alt == SHIP_ALT_LOW)
 		for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 			if(!is_mainship_level(current_mob.z))
 				continue
-			shake_camera(current_mob, 10, 1)
-		ai_silent_announcement("Performing Attitude Control", ";", TRUE)
+			shake_camera(current_mob, 10, 2)
+			ai_silent_announcement("Low altitude maneuver currently under performance, full stabilization of the altitude unable to be achieved, maintaining procedures until overheat.", ";", TRUE)
 
 //TGUI.... fun... years have gone by, I am dying of old age
 /obj/structure/machinery/computer/altitude_control_console/tgui_interact(mob/user, datum/tgui/ui)
@@ -100,35 +129,34 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED)
 
 	if(.)
 		return
-	var/mob/user = usr
-	switch(action)
-		if("low_alt")
-			change_altitude(user, SHIP_ALT_LOW)
-			. = TRUE
-		if("med_alt")
-			change_altitude(user, SHIP_ALT_MED)
-			. = TRUE
-		if("high_alt")
-			change_altitude(user, SHIP_ALT_HIGH)
-			. = TRUE
-	message_admins("[key_name(user)] has changed the ship's altitude to [action].")
-
-	add_fingerprint(usr)
+	var/mob/user = ui.user
+	if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_ALTITUDE_CHANGE))
+		message_admins("[key_name(user)] tried to change the ship's altitude, but it is still on cooldown.")
+		to_chat(user, SPAN_WARNING("Engines pending recalibration to burn again, stand by."))
+	else
+		switch(action)
+			if("low_alt")
+				change_altitude(user, SHIP_ALT_LOW)
+				. = TRUE
+			if("med_alt")
+				change_altitude(user, SHIP_ALT_MED)
+				. = TRUE
+		message_admins("[key_name(user)] has changed the ship's altitude to [action].")
+
+	add_fingerprint(user)
 
 /obj/structure/machinery/computer/altitude_control_console/proc/change_altitude(mob/user, new_altitude)
-	if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_ALTITUDE_CHANGE))
-		to_chat(user, SPAN_WARNING("The engines are not ready to burn yet."))
-		return
 	if(GLOB.ship_alt == new_altitude)
 		return
 	GLOB.ship_alt = new_altitude
-	TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 90 SECONDS)
+	TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 40 SECONDS)
 	for(var/mob/living/carbon/current_mob in GLOB.living_mob_list)
 		if(!is_mainship_level(current_mob.z))
 			continue
-		current_mob.apply_effect(3, WEAKEN)
+		current_mob.apply_effect(3, SLOW)
+		to_chat(user, SPAN_WARNING("You have some difficulty on maintaining balance!"))
 		shake_camera(current_mob, 10, 2)
-	ai_silent_announcement("Attention: Performing high-G manoeuvre", ";", TRUE)
+		ai_silent_announcement("Attention: Altitude control protocols initialized, currently performing high-g orbital maneuver.", ";", TRUE)
 
 #undef COOLING
 #undef OVERHEAT_COOLING

code/modules/cm_marines/marines_consoles.dm

@@ -747,6 +747,36 @@
 	icon_state = "cmonitor"
 	density = FALSE
 
+/obj/structure/machinery/computer/crew/alt/update_icon()
+	if(stat & BROKEN)
+		icon_state = "cmonitorb"
+	else
+		if(stat & NOPOWER)
+			icon_state = "cmonitor0"
+			stat |= NOPOWER
+		else
+			icon_state = initial(icon_state)
+			stat &= ~NOPOWER
+
+/obj/structure/machinery/computer/crew/bulky
+	desc = "The IBM series 10 computer retrofitted to be used to monitor active health sensors built into the wearer's uniform. While somewhat dated it still serves its purpose."
+	icon_state = "crew_bulky"
+	deconstructible = FALSE
+	unslashable = TRUE
+	unacidable = TRUE
+	breakable = FALSE
+
+/obj/structure/machinery/computer/crew/bulky/update_icon()
+	if(stat & BROKEN)
+		icon_state = "crew_bulkyb"
+	else
+		if(stat & NOPOWER)
+			icon_state = "crew_bulky0"
+			stat |= NOPOWER
+		else
+			icon_state = initial(icon_state)
+			stat &= ~NOPOWER
+
 /obj/structure/machinery/computer/crew/alt/yautja
 	name = "\improper Yautja health monitor"
 	desc = "Used to monitor active health sensors of all Yautja in the system. You can see that the console highlights the human's ship areas with BLUE and the hunting locations with RED."

code/modules/cm_tech/trees/marine.dm

@@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(tech_controls_marine)
 /obj/structure/machinery/computer/view_objectives
 	name = "Intel Database Computer"
 	desc = "An USCM Intel Computer for consulting the current Intel database."
-	icon_state = "terminal1_old"
+	icon_state = "comm"
 	unslashable = TRUE
 	unacidable = TRUE
 

code/modules/objectives/objective_memory_storage.dm

@@ -115,7 +115,7 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new())
 	name = "Intel Computer"
 	var/label = ""
 	desc = "An USCM Intel Computer for data cataloguing and distribution."
-	icon_state = "terminal1_old"
+	icon_state = "comm"
 	unslashable = TRUE
 	unacidable = TRUE
 	var/typing_time = 20
@@ -235,7 +235,7 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new())
 /obj/structure/machinery/computer/view_objectives
 	name = "Intel Database Computer"
 	desc = "An USCM Intel Database Computer used for consulting the current intel database."
-	icon_state = "terminal1_old"
+	icon_state = "comm"
 	unslashable = TRUE
 	unacidable = TRUE
 

code/modules/shuttle/dropship_hijack.dm

@@ -70,7 +70,7 @@
 /datum/dropship_hijack/almayer/proc/fire()
 	if(!shuttle || !crash_site)
 		return FALSE
-	shuttle.callTime = DROPSHIP_CRASH_TRANSIT_DURATION * GLOB.ship_alt
+	shuttle.callTime = DROPSHIP_CRASH_TRANSIT_DURATION
 	SSshuttle.moveShuttle(shuttle.id, crash_site.id, TRUE)
 	if(GLOB.round_statistics)
 		GLOB.round_statistics.track_hijack()