From f390bb620eea64b3eb5bb0f53cb92727e3066283 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 17 Sep 2020 00:14:22 +0000 Subject: [PATCH 1/3] Automatic changelog compile [ci skip] --- html/changelog.html | 47 ++++++++++++++-------- html/changelogs/.all_changelog.yml | 23 +++++++++++ html/changelogs/AutoChangeLog-pr-13255.yml | 4 -- html/changelogs/AutoChangeLog-pr-13356.yml | 11 ----- html/changelogs/AutoChangeLog-pr-13362.yml | 4 -- html/changelogs/AutoChangeLog-pr-13365.yml | 4 -- html/changelogs/AutoChangeLog-pr-13387.yml | 4 -- html/changelogs/AutoChangeLog-pr-13388.yml | 5 --- 8 files changed, 54 insertions(+), 48 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13255.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13356.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13362.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13365.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13387.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13388.yml diff --git a/html/changelog.html b/html/changelog.html index 04f018f7ba..8775145e00 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,37 @@ -->
+

17 September 2020

+

DeltaFire15 updated:

+ +

EmeraldSundisk updated:

+ +

MrJWhit updated:

+ +

Putnam3145 updated:

+ +

timothyteakettle updated:

+ +

16 September 2020

timothyteakettle updated:

- -

16 July 2020

-

DeltaFire15 updated:

- -

Sneakyrat6 updated:

- -

timothyteakettle updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 8c2e0680a6..d4197fd1aa 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27321,3 +27321,26 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2020-09-16: timothyteakettle: - tweak: fixed an icon path +2020-09-17: + DeltaFire15: + - rscadd: Failing the plushmium reaction can now create peculiar plushies, depending + on reaction volume. + - bugfix: The mood-buff from petting a plushie now works properly again. + - bugfix: Fixed wacky necropolis loot chest behavior + EmeraldSundisk: + - rscadd: Adds the Research Director's office to Omega Station + - rscadd: Adds 2 new solar arrays (and control rooms) + - rscadd: Adds some action figures that weren't there previously + - rscadd: The CMO's office now has a light switch + - tweak: Slight readjustments to impacted areas + - tweak: Readjusts the toxins air supply line to (ideally) be easier to service + - bugfix: Department camera consoles should now be able to actually check appropriate + cameras + - bugfix: Xenobiology can now be locked down (by the Research Director) + MrJWhit: + - rscadd: Adds a brain damage line + Putnam3145: + - bugfix: Your balls finally feel full, again. + timothyteakettle: + - rscadd: due to changes in policy, and several lawsuits, Nanotrasen has been forced + to allow disabled people to sign up diff --git a/html/changelogs/AutoChangeLog-pr-13255.yml b/html/changelogs/AutoChangeLog-pr-13255.yml deleted file mode 100644 index 6f4c7a4b51..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13255.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - rscadd: "due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up" diff --git a/html/changelogs/AutoChangeLog-pr-13356.yml b/html/changelogs/AutoChangeLog-pr-13356.yml deleted file mode 100644 index cb8769d0e3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13356.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: "EmeraldSundisk" -delete-after: True -changes: - - rscadd: "Adds the Research Director's office to Omega Station" - - rscadd: "Adds 2 new solar arrays (and control rooms)" - - rscadd: "Adds some action figures that weren't there previously" - - rscadd: "The CMO's office now has a light switch" - - tweak: "Slight readjustments to impacted areas" - - tweak: "Readjusts the toxins air supply line to (ideally) be easier to service" - - bugfix: "Department camera consoles should now be able to actually check appropriate cameras" - - bugfix: "Xenobiology can now be locked down (by the Research Director)" diff --git a/html/changelogs/AutoChangeLog-pr-13362.yml b/html/changelogs/AutoChangeLog-pr-13362.yml deleted file mode 100644 index b8fbfc3de2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13362.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Your balls finally feel full, again." diff --git a/html/changelogs/AutoChangeLog-pr-13365.yml b/html/changelogs/AutoChangeLog-pr-13365.yml deleted file mode 100644 index af5974aa87..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13365.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Fixed wacky necropolis loot chest behavior" diff --git a/html/changelogs/AutoChangeLog-pr-13387.yml b/html/changelogs/AutoChangeLog-pr-13387.yml deleted file mode 100644 index 26a059e935..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13387.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MrJWhit" -delete-after: True -changes: - - rscadd: "Adds a brain damage line" diff --git a/html/changelogs/AutoChangeLog-pr-13388.yml b/html/changelogs/AutoChangeLog-pr-13388.yml deleted file mode 100644 index f032d958c1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13388.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - rscadd: "Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume." - - bugfix: "The mood-buff from petting a plushie now works properly again." From 8b309a0cace873e9a0b8381616931a84b9c46103 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 18 Sep 2020 00:14:43 +0000 Subject: [PATCH 2/3] Automatic changelog compile [ci skip] --- html/changelog.html | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 8775145e00..550e911e4a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1390,23 +1390,6 @@
  • martial arts twenty minpop
  • records
    • - -

    17 July 2020

    -

    ShizCalev, Fikou updated:

    - -

    timothyteakettle updated:

    - GoonStation 13 Development Team From a82dc79dbb2f4b03a81e46f4a59860aadfe215d5 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 18 Sep 2020 00:51:59 -0500 Subject: [PATCH 3/3] Hopefully fixes icon overlay issue for the halo --- icons/obj/custom.dmi | Bin 26382 -> 26781 bytes .../modules/custom_loadout/custom_items.dm | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi index 9067a4beca60384bac5cb9e8e463e1448c9fedd3..788c3e67952d0d7c75aa8df3c1af689faff3f514 100644 GIT binary patch delta 7766 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 Y7C^wNU9gG6Q$WZ^ML|=(76J|X4>n%%p8x;= delta 7364 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 diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 9b326e76da..9de4cb235b 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -556,6 +556,5 @@ desc = "An oddly shaped halo that magically hovers above the head." icon_state = "halo" item_state = "halo" - icon = 'icons/mob/clothing/custom_w.dmi' - mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' - mutantrace_variation = NONE \ No newline at end of file + icon = 'icons/obj/custom.dmi' + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' \ No newline at end of file