Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes again #160

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Various fixes again #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
651cdef
various fixes once again
carpotoxin Oct 14, 2024
e3ece8c
Merge remote-tracking branch 'DopplerShift13/master'
carpotoxin Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/mob/mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
hud_list[hud] = list()

else
var/image/I = image('icons/mob/huds/hud.dmi', src, "")
var/image/I = image('modular_doppler/overwrites/huds/hud.dmi', src, "") // DOPPLER EDIT, old code: var/image/I = image('icons/mob/huds/hud.dmi', src, "")
I.appearance_flags = RESET_COLOR|RESET_TRANSFORM
hud_list[hud] = I
set_hud_image_active(hud, update_huds = FALSE) //by default everything is active. but dont add it to huds to keep control.
Expand Down
3 changes: 3 additions & 0 deletions modular_doppler/modular_species/species_types/android/android.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
TRAIT_RESISTHEAT,
TRAIT_RESISTCOLD,
TRAIT_RESISTHIGHPRESSURE,*/
TRAIT_UNHUSKABLE,
TRAIT_STABLEHEART,
TRAIT_STABLELIVER,
)
Expand Down Expand Up @@ -84,6 +85,8 @@
to_chat(target, span_warning("Alert: Critical damage taken! Cooling systems failing!"))
do_sparks(3, FALSE, target)

if(target.stat == DEAD)
return
if(HAS_TRAIT(target, TRAIT_CHARGING))
return
if(core_energy > 0)
Expand Down
Binary file modified modular_doppler/overwrites/huds/hud.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type IconSettings = {
};

const normalIcon: IconSettings = {
dmi: 'modular_doppler/overwrites/huds/hud.dmi' /* Doppler station edit, old code: dmi: 'icons/mob/huds/hud.dmi', */,
dmi: 'icons/mob/huds/hud.dmi',
transform: 'scale(2.3) translateX(9px) translateY(1px)',
};

Expand Down
Loading