Merge branch 'master' into underwear

_maps/doppler/automapper/automapper_config.toml

@@ -58,15 +58,15 @@ trait_name = "Station"
 map_files = ["icemoon_underground_icewalker_lower.dmm"]
 directory = "_maps/RandomRuins/IceRuins/doppler/"
 required_map = "Iceland.dmm"
-coordinates = [170, 16, 1]
+coordinates = [121, 203, 1]
 trait_name = "Mining"
 
 # Icecats Camp Upper Level: ICELAND ADDITION
 [templates.icebox_icecats_upper_iceland]
 map_files = ["icemoon_underground_icewalker_upper.dmm"]
 directory = "_maps/RandomRuins/IceRuins/doppler/"
 required_map = "Iceland.dmm"
-coordinates = [170, 16, 2]
+coordinates = [121, 203, 2]
 trait_name = "Mining"
 
 # TRAMSTATION MAP EDITS

_maps/mining_configs/iceland.json

@@ -22,7 +22,6 @@
 			"Down": true,
 			"Mining": true,
 			"No Parallax": true,
-			"Ice Ruins": true,
 			"Ice Ruins Underground": true,
 			"Baseturf": "/turf/open/openspace/icemoon/keep_below",
 			"Gravity": true,

code/datums/ruins/icemoon.dm

@@ -73,6 +73,12 @@
 	description = "Here lies Charles Morlbaro. He died the way he lived."
 	suffix = "icemoon_surface_smoking_room.dmm"
 
+/datum/map_template/ruin/icemoon/lavaland // DOPPLER EDIT TO NOT BE UNDERGROUND
+	name = "Ice-Ruin Lavaland Incursion"
+	id = "lavalandsite"
+	description = "I guess we never really left you huh?"
+	suffix = "icemoon_underground_lavaland.dmm"
+
 // above and below ground together
 
 /datum/map_template/ruin/icemoon/mining_site
@@ -122,12 +128,6 @@
 	description = "A place of shelter for a lone hermit, scraping by to live another day."
 	suffix = "icemoon_underground_hermit.dmm"
 
-/datum/map_template/ruin/icemoon/underground/lavaland
-	name = "Ice-Ruin Lavaland Incursion"
-	id = "lavalandsite"
-	description = "I guess we never really left you huh?"
-	suffix = "icemoon_underground_lavaland.dmm"
-
 /datum/map_template/ruin/icemoon/underground/puzzle
 	name = "Ice-Ruin Ancient Puzzle"
 	id = "puzzle"

code/modules/mob/living/living_say.dm

@@ -218,6 +218,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 		var/randomnote = pick("\u2669", "\u266A", "\u266B")
 		message = "[randomnote] [message] [randomnote]"
 		spans |= SPAN_SINGING
+		flick_overlay_static(mutable_appearance('modular_doppler/emotes/icons/mob_overlay.dmi', "sing", ABOVE_MOB_LAYER), 50)	// DOPPLER STATION ADDITION - sing overlay
 
 	if(message_mods[WHISPER_MODE]) // whisper away
 		spans |= SPAN_ITALICS

modular_doppler/emotes/code/overlay_emotes/overlay_emotes.dm

@@ -0,0 +1,74 @@
+#define MOB_OVERLAY_FILE 'modular_doppler/emotes/icons/mob_overlay.dmi'
+
+/// Overwrite
+/datum/emote/living/sing_tune/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "sing", ABOVE_MOB_LAYER)
+	user.flick_overlay_static(overlay, 50)
+
+/// Additions
+/datum/emote/living/sweatdrop
+	key = "sweatdrop"
+	key_third_person = "sweatdrops"
+	cant_muffle = TRUE
+
+/datum/emote/living/sweatdrop/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "sweatdrop", ABOVE_MOB_LAYER)
+	overlay.pixel_x = 10
+	overlay.pixel_y = 10
+	user.flick_overlay_static(overlay, 50)
+	playsound(get_turf(user), 'modular_doppler/emotes/sound/sweatdrop.ogg', 25, TRUE)
+
+/datum/emote/living/exclaim
+	key = "exclaim"
+	key_third_person = "exclaims"
+	cant_muffle = TRUE
+
+/datum/emote/living/exclaim/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "exclamation", ABOVE_MOB_LAYER)
+	overlay.pixel_x = 10
+	overlay.pixel_y = 28
+	user.flick_overlay_static(overlay, 50)
+	playsound(get_turf(user), 'sound/machines/chime.ogg', 25, TRUE)
+
+/datum/emote/living/question
+	key = "question"
+	key_third_person = "questions"
+	cant_muffle = TRUE
+
+/datum/emote/living/question/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "question", ABOVE_MOB_LAYER)
+	overlay.pixel_x = 10
+	overlay.pixel_y = 28
+	user.flick_overlay_static(overlay, 50)
+	playsound(get_turf(user), 'modular_doppler/emotes/sound/question.ogg', 25, TRUE)
+
+/datum/emote/living/realize
+	key = "realize"
+	key_third_person = "realizes"
+	cant_muffle = TRUE
+
+/datum/emote/living/realize/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "realize", ABOVE_MOB_LAYER)
+	overlay.pixel_y = 15
+	user.flick_overlay_static(overlay, 50)
+	playsound(get_turf(user), 'modular_doppler/emotes/sound/realize.ogg', 25, TRUE)
+
+/datum/emote/living/annoyed
+	key = "annoyed"
+	key_third_person = "is annoyed"
+	cant_muffle = TRUE
+
+/datum/emote/living/annoyed/run_emote(mob/living/user, params, type_override, intentional)
+	. = ..()
+	var/mutable_appearance/overlay = mutable_appearance(MOB_OVERLAY_FILE, "annoyed", ABOVE_MOB_LAYER)
+	overlay.pixel_x = 10
+	overlay.pixel_y = 10
+	user.flick_overlay_static(overlay, 50)
+	playsound(get_turf(user), 'modular_doppler/emotes/sound/annoyed.ogg', 25, TRUE)
+
+#undef MOB_OVERLAY_FILE

modular_doppler/loadout_categories/categories/heads.dm

@@ -81,3 +81,19 @@
 /datum/loadout_item/head/hair_tie_plastic
 	name = "Hairtie (Plastic)"
 	item_path = /obj/item/clothing/head/hair_tie/plastic_beads
+
+/datum/loadout_item/head/bow_large
+	name = "Bow (Large)"
+	item_path = /obj/item/clothing/head/bow
+
+/datum/loadout_item/head/bow_small
+	name = "Bow (Small)"
+	item_path = /obj/item/clothing/head/bow/small
+
+/datum/loadout_item/head/bow_back
+	name = "Bow (Back)"
+	item_path = /obj/item/clothing/head/bow/back
+
+/datum/loadout_item/head/bow_sweet
+	name = "Bow (Sweet)"
+	item_path = /obj/item/clothing/head/bow/sweet

modular_doppler/loadout_categories/categories/undersuit.dm

@@ -147,3 +147,19 @@
 /datum/loadout_item/undersuit/dress/sailor
 	name = "Heretical Dress"
 	item_path = /obj/item/clothing/under/dress/sailor
+
+/datum/loadout_item/undersuit/dress/tutu
+	name = "Pink Tutu"
+	item_path = /obj/item/clothing/under/dress/doppler/pinktutu
+
+/datum/loadout_item/undersuit/dress/flower
+	name = "Flower Dress"
+	item_path = /obj/item/clothing/under/dress/doppler/flower
+
+/datum/loadout_item/undersuit/dress/penta
+	name = "Pentagram Dress"
+	item_path = /obj/item/clothing/under/dress/doppler/pentagram
+
+/datum/loadout_item/undersuit/dress/strapless
+	name = "Strapless Dress"
+	item_path = /obj/item/clothing/under/dress/doppler/strapless

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_head.dm

@@ -20,3 +20,41 @@
 	name = "Hood (Worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
 	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/hood_worn.json'
+
+
+//BOWS
+/datum/greyscale_config/large_bow
+	name = "Large Bow"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/large_bow.json'
+
+/datum/greyscale_config/large_bow/worn
+	name = "Large Bow (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
+
+/datum/greyscale_config/back_bow
+	name = "Back Bow"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/back_bow.json'
+
+/datum/greyscale_config/back_bow/worn
+	name = "Back Bow (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
+
+/datum/greyscale_config/sweet_bow
+	name = "Sweet Bow"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/sweet_bow.json'
+
+/datum/greyscale_config/sweet_bow/worn
+	name = "Sweet Bow (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'
+
+/datum/greyscale_config/small_bow
+	name = "Small Bow"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/head.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/head/small_bow.json'
+
+/datum/greyscale_config/small_bow/worn
+	name = "Small Bow (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/head.dmi'

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm

@@ -108,3 +108,25 @@
 	name = "'JUNCO' megacargo pants (Worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'
 	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/big_pants_worn.json'
+
+///////////
+//DRESSES//
+///////////
+
+/datum/greyscale_config/strapless_dress
+	name = "Strapless Dress"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/strapless_dress.json'
+
+/datum/greyscale_config/strapless_dress/worn
+	name = "Strapless Dress (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'
+
+/datum/greyscale_config/pentagram_dress
+	name = "Pentagram Strapped Dress"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/pentagram_dress.json'
+
+/datum/greyscale_config/pentagram_dress/worn
+	name = "Pentagram Strapped Dress (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'

modular_doppler/modular_cosmetics/GAGS/json_configs/head/back_bow.json

@@ -0,0 +1,10 @@
+{
+	"back_bow": [
+		{
+			"type": "icon_state",
+			"icon_state": "back_bow",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/head/large_bow.json

@@ -0,0 +1,10 @@
+{
+	"large_bow": [
+		{
+			"type": "icon_state",
+			"icon_state": "large_bow",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/head/small_bow.json

@@ -0,0 +1,18 @@
+{
+	"small_bow": [
+		{
+			"type": "icon_state",
+			"icon_state": "small_bow",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"small_bow_t": [
+		{
+			"type": "icon_state",
+			"icon_state": "small_bow_t",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/head/sweet_bow.json

@@ -0,0 +1,10 @@
+{
+	"sweet_bow": [
+		{
+			"type": "icon_state",
+			"icon_state": "sweet_bow",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/pentagram_dress.json

@@ -0,0 +1,10 @@
+{
+	"dress_pentagram": [
+		{
+			"type": "icon_state",
+			"icon_state": "penta_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/strapless_dress.json

@@ -0,0 +1,16 @@
+{
+	"dress_strapless": [
+		{
+			"type": "icon_state",
+			"icon_state": "strapless_belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "strapless_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/code/belt/med_bandolier.dm

@@ -0,0 +1,25 @@
+/obj/item/storage/belt/med_bandolier
+	icon = 'modular_doppler/modular_cosmetics/icons/obj/belt/medical_extra.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/belt/medical_extra.dmi'
+	name = "medical bandolier"
+	desc = "A pocketed, pine green belt slung like a sash over the shoulder. Features numerous pockets for medicines and poisons alike. Now is coward healing time."
+	icon_state = "med_bandolier"
+	worn_icon_state = "med_bandolier"
+
+/obj/item/storage/belt/med_bandolier/Initialize(mapload)
+	. = ..()
+	atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
+	atom_storage.max_slots = 14
+	atom_storage.max_total_storage = 35
+	atom_storage.set_holdable(list(
+		/obj/item/dnainjector,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/pill,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/reagent_containers/medigel,
+		/obj/item/storage/pill_bottle,
+		/obj/item/implanter,
+		/obj/item/hypospray/mkii,
+		/obj/item/reagent_containers/cup/hypovial,
+		))