From d0022f08bc4d20d7efa8b76e6f37cbdd44ce0094 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 19 May 2022 11:57:25 -0300 Subject: [PATCH 1/4] No. --- modular_sand/code/modules/mob/living/silicon/ai/ai.dm | 2 ++ tgstation.dme | 1 + 2 files changed, 3 insertions(+) create mode 100644 modular_sand/code/modules/mob/living/silicon/ai/ai.dm diff --git a/modular_sand/code/modules/mob/living/silicon/ai/ai.dm b/modular_sand/code/modules/mob/living/silicon/ai/ai.dm new file mode 100644 index 0000000000..30c0a87779 --- /dev/null +++ b/modular_sand/code/modules/mob/living/silicon/ai/ai.dm @@ -0,0 +1,2 @@ +/mob/living/silicon/ai + vore_flags = NO_VORE diff --git a/tgstation.dme b/tgstation.dme index 58670b195d..9fb1f0fb4c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4080,6 +4080,7 @@ #include "modular_sand\code\modules\mob\living\carbon\human\life.dm" #include "modular_sand\code\modules\mob\living\carbon\human\species.dm" #include "modular_sand\code\modules\mob\living\silicon\silicon.dm" +#include "modular_sand\code\modules\mob\living\silicon\ai\ai.dm" #include "modular_sand\code\modules\mob\living\silicon\ai\vox_sounds.dm" #include "modular_sand\code\modules\mob\living\silicon\robot\robot.dm" #include "modular_sand\code\modules\mob\living\silicon\robot\robot_modules.dm" From 280878d7ca98fdd4d1e0ecef664f6c962c30106c Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Thu, 19 May 2022 08:00:45 -0700 Subject: [PATCH 2/4] Fixes silicon flavor text (#253) --- code/modules/client/preferences_savefile.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 756876d355..1b836fd019 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -859,7 +859,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["silicon_feature_flavor_text"] >> features["silicon_flavor_text"] S["feature_ooc_notes"] >> features["ooc_notes"] - S["silicon_flavor_text"] >> features["silicon_flavor_text"] S["vore_flags"] >> vore_flags S["vore_taste"] >> vore_taste From 9b92e4a10ff7d46aed6ed4599b1ebeadefea9463 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Thu, 19 May 2022 15:02:16 +0000 Subject: [PATCH 3/4] Automatic changelog generation for PR #253 [ci skip] --- html/changelogs/AutoChangeLog-pr-253.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-253.yml diff --git a/html/changelogs/AutoChangeLog-pr-253.yml b/html/changelogs/AutoChangeLog-pr-253.yml new file mode 100644 index 0000000000..bd7ffacadd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-253.yml @@ -0,0 +1,4 @@ +author: BongaTheProto +delete-after: true +changes: + - bugfix: Fixes silicon flavor text so it properly saves and loads through rounds From d548aa2d59cec732f20f48bed1c6bfd88fb25b35 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Thu, 19 May 2022 15:03:39 +0000 Subject: [PATCH 4/4] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-253.yml | 4 ---- html/changelogs/archive/2022-05.yml | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-253.yml diff --git a/html/changelogs/AutoChangeLog-pr-253.yml b/html/changelogs/AutoChangeLog-pr-253.yml deleted file mode 100644 index bd7ffacadd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-253.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: BongaTheProto -delete-after: true -changes: - - bugfix: Fixes silicon flavor text so it properly saves and loads through rounds diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 3f6cfaa782..5d9b50d201 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -60,3 +60,4 @@ 2022-05-19: BongaTheProto: - admin: Added logging for stepping/trampling on people + - bugfix: Fixes silicon flavor text so it properly saves and loads through rounds