From b40a42209d0be37f129c467ca6f888dc239e00c8 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 19 Aug 2020 03:19:51 +0100 Subject: [PATCH 1/4] fixes two snout paths --- code/modules/mob/dead/new_player/sprite_accessories/snouts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm index 2e14a88f29..7319652ebe 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm @@ -192,13 +192,13 @@ extra = TRUE extra_color_src = MUTCOLORS3 -/datum/sprite_accessory/mam_snouts/skulldog +/datum/sprite_accessory/snouts/mam_snouts/skulldog name = "Skulldog" icon_state = "skulldog" extra = TRUE extra_color_src = MATRIXED -/datum/sprite_accessory/mam_snouts/lcanid +/datum/sprite_accessory/snouts/mam_snouts/lcanid name = "Mammal, Long" icon_state = "lcanid" From 5414a8949c1cf3a501e1b4468c853d540f18349b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 19 Aug 2020 08:50:26 -0700 Subject: [PATCH 2/4] Update text.dm --- code/modules/research/nanites/extra_settings/text.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/research/nanites/extra_settings/text.dm b/code/modules/research/nanites/extra_settings/text.dm index 56aa3dd07f..d3cad27bcf 100644 --- a/code/modules/research/nanites/extra_settings/text.dm +++ b/code/modules/research/nanites/extra_settings/text.dm @@ -10,6 +10,9 @@ /datum/nanite_extra_setting/text/get_copy() return new /datum/nanite_extra_setting/text(value) +/datum/nanite_extra_setting/text/get_value() + return html_encode(value) + /datum/nanite_extra_setting/text/get_frontend_list(name) return list(list( "name" = name, From a0823ea54b95f4f03565c6a0380f9234a6e4df3d Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 20 Aug 2020 00:14:25 +0000 Subject: [PATCH 3/4] Automatic changelog compile [ci skip] --- html/changelog.html | 37 +++++++++++----------- html/changelogs/.all_changelog.yml | 11 +++++++ html/changelogs/AutoChangeLog-pr-13194.yml | 4 --- html/changelogs/AutoChangeLog-pr-13202.yml | 4 --- html/changelogs/AutoChangeLog-pr-13207.yml | 4 --- html/changelogs/AutoChangeLog-pr-13210.yml | 4 --- html/changelogs/AutoChangeLog-pr-13214.yml | 4 --- 7 files changed, 30 insertions(+), 38 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13194.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13202.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13207.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13210.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13214.yml diff --git a/html/changelog.html b/html/changelog.html index 43bac219ab..c3f2151b35 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,25 @@ -->
+

20 August 2020

+

DeltaFire15 updated:

+ +

Fikou updated:

+ +

Hatterhat updated:

+ +

tiramisuapimancer updated:

+ +

18 August 2020

DeltaFire15 updated:

- -

18 June 2020

-

Detective-Google updated:

- -

SmArtKar updated:

- -

timothyteakettle updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f8749c8dc5..559f77437d 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -26998,3 +26998,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - refactor: snowflake code for mutant bodypart selection has been rewritten to be ~14x shorter - tweak: meat type and horns can now be selected by any species +2020-08-20: + DeltaFire15: + - bugfix: The cooking oil damage formula is no longer scuffed. + - tweak: Changed the clockie help-link to lead to our own wiki. + Fikou: + - admin: admins can now do html in ahelps properly + Hatterhat: + - balance: Pirate threats are now announced as "business propositions", and their + arrivals are now also announced properly. + tiramisuapimancer: + - bugfix: Ethereal hair is now their body color instead of accidentally white diff --git a/html/changelogs/AutoChangeLog-pr-13194.yml b/html/changelogs/AutoChangeLog-pr-13194.yml deleted file mode 100644 index 8769abd6d5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13194.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - tweak: "Changed the clockie help-link to lead to our own wiki." diff --git a/html/changelogs/AutoChangeLog-pr-13202.yml b/html/changelogs/AutoChangeLog-pr-13202.yml deleted file mode 100644 index 8713ea2bd9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13202.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "tiramisuapimancer" -delete-after: True -changes: - - bugfix: "Ethereal hair is now their body color instead of accidentally white" diff --git a/html/changelogs/AutoChangeLog-pr-13207.yml b/html/changelogs/AutoChangeLog-pr-13207.yml deleted file mode 100644 index 9f354f34bb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13207.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fikou" -delete-after: True -changes: - - admin: "admins can now do html in ahelps properly" diff --git a/html/changelogs/AutoChangeLog-pr-13210.yml b/html/changelogs/AutoChangeLog-pr-13210.yml deleted file mode 100644 index a43ae215f5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13210.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "Pirate threats are now announced as \"business propositions\", and their arrivals are now also announced properly." diff --git a/html/changelogs/AutoChangeLog-pr-13214.yml b/html/changelogs/AutoChangeLog-pr-13214.yml deleted file mode 100644 index 8bbf605fe4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13214.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "The cooking oil damage formula is no longer scuffed." From 23648a0c447579b6cf80ba77d0d8f4813aa655a6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 19 Aug 2020 21:56:16 -0500 Subject: [PATCH 4/4] Automatic changelog generation for PR #13208 [ci skip] --- html/changelogs/AutoChangeLog-pr-13208.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13208.yml diff --git a/html/changelogs/AutoChangeLog-pr-13208.yml b/html/changelogs/AutoChangeLog-pr-13208.yml new file mode 100644 index 0000000000..e6eed72515 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13208.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "two snouts can once again be chosen in customization"