From 535a5d43e96a01c038b6662c388ff5b5bb915792 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 28 Feb 2022 00:36:44 +0000 Subject: [PATCH 1/4] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15495.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15503.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15505.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15522.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15526.yml | 5 ----- html/changelogs/AutoChangeLog-pr-15528.yml | 4 ---- html/changelogs/archive/2022-02.yml | 16 ++++++++++++++++ 7 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15495.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15503.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15505.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15522.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15526.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15528.yml diff --git a/html/changelogs/AutoChangeLog-pr-15495.yml b/html/changelogs/AutoChangeLog-pr-15495.yml deleted file mode 100644 index f9a025c584..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15495.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Configurable weekly high-chaos days" diff --git a/html/changelogs/AutoChangeLog-pr-15503.yml b/html/changelogs/AutoChangeLog-pr-15503.yml deleted file mode 100644 index 96dc78ff65..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15503.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arturlang" -delete-after: True -changes: - - rscadd: "The limbgrower can make human chest parts that you can build onto into a person." diff --git a/html/changelogs/AutoChangeLog-pr-15505.yml b/html/changelogs/AutoChangeLog-pr-15505.yml deleted file mode 100644 index 2c5f1ae47c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15505.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot and Crowbar764" -delete-after: True -changes: - - rscadd: "TGUI for the player playtimes menu." diff --git a/html/changelogs/AutoChangeLog-pr-15522.yml b/html/changelogs/AutoChangeLog-pr-15522.yml deleted file mode 100644 index 40705aba5f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15522.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "bunny232" -delete-after: True -changes: - - rscadd: "Cold weather gear can now provide insulation against temperatures of up to 57C (330K)" diff --git a/html/changelogs/AutoChangeLog-pr-15526.yml b/html/changelogs/AutoChangeLog-pr-15526.yml deleted file mode 100644 index 60d49802c0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15526.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - rscadd: "adds a cartridge for the bartender's PDA that lets them search drink recipes" - - rscadd: "updates chemist cartridge to be able to search all chemical recipes" diff --git a/html/changelogs/AutoChangeLog-pr-15528.yml b/html/changelogs/AutoChangeLog-pr-15528.yml deleted file mode 100644 index 5b22ff00dc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15528.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - refactor: "Kills off SLOT_ in favor of ITEM_SLOT_" diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index d46305bd06..12ad63274c 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -158,3 +158,19 @@ Putnam3145: - balance: Now slightly easier to get 50,000 points with toxins (50,000 point baseline changed from 200 light range to 175) +2022-02-28: + Arturlang: + - rscadd: The limbgrower can make human chest parts that you can build onto into + a person. + Putnam3145: + - rscadd: Configurable weekly high-chaos days + SandPoot: + - refactor: Kills off SLOT_ in favor of ITEM_SLOT_ + SandPoot and Crowbar764: + - rscadd: TGUI for the player playtimes menu. + bunny232: + - rscadd: Cold weather gear can now provide insulation against temperatures of up + to 57C (330K) + timothyteakettle: + - rscadd: adds a cartridge for the bartender's PDA that lets them search drink recipes + - rscadd: updates chemist cartridge to be able to search all chemical recipes From 778bf1777b758589043a0736e7b7b37afdfb7087 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 28 Feb 2022 22:01:57 +0000 Subject: [PATCH 2/4] fixes coiling issue (#15530) * why * new signals for resting and stop pulling these are to be used as signals that will cancel the coiling * Create coiling.dm * Update coiling.dm * adds sprite accessory for coiled naga * main changes that apply the actual visuals to the coiling mechanics * adds message to coiling, fixes offset, adds action icon * coil offset was using old direction * reordering * fixes coil sprite not disappearing * fixes offsets, solves loadout issue * follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant * fix * Update preferences.dm * no slimes you're not allowed the hidden sprite --- code/modules/client/preferences.dm | 2 ++ .../dead/new_player/sprite_accessories/_sprite_accessories.dm | 2 +- .../mob/living/carbon/human/innate_abilities/customization.dm | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3cec5c3e50..3f31540fe2 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2136,6 +2136,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/sprite_accessory/S = instance if(!show_mismatched_markings && S.recommended_species && !S.recommended_species.Find(pref_species.id)) continue + if(S.ignore) + continue if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey))) snowflake_taur_list[S.name] = path var/new_taur diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm index f5e1c2e113..08ae75d728 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm @@ -29,7 +29,7 @@ if(path == prototype && skip_prototype) continue var/datum/sprite_accessory/P = path - if((roundstart && initial(P.locked)) || initial(P.ignore)) + if((roundstart && initial(P.locked))) continue var/datum/sprite_accessory/D = new path() diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 363f6ecbb2..463cdfde1e 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -135,6 +135,8 @@ var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path] if(istype(instance, /datum/sprite_accessory)) var/datum/sprite_accessory/S = instance + if(S.ignore) + continue if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey))) snowflake_taur_list[S.name] = path var/new_taur From 8bb99cb05b5cdcd4af9747a8aee0075a1a61f01d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 28 Feb 2022 16:02:00 -0600 Subject: [PATCH 3/4] Automatic changelog generation for PR #15530 [ci skip] --- html/changelogs/AutoChangeLog-pr-15530.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15530.yml diff --git a/html/changelogs/AutoChangeLog-pr-15530.yml b/html/changelogs/AutoChangeLog-pr-15530.yml new file mode 100644 index 0000000000..3452231463 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15530.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "coiling icon appears properly" From c8ca35e14db6ca40904c73a3fe70bbf6210f20a4 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 1 Mar 2022 00:44:37 +0000 Subject: [PATCH 4/4] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15530.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15530.yml diff --git a/html/changelogs/AutoChangeLog-pr-15530.yml b/html/changelogs/AutoChangeLog-pr-15530.yml deleted file mode 100644 index 3452231463..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15530.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "coiling icon appears properly"