Merge pull request #1176 from NopemanMcHalt/pr-ex/random_stuff

[MODULAR] Two new mememotes and custom pin selection

modular_splurt/code/modules/client/loadout/accessory.dm

@@ -9,3 +9,9 @@
 /datum/gear/accessory/formalcrop
 	name = "Formal croptop"
 	path = /obj/item/clothing/accessory/formalcrop
+
+/datum/gear/accessory/genericpin
+	name = "Holographic pin"
+	path = /obj/item/clothing/accessory/pride/other
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+	cost = 0

modular_splurt/code/modules/clothing/under/accessories.dm

@@ -24,3 +24,24 @@
 	icon_state = "formalcrop"
 	item_state = "formalcrop"
 	minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/pride/other
+	name = "blank pin"
+	desc = "A holographic pin for showing off anything you wish. Comes with some basic selection."
+	icon = 'modular_splurt/icons/obj/clothing/accessories.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/accessories.dmi'
+	icon_state = "pin_blank"
+	always_reskinnable = TRUE
+	unique_reskin = list(
+		"blank"				= list("icon_state" = "pin_blank"),
+		"green"				= list("icon_state" = "pin_green"),
+		"yellow"			= list("icon_state" = "pin_yellow"),
+		"mute"				= list("icon_state" = "pin_mute"),
+		"xenophilia"		= list("icon_state" = "pin_xenophilia"),
+		"peace"				= list("icon_state" = "pin_peace"),
+		"shy"				= list("icon_state" = "pin_shy"),
+		"sub"				= list("icon_state" = "pin_sub"),
+		"dom"				= list("icon_state" = "pin_dom"),
+		"switch"			= list("icon_state" = "pin_switch"),
+		"missing texture"	= list("icon_state" = "pin_css")
+	)

modular_splurt/code/modules/mob/living/emotes.dm

@@ -1498,3 +1498,20 @@
 	emote_cooldown = 0.95 SECONDS
 	emote_pitch_variance = FALSE
 
+/datum/emote/living/audio/flabbergast
+	key = "flabbergast"
+	key_third_person = "is flabbergasted"
+	message = "looks flabbergasted!"
+	emote_sound = 'modular_splurt/sound/voice/flabbergasted.ogg'
+	emote_cooldown = 3.0 SECONDS
+	emote_pitch_variance = FALSE
+	emote_volume = 70
+
+/datum/emote/living/audio/sadness
+	key = "sadness"
+	key_third_person = "feels sadness"
+	message = "is experiencing <b><i>Profound Sadness</i></b>!"
+	emote_sound = 'modular_splurt/sound/voice/sadness.ogg'
+	emote_cooldown = 4.0 SECONDS
+	emote_pitch_variance = FALSE
+	emote_volume = 30

modular_splurt/code/modules/vending/clothesmate.dm

@@ -41,7 +41,8 @@
 		/obj/item/clothing/wrists/armwarmer_striped/long = 3,
 		/obj/item/clothing/under/pants/yoga = 3,
 		/obj/item/clothing/under/blutigen_undergarment = 3,
-		/obj/item/clothing/glasses/contact = 3
+		/obj/item/clothing/glasses/contact = 3,
+		/obj/item/clothing/accessory/pride/other = 30
 	)
 	var/list/extra_contraband = list(
 		/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3,