diff --git a/modular_splurt/code/modules/client/loadout/accessory.dm b/modular_splurt/code/modules/client/loadout/accessory.dm index e2d2e6d8be27..6665c1eb5fea 100644 --- a/modular_splurt/code/modules/client/loadout/accessory.dm +++ b/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 diff --git a/modular_splurt/code/modules/clothing/under/accessories.dm b/modular_splurt/code/modules/clothing/under/accessories.dm index eafad46702e4..06643c696b46 100644 --- a/modular_splurt/code/modules/clothing/under/accessories.dm +++ b/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") + ) diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm index 10129e51ba67..fcdce49a2afd 100644 --- a/modular_splurt/code/modules/mob/living/emotes.dm +++ b/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 Profound Sadness!" + emote_sound = 'modular_splurt/sound/voice/sadness.ogg' + emote_cooldown = 4.0 SECONDS + emote_pitch_variance = FALSE + emote_volume = 30 diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index 7248f04bd315..ddd626210d39 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/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, diff --git a/modular_splurt/icons/mob/clothing/accessories.dmi b/modular_splurt/icons/mob/clothing/accessories.dmi index 024e1d544325..02bc4de30141 100644 Binary files a/modular_splurt/icons/mob/clothing/accessories.dmi and b/modular_splurt/icons/mob/clothing/accessories.dmi differ diff --git a/modular_splurt/icons/obj/clothing/accessories.dmi b/modular_splurt/icons/obj/clothing/accessories.dmi index c15501ea74a3..858336a87a7f 100644 Binary files a/modular_splurt/icons/obj/clothing/accessories.dmi and b/modular_splurt/icons/obj/clothing/accessories.dmi differ diff --git a/modular_splurt/sound/voice/flabbergasted.ogg b/modular_splurt/sound/voice/flabbergasted.ogg new file mode 100644 index 000000000000..cdde277e8ddd Binary files /dev/null and b/modular_splurt/sound/voice/flabbergasted.ogg differ diff --git a/modular_splurt/sound/voice/sadness.ogg b/modular_splurt/sound/voice/sadness.ogg new file mode 100644 index 000000000000..189b1488308f Binary files /dev/null and b/modular_splurt/sound/voice/sadness.ogg differ