diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 8d64e495a0d9..8a9b3f59ba9d 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -287,6 +287,8 @@ Contains: /obj/item/clothing/suit/space/eva/evamime name = "mime EVA suit" + icon = 'icons/obj/clothing/suits/spacesuits_celadon.dmi' + mob_overlay_icon = 'icons/mob/clothing/suits/spacesuits_celadon.dmi' icon_state = "spacemime_suit" item_state = "spacemime_suit" desc = ". . ." @@ -294,6 +296,8 @@ Contains: /obj/item/clothing/head/helmet/space/eva/evamime name = "mime EVA helmet" + icon = 'icons/obj/clothing/hats_celadon.dmi' + mob_overlay_icon = 'icons/mob/clothing/head_celadon.dmi' icon_state = "spacemimehelmet" item_state = "spacemimehelmet" desc = ". . ." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 89bc392ffcbf..e0a3bb0e3f00 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -37,6 +37,8 @@ /obj/item/clothing/suit/armor/vest/inteq name = "InteQ armor vest" desc = "A modded InteQ Type II armored vest that provides decent protection against most types of damage." + icon = 'icons/obj/clothing/suits/armor_celadon.dmi' + mob_overlay_icon = 'icons/mob/clothing/suits/armor_celadon.dmi' icon_state = "armor_inteq" item_state = "armor_inteq" armor = list("melee" = 38, "bullet" = 33, "laser" = 33, "energy" = 43, "bomb" = 28, "bio" = 3, "rad" = 3, "fire" = 53, "acid" = 53) diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 8940c863d15f..91bd51ae2df0 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -306,4 +306,4 @@ icon_state = "ninja_under" item_state = "ninja_under" armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) - mob_overlay_icon = 'icons/mob/clothing/under/syndicate.dmi' + mob_overlay_icon = 'icons/mob/clothing/under/syndicate_celadon.dmi' diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 5dd80b4c05fe..35a222c0518b 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -232,7 +232,8 @@ return var/mob/living/carbon/human/H = user var/human_warcray = ishumanbasic(H) - if(human_warcray && (!H.mind || !H.mind.miming)) + var/slime_warcray = isjellyperson(H) + if((human_warcray||slime_warcray) && (!H.mind || !H.mind.miming)) if(user.gender == FEMALE) return pick( 'sound/voice/human_female_warcry_1.ogg', @@ -263,6 +264,7 @@ 'sound/voice/alastor_wing2.ogg', 'sound/voice/alastor_wing2_2.ogg') + /datum/emote/living/giggle key = "giggle" key_third_person = "giggles" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 0421b7da6efc..430ddef0699e 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/head_celadon.dmi b/icons/mob/clothing/head_celadon.dmi new file mode 100644 index 000000000000..0421b7da6efc Binary files /dev/null and b/icons/mob/clothing/head_celadon.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index 9f3e6b7c11cf..bc8daf14abd6 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/armor_celadon.dmi b/icons/mob/clothing/suits/armor_celadon.dmi new file mode 100644 index 000000000000..9f3e6b7c11cf Binary files /dev/null and b/icons/mob/clothing/suits/armor_celadon.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index 02f116256250..d467eac36a5a 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits_celadon.dmi b/icons/mob/clothing/suits/spacesuits_celadon.dmi new file mode 100644 index 000000000000..02f116256250 Binary files /dev/null and b/icons/mob/clothing/suits/spacesuits_celadon.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 01366fc5f3e8..27c030aa4b43 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/mob/clothing/under/syndicate_celadon.dmi b/icons/mob/clothing/under/syndicate_celadon.dmi new file mode 100644 index 000000000000..01366fc5f3e8 Binary files /dev/null and b/icons/mob/clothing/under/syndicate_celadon.dmi differ diff --git a/icons/mob/inhands/antag/ninja_lefthand.dmi b/icons/mob/inhands/antag/ninja_lefthand.dmi new file mode 100644 index 000000000000..0344b093d66f Binary files /dev/null and b/icons/mob/inhands/antag/ninja_lefthand.dmi differ diff --git a/icons/mob/inhands/antag/ninja_righthand.dmi b/icons/mob/inhands/antag/ninja_righthand.dmi new file mode 100644 index 000000000000..08276a9ed0be Binary files /dev/null and b/icons/mob/inhands/antag/ninja_righthand.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a522e39fa110..642e21ea3e09 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/hats_celadon.dmi b/icons/obj/clothing/hats_celadon.dmi new file mode 100644 index 000000000000..a522e39fa110 Binary files /dev/null and b/icons/obj/clothing/hats_celadon.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 906b71c326ee..758c4836aeb0 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/armor_celadon.dmi b/icons/obj/clothing/suits/armor_celadon.dmi new file mode 100644 index 000000000000..906b71c326ee Binary files /dev/null and b/icons/obj/clothing/suits/armor_celadon.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index 9f23ee51cea6..d467eac36a5a 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits_celadon.dmi b/icons/obj/clothing/suits/spacesuits_celadon.dmi new file mode 100644 index 000000000000..9f23ee51cea6 Binary files /dev/null and b/icons/obj/clothing/suits/spacesuits_celadon.dmi differ