Merge pull request #165 from Mirag1993/Мердж-с-оффами

Чиним иконки часть (ч.1)
CeladonSS13 · Nov 18, 2023 · 4f181e2 · 4f181e2
2 parents 2ab89c2 + e15ec77
commit 4f181e2
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 2 deletions.
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -287,13 +287,17 @@ 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 = ". . ."
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65)
 
 /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
@@ -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
@@ -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
@@ -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
diff --git a/icons/mob/clothing/head_celadon.dmi b/icons/mob/clothing/head_celadon.dmi
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
diff --git a/icons/mob/clothing/suits/armor_celadon.dmi b/icons/mob/clothing/suits/armor_celadon.dmi
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
diff --git a/icons/mob/clothing/suits/spacesuits_celadon.dmi b/icons/mob/clothing/suits/spacesuits_celadon.dmi
diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi
diff --git a/icons/mob/clothing/under/syndicate_celadon.dmi b/icons/mob/clothing/under/syndicate_celadon.dmi
diff --git a/icons/mob/inhands/antag/ninja_lefthand.dmi b/icons/mob/inhands/antag/ninja_lefthand.dmi
diff --git a/icons/mob/inhands/antag/ninja_righthand.dmi b/icons/mob/inhands/antag/ninja_righthand.dmi
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
diff --git a/icons/obj/clothing/hats_celadon.dmi b/icons/obj/clothing/hats_celadon.dmi
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
diff --git a/icons/obj/clothing/suits/armor_celadon.dmi b/icons/obj/clothing/suits/armor_celadon.dmi
diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi
diff --git a/icons/obj/clothing/suits/spacesuits_celadon.dmi b/icons/obj/clothing/suits/spacesuits_celadon.dmi