Merge branch 'master' into hate-upstream

Browse Source

...

This commit is contained in:

BongaTheProto

2023-10-18 22:02:36 -05:00

parent 58bdf9876b 172f5f5701

commit ff03181384

23 changed files with 272 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/modules/mob/living/carbon/alien/update_icons.dm → code/modules/mob/living/carbon/alien/alien_update_icons.dm

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm → code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm

code/modules/mob/living/carbon/alien/larva/update_icons.dm → code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm

code/modules/mob/living/carbon/update_icons.dm → code/modules/mob/living/carbon/carbon_update_icons.dm

code/modules/mob/living/carbon/human/update_icons.dm → code/modules/mob/living/carbon/human/human_update_icons.dm

code/modules/mob/living/carbon/monkey/update_icons.dm → code/modules/mob/living/carbon/monkey/monkey_update_icons.dm

code/modules/mob/living/update_icons.dm → code/modules/mob/living/living_update_icons.dm

code/modules/mob/living/silicon/pai/update_icon.dm → code/modules/mob/living/silicon/pai/pai_update_icon.dm

code/modules/mob/living/silicon/robot/update_icons.dm → code/modules/mob/living/silicon/robot/robot_update_icons.dm

code/modules/mob/update_icons.dm → code/modules/mob/mob_update_icons.dm