From 8fef121064f6cf64592a45bdd08bec20fbb316fb Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 25 Sep 2020 10:45:13 -0500 Subject: [PATCH 1/3] Fixes missing hair when wearing halo --- modular_citadel/code/modules/custom_loadout/custom_items.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 8dfb613594..b1be3da6c8 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -565,4 +565,5 @@ icon_state = "halo" item_state = "halo" icon = 'icons/mob/clothing/custom_w.dmi' - mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' \ No newline at end of file + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' + dynamic_hair_suffix = "" \ No newline at end of file From 89557a8ee308f313f8133b34348aaca1230a0aaa Mon Sep 17 00:00:00 2001 From: LetterJay <9606363+LetterJay@users.noreply.github.com> Date: Fri, 25 Sep 2020 10:46:43 -0500 Subject: [PATCH 2/3] Update custom_items.dm --- modular_citadel/code/modules/custom_loadout/custom_items.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index b1be3da6c8..bc9f8bce49 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -566,4 +566,5 @@ item_state = "halo" icon = 'icons/mob/clothing/custom_w.dmi' mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' - dynamic_hair_suffix = "" \ No newline at end of file + dynamic_hair_suffix = "" + From 2ad1ca9ea2640c7db3c0a70422423130b028825b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 26 Sep 2020 00:14:41 +0000 Subject: [PATCH 3/3] Automatic changelog compile [ci skip] --- html/changelog.html | 16 ++++++---------- html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-13426.yml | 4 ---- 3 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13426.yml diff --git a/html/changelog.html b/html/changelog.html index 4dffb85ae0..963dc5d2f0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

26 September 2020

+

CoreFlare updated:

+
    +
  • IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle for no hair.
    • +
+

25 September 2020

Putnam3145 updated:

    @@ -1234,16 +1240,6 @@
    • removed legacy public mining shuttle area and remade lounge
    - -

    25 July 2020

    -

    CameronWoof updated:

    -
      -
    • Aloe now has an icon.
      • -
    -

    timothyteakettle updated:

    -
      -
    • beepsky replaces the word THREAT_LEVEL with the actual threat level
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b5492c9d68..a4429ab6b2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27368,3 +27368,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Putnam3145: - bugfix: Removed a non-working proc that already had its functionality implemented in another proc in the same file. +2020-09-26: + CoreFlare: + - rscadd: IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle + for no hair. diff --git a/html/changelogs/AutoChangeLog-pr-13426.yml b/html/changelogs/AutoChangeLog-pr-13426.yml deleted file mode 100644 index fcce56a747..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13426.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CoreFlare" -delete-after: True -changes: - - rscadd: "IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle for no hair."