diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 01414359438..2fd5c401a48 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,8 +11,9 @@ ## Changelog :cl: -add: Added new things +add: Added new mechanics or gameplay changes add: Added more things +expansion: Expands content of an existing thing del: Removed old things qol: made something easier to use balance: rebalanced something diff --git a/.github/gbp.toml b/.github/gbp.toml index 77f01bed54c..ec09082c152 100644 --- a/.github/gbp.toml +++ b/.github/gbp.toml @@ -5,7 +5,7 @@ reset_label = "GBP: Reset" "Atomic" = 2 "Balance/Rebalance" = -8 "Code Improvement" = 2 -"Feature" = -10 +"Mechanic" = -10 "Feedback" = 2 "Fix" = 3 "Grammar and Formatting" = 1 @@ -14,6 +14,7 @@ reset_label = "GBP: Reset" "Priority: CRITICAL" = 20 "Priority: High" = 15 "Quality of Life" = 1 +"Content Expansion" = -3 "Refactor" = 10 "Sound" = 3 "Sprites" = 3 diff --git a/tgui/packages/tgui/interfaces/Changelog.js b/tgui/packages/tgui/interfaces/Changelog.js index 49381d02ac3..60c58df7d6d 100644 --- a/tgui/packages/tgui/interfaces/Changelog.js +++ b/tgui/packages/tgui/interfaces/Changelog.js @@ -22,6 +22,7 @@ const icons = { soundadd: { icon: 'tg-sound-plus', color: 'green' }, sounddel: { icon: 'tg-sound-minus', color: 'red' }, add: { icon: 'check-circle', color: 'green' }, + expansion: { icon: 'check-circle', color: 'green' }, rscadd: { icon: 'check-circle', color: 'green' }, rscdel: { icon: 'times-circle', color: 'red' }, imageadd: { icon: 'tg-image-plus', color: 'green' }, diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index 2c616567c21..98a09aab6fe 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -698,7 +698,7 @@ function checkchangelog($payload, $compile = true) { case 'adds': case 'rscadd': if($item != 'Added new things' && $item != 'Added more things') { - $tags[] = 'Feature'; + $tags[] = 'Mechanic'; $currentchangelogblock[] = array('type' => 'rscadd', 'body' => $item); } break; @@ -744,6 +744,12 @@ function checkchangelog($payload, $compile = true) { $currentchangelogblock[] = array('type' => 'code_imp', 'body' => $item); } break; + case 'expansion': + if($item != 'Expands content of an existing feature'){ + $tags[] = 'Content Expansion'; + $currentchangelogblock[] = array('type' => 'expansion', 'body' => $item); + } + break; case 'refactor': if($item != 'refactored some code'){ $tags[] = 'Refactor'; diff --git a/tools/ss13_genchangelog.py b/tools/ss13_genchangelog.py index fdd1bec6bb8..b1f41ed5ae9 100644 --- a/tools/ss13_genchangelog.py +++ b/tools/ss13_genchangelog.py @@ -53,6 +53,7 @@ validPrefixes = [ 'rscdel', 'imageadd', 'imagedel', + 'expansion', 'spellcheck', 'experiment', 'balance',