Merge branch 'Bubberstation:master' into master

.github/workflows/compile_changelogs.yml

@@ -2,7 +2,7 @@ name: Compile changelogs
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+  - cron: "0 8 * * *"
   workflow_dispatch:
 
 jobs:
@@ -49,11 +49,11 @@ jobs:
       - name: Commit
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
-          git config --local user.name "tgstation-ci[bot]"
-          git config --local user.email "179393467+tgstation-ci[bot]@users.noreply.github.com"
+          git config --local user.name "Bubberbot"
+          git config --local user.email "151680451+Bubberbot@users.noreply.github.com"
           git pull origin master
           git add html/changelogs
-          git commit -m "Automatic changelog compile [ci skip]" -a || true
+          git commit -m "Bubberstation automatic changelog compile [ci skip]" -a || true
 
       - name: Generate App Token
         id: app-token-generation

html/changelogs/AutoChangeLog-pr-2254.yml

@@ -0,0 +1,5 @@
+author: "CydiaButt13"
+delete-after: True
+changes:
+  - rscadd: "*yip"
+  - rscadd: "*yipyip"

html/changelogs/AutoChangeLog-pr-2269.yml

@@ -0,0 +1,4 @@
+author: "xPokee"
+delete-after: True
+changes:
+  - rscadd: "added a GAGSified miniskirt to the loadout menu"

modular_skyrat/modules/emotes/code/emotes.dm

@@ -583,4 +583,4 @@
 	message = "meows loudly!"
 	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
-	sound = 'modular_skyrat/modules/emotes/sound/voice/mggaow.ogg'
+	sound = 'modular_skyrat/modules/emotes/sound/voice/mggaow.ogg'

modular_skyrat/modules/emotes/sound/emotes/license.txt

@@ -0,0 +1,2 @@
+yipyip is "Yip Yip" from http://soundboards.cubicleninja.com/
+yip sounds sourced from kobold generator: https://introdile.itch.io/kobold-generator

modular_zubbers/code/datums/greyscale/json_configs/miniskirt.json

@@ -0,0 +1,42 @@
+{
+	"miniskirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_trim",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	],
+	"miniskirt_d": [
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_base_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_belt_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_trim_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

modular_zubbers/code/datums/greyscale/json_configs/miniskirt_worn.json

@@ -0,0 +1,42 @@
+{
+	"miniskirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_trim",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	],
+	"miniskirt_d": [
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_base_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_belt_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "miniskirt_trim_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

modular_zubbers/code/modules/GAGS/greyscale_configs.dm

@@ -90,3 +90,12 @@
 	icon_file = 'modular_zubbers/code/modules/GAGS/icons/monkehenchmenmob.dmi'
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/henchmen/henchmen.json'
 
+/datum/greyscale_config/miniskirt
+	name = "Miniskirt"
+	icon_file = 'modular_zubbers/icons/obj/clothing/under/skirts_dresses.dmi'
+	json_config = 'modular_zubbers/code/datums/greyscale/json_configs/miniskirt.json'
+
+/datum/greyscale_config/miniskirt_worn
+	name = "Worn Miniskirt"
+	icon_file = 'modular_zubbers/icons/mob/clothing/under/skirts_dresses.dmi'
+	json_config = 'modular_zubbers/code/datums/greyscale/json_configs/miniskirt_worn.json'

modular_zubbers/code/modules/clothing/under/skirts_dresses.dm

@@ -7,3 +7,16 @@
 	desc = "A richly made dress of quality fabrics, but not much of them."
 	icon_state = "dress_strapped"
 	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/dress/miniskirt
+	name = "miniskirt"
+	desc = "This skirt is quite small, even by skirt standards."
+	icon_state = "miniskirt"
+	greyscale_colors = "#39393f#ffffff#ffffff"
+	greyscale_config = /datum/greyscale_config/miniskirt
+	greyscale_config_worn = /datum/greyscale_config/miniskirt_worn
+	flags_1 = IS_PLAYER_COLORABLE_1
+	alt_covers_chest = TRUE
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+	gets_cropped_on_taurs = FALSE
+	can_adjust = TRUE

modular_zubbers/code/modules/emotes/emotes.dm

@@ -132,3 +132,24 @@
 	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
 	sound = 'modular_zubbers/code/modules/emotes/sound/voice/squeal.ogg' // See https://github.com/shiptest-ss13/Shiptest/pull/2159
+
+/datum/emote/living/yipyip
+	key = "yipyip"
+	key_third_person = "yips twice"
+	message = "yips twice!"
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+	sound = 'modular_zubbers/code/modules/emotes/sound/voice/yip.ogg'
+
+/datum/emote/living/yip
+	key = "yip"
+	key_third_person = "yips"
+	message = "yips!"
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
+
+/datum/emote/living/yip/get_sound(mob/living/user)
+	return pick('modular_zubbers/code/modules/emotes/sound/voice/yip1.ogg',
+				'modular_zubbers/code/modules/emotes/sound/voice/yip2.ogg',
+				'modular_zubbers/code/modules/emotes/sound/voice/yip2.ogg')

modular_zubbers/code/modules/loadout/categories/under.dm

@@ -57,3 +57,7 @@
 /datum/loadout_item/uniform/miscellaneous/loincloth/cloth
 	name = "loincloth"
 	item_path = /obj/item/clothing/under/costume/loincloth/cloth/sensor
+
+/datum/loadout_item/uniform/miscellaneous/miniskirt
+	name = "recolourable miniskirt"
+	item_path = /obj/item/clothing/under/dress/miniskirt