initial

DopplerShift13 · Oct 13, 2024 · df0357b · df0357b
1 parent 1c023a9
commit df0357b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 9 deletions.
diff --git a/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm b/modular_doppler/modular_customization/accessories/code/monkey_accessories/monkey_tail.dm
@@ -7,6 +7,6 @@
 /datum/sprite_accessory/tails/monkey/big // big .dmi starts here
 	icon = 'modular_doppler/modular_customization/accessories/icons/monkey/monkey_tail_big.dmi'
 	name = "Ring Tail"
-	icon_state = "bigring"
+	icon_state = "bigring_large"
 	dimension_x = 64
 	center = TRUE
diff --git a/modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi b/modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi
diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm
@@ -1,7 +1,7 @@
 /// The starter amount for the android's core
-#define ENERGY_START_AMT 10 MEGA JOULES
+#define ENERGY_START_AMT 5 MEGA JOULES
 /// The amount at which mob energy decreases
-#define ENERGY_DRAIN_AMT 10 KILO JOULES
+#define ENERGY_DRAIN_AMT 5 KILO JOULES
 
 /datum/species/android
 	name = "Android"
@@ -88,6 +88,12 @@
 		return
 	if(core_energy > 0)
 		core_energy -= ENERGY_DRAIN_AMT
+	// alerts
+	if(core_energy <= 0.75 MEGA JOULES)
+		if(prob(10))
+			target.balloon_alert_to_viewers("power low!")
+			playsound(target, 'sound/machines/beep/triple_beep.ogg', 50, FALSE)
+	// alerts end, death begins
 	if(core_energy <= 0)
 		target.death() // You can do a lot in a day.
 

diff --git a/modular_doppler/modular_species/species_types/android/android_hud.dm b/modular_doppler/modular_species/species_types/android/android_hud.dm
@@ -13,10 +13,10 @@
 	screen_loc = UI_ENERGY_DISPLAY
 
 /atom/movable/screen/android/energy/proc/update_energy_hud(core_energy)
-	maptext = FORMAT_ANDROID_HUD_TEXT(hud_text_color(), core_energy)
+	maptext = FORMAT_ANDROID_HUD_TEXT(hud_text_color(core_energy), core_energy)
 
 /atom/movable/screen/android/energy/proc/hud_text_color(core_energy)
-	return core_energy < 2.5 MEGA JOULES ? "#ffffff" : "#FFAAAA"
+	return core_energy > 1.5 MEGA JOULES ? "#ffffff" : "#b64b4b"
 
 #undef UI_ENERGY_DISPLAY
 #undef FORMAT_ANDROID_HUD_TEXT
diff --git a/modular_doppler/modular_species/species_types/android/android_parts.dm b/modular_doppler/modular_species/species_types/android/android_parts.dm
@@ -37,6 +37,17 @@
 // head
 /obj/item/bodypart/head/robot/android
 	biological_state = (BIO_ROBOTIC|BIO_BLOODED)
+	// var for monitor heads and their emissive states
+	var/monitor_state
+
+/obj/item/bodypart/head/robot/android/get_limb_icon(dropped)
+	. = ..()
+	// emissive handling
+	if(!monitor_state || monitor_state == "none")
+		return .
+	var/monitor_type = istype(src, /obj/item/bodypart/head/robot/android/synth_lizard) ? "lizard_em" : "monitor_em"
+	. += emissive_appearance('modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi', monitor_type, owner, alpha = owner.alpha)
+	return
 
 /obj/item/bodypart/head/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
 	. = ..()

diff --git a/modular_doppler/modular_species/species_types/android/monitor_component.dm b/modular_doppler/modular_species/species_types/android/monitor_component.dm
@@ -57,6 +57,7 @@ GLOBAL_LIST_INIT(monitor_lizard_displays, list(
 	icon = 'modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi'
 	icon_state = "none"
 	layers = EXTERNAL_ADJACENT
+	blocks_emissive = EMISSIVE_BLOCK_NONE
 
 // the component
 /datum/component/monitor_head
@@ -179,9 +180,12 @@ GLOBAL_LIST_INIT(monitor_lizard_displays, list(
 	monitor_head.add_bodypart_overlay(display_overlay)
 
 /datum/action/innate/monitor_head/proc/change_screen(mob/living/carbon/wearer, screen)
-	playsound(wearer, 'modular_doppler/modular_sounds/sound/mobs/humanoids/android/monitor_switch.ogg', 100, TRUE)
+	var/obj/item/bodypart/head/robot/android/monitor_head = wearer.get_bodypart(BODY_ZONE_HEAD)
+
 	display_overlay.icon_state = screen
+	monitor_head.monitor_state = screen
 
+	playsound(wearer, 'modular_doppler/modular_sounds/sound/mobs/humanoids/android/monitor_switch.ogg', 100, TRUE)
 	wearer.update_body_parts()
 
 /datum/action/innate/monitor_head/Remove(mob/remove_from)

diff --git a/modular_doppler/modular_species/species_types/android/power_cord.dm b/modular_doppler/modular_species/species_types/android/power_cord.dm
@@ -1,5 +1,5 @@
 // Charge level defines
-#define POWER_CORD_CHARGE_MAX 10 MEGA JOULES
+#define POWER_CORD_CHARGE_MAX 5 MEGA JOULES
 #define POWER_CORD_CHARGE_RATE (STANDARD_CELL_RATE * 1.5)
 #define POWER_CORD_CHARGE_DELAY 0.55 SECONDS
 #define POWER_CORD_APC_MINIMUM_PERCENT 5

diff --git a/modular_doppler/modular_species/species_types/hemophage/hemophage_hud.dm b/modular_doppler/modular_species/species_types/hemophage/hemophage_hud.dm
@@ -13,10 +13,10 @@
 	screen_loc = UI_BLOOD_DISPLAY
 
 /atom/movable/screen/hemophage/blood/proc/update_blood_hud(blood_volume)
-	maptext = FORMAT_HEMOPHAGE_HUD_TEXT(hud_text_color(), blood_volume)
+	maptext = FORMAT_HEMOPHAGE_HUD_TEXT(hud_text_color(blood_volume), blood_volume)
 
 /atom/movable/screen/hemophage/blood/proc/hud_text_color(blood_volume)
-	return blood_volume > BLOOD_VOLUME_SAFE ? "#FFDDDD" : "#FFAAAA"
+	return blood_volume > BLOOD_VOLUME_SAFE ? "#FFDDDD" : "#b16565"
 
 #undef UI_BLOOD_DISPLAY
 #undef FORMAT_HEMOPHAGE_HUD_TEXT