From 3c1ca70051a28dd662efd9b5567e83955776083f Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sun, 8 Dec 2024 01:41:40 -0600 Subject: [PATCH 1/4] makes them use less power --- .../modular_species/species_types/android/android.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm index 1cfd3a7168848..bec7e1f53d992 100644 --- 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 5 MEGA JOULES /// The amount at which mob energy decreases -#define ENERGY_DRAIN_AMT 5 KILO JOULES +#define ENERGY_DRAIN_AMT 2.5 KILO JOULES /datum/species/android name = "Android" From 93aaffe5f074634391306c531511197f4c4d6798 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sun, 8 Dec 2024 01:43:46 -0600 Subject: [PATCH 2/4] revive and no alerts --- .../modular_species/species_types/android/android.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm index bec7e1f53d992..e933811ea43cb 100644 --- a/modular_doppler/modular_species/species_types/android/android.dm +++ b/modular_doppler/modular_species/species_types/android/android.dm @@ -71,6 +71,7 @@ QDEL_NULL(energy_tracker) /datum/species/android/spec_revival(mob/living/carbon/human/target) + core_energy += 0.5 MEGA JOULES playsound(target.loc, 'sound/machines/chime.ogg', 50, TRUE) target.visible_message(span_notice("[target]'s LEDs flicker to life!"), span_notice("All systems nominal. You're back online!")) @@ -91,11 +92,6 @@ 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. From 3958c3a22b4950ee688a43801110b7b575801e14 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sun, 8 Dec 2024 01:44:22 -0600 Subject: [PATCH 3/4] makes it conditional --- .../modular_species/species_types/android/android.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_doppler/modular_species/species_types/android/android.dm b/modular_doppler/modular_species/species_types/android/android.dm index e933811ea43cb..a936a1d870cab 100644 --- a/modular_doppler/modular_species/species_types/android/android.dm +++ b/modular_doppler/modular_species/species_types/android/android.dm @@ -71,7 +71,8 @@ QDEL_NULL(energy_tracker) /datum/species/android/spec_revival(mob/living/carbon/human/target) - core_energy += 0.5 MEGA JOULES + if(core_energy < 0.5 MEGA JOULES) + core_energy += 0.5 MEGA JOULES playsound(target.loc, 'sound/machines/chime.ogg', 50, TRUE) target.visible_message(span_notice("[target]'s LEDs flicker to life!"), span_notice("All systems nominal. You're back online!")) From 05371b3550357b43a99dcf051a4fab076b3ccbaa Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Tue, 10 Dec 2024 22:51:04 -0600 Subject: [PATCH 4/4] adds a cool hud with low power light --- .../species_types/android/android_hud.dm | 7 ++++++- .../android/icons/android_hud.dmi | Bin 223 -> 1170 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modular_doppler/modular_species/species_types/android/android_hud.dm b/modular_doppler/modular_species/species_types/android/android_hud.dm index 4b4786cf0d952..77c1da9166a57 100644 --- a/modular_doppler/modular_species/species_types/android/android_hud.dm +++ b/modular_doppler/modular_species/species_types/android/android_hud.dm @@ -1,5 +1,5 @@ /// 1 tile down -#define UI_ENERGY_DISPLAY "WEST:6,CENTER-1:0" +#define UI_ENERGY_DISPLAY "WEST:0,CENTER-1:0" ///Maptext define for Hemophage HUDs #define FORMAT_ANDROID_HUD_TEXT(valuecolor, value) MAPTEXT("
[round((value/1000000), 0.01)]MJ
") @@ -11,9 +11,14 @@ name = "Energy Tracker" icon_state = "energy_display" screen_loc = UI_ENERGY_DISPLAY + maptext_width = 48 /atom/movable/screen/android/energy/proc/update_energy_hud(core_energy) maptext = FORMAT_ANDROID_HUD_TEXT(hud_text_color(core_energy), core_energy) + if(core_energy <= 1.5 MEGA JOULES) + icon_state = "energy_display_low" + else + icon_state = "energy_display" /atom/movable/screen/android/energy/proc/hud_text_color(core_energy) return core_energy > 1.5 MEGA JOULES ? "#ffffff" : "#b64b4b" diff --git a/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi b/modular_doppler/modular_species/species_types/android/icons/android_hud.dmi index b524cf632804176f86b1a60dc348f9161bb8d676..7a084923201966da3a6e597c38428757a76c7bcb 100644 GIT binary patch delta 1099 zcmV-R1ho6#0g?$NiBL{Q4GJ0x0000DNk~Le0001B0000$2nGNE0Od4t4gdfEhmk=v z4{>D000BVNkl5-vX5MV(J)#(`Bvc3P-0QLUH=E5;ZEdYxcKKqnvVPP+(VvtRviRK%bz#H?T*%>FE9%F zGq<{>x@7u&4bXV}yj|&k#Ib$!ZSu#0i)`Jpk$N6y>FSjWE3I45*FQ|M7sU7M>vuE` zym%;WgsA9e4$S35*FB)L<>|v`V?`-$>J{1+%qPXSU^18bE!b4@sCVr`ZL`gr7`IJog_8Sy+ zMFV^p8z-u+vd6IIb4}EKz*f4H`$S29%d1DeGS$mx?6K%seT{W0 zJ(1w?sqI>8VVvwOr^b?yIb&xW9bPb3-*vglbXe|}BVrbV8EqF*$?$%+luU(W%@f>M%G!Y7rOw|~9U z%OI%w?FJb6oTKOSQ@$=7MGI0nSY-XmAt;I#v=~tI+YP{f4lLM(qi8`YkoAim5bVMz z7UY7eKb{4JKuJ9y2#N)%K+zxffDkC!1Kzz)Tl{&JzfpLnNGKMBu0JUg&!AWky8fj1 z(hDDAcO_2x-JfKx8`-sD8b*< zWr10!`h5@LoyJ8KRa6{tQ*Mm@hM0Iv$mGSjFB$@<#et;2w#E|3b z(J>}J02O1`gi$aiKL8aY@&k}DHZ~LmBk}`~F(y9%m3S7Unb-$tChh^6fsYME2R=3w z9r*kJbYdT%nb-$tCiVfEfzJ;>$C&&8RN(Ui(AR|F^8?Tuz&8ywDdZ1@e}ly3Al3T4 Re*gdq002ovPDHLkV1oH?3fuqy delta 144 zcmbQld7sg-Gr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32{Ae;6R%9z7!yr zu_VYZn8D%MjWi&qXrihKZ&6S04h!QT