Merge pull request #874 from RalseiDreemuurr/sprites

Исправления ошибок спрайтов, книг и кривого кода
CeladonSS13 · Aug 1, 2024 · 4c3c743 · 4c3c743
2 parents c215190 + 92879b8
commit 4c3c743
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -496,7 +496,8 @@ There are several things that need to be remembered:
 		// var/obj/item/bodypart/head_bodypart = src.get_bodypart(BODY_ZONE_HEAD) // CELADON-EDIT - ORIGINAL
 		// if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION)) // CELADON-EDIT - ORIGINAL
 		// 	target_overlay = "[target_overlay]_snouted" // CELADON-EDIT - ORIGINAL
-		if(dna.species.bodytype & BODYTYPE_SNOUT)
+		var/obj/item/bodypart/head_bodypart = src.get_bodypart(BODY_ZONE_HEAD)
+		if(head_bodypart.bodytype & BODYTYPE_SNOUT)
 			icon_file = SARATHI_SNOUTED_HELM_PATH
 			if(I.snout_override_icon)
 				icon_file = I.snout_override_icon
@@ -706,7 +707,8 @@ There are several things that need to be remembered:
 			// var/obj/item/bodypart/head_bodypart = src.get_bodypart(BODY_ZONE_HEAD) // CELADON-EDIT - ORIGINAL
 			// if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION)) // CELADON-EDIT - ORIGINAL
 			// 	target_overlay = "[target_overlay]_snouted" // CELADON-EDIT - ORIGINAL
-			if(dna.species.bodytype & BODYTYPE_SNOUT)
+			var/obj/item/bodypart/head_bodypart = src.get_bodypart(BODY_ZONE_HEAD)
+			if(head_bodypart.bodytype & BODYTYPE_SNOUT)
 				icon_file = SARATHI_SNOUTED_MASK_PATH
 				if(I.snout_override_icon)
 					icon_file = I.snout_override_icon

diff --git a/mod_celadon/_storge_icons/icons/helms_snouted.dmi b/mod_celadon/_storge_icons/icons/helms_snouted.dmi
diff --git a/mod_celadon/items/code/books.dm b/mod_celadon/items/code/books.dm
@@ -1,4 +1,4 @@
-/obj/item/elysm_manual
+//obj/item/elysm_manual
 	name = "Book of Elysm"
 	desc = "The book's cover reads: \"The national language of the Republic of Elysium, which is a mixture of Ard al-Elysm Almaveud and newly arrived settlers speaking a variation of Arabic 2378 Sol\""
 	icon = 'mod_celadon/_storge_icons/icons/items/obj/book.dmi'
@@ -43,7 +43,7 @@
 	righthand_file = 'mod_celadon/_storge_icons/icons/items/mob/inhands/books_righthand.dmi'
 	icon_state = "alquadim_elysm"
 
-/obj/item/codespeak_manual/attack_self(mob/living/user)
+/obj/item/alquadim_manual/attack_self(mob/living/user)
 	if(!isliving(user))
 		return
 
@@ -55,7 +55,7 @@
 	user.grant_language(/datum/language/alquadim, TRUE, TRUE, LANGUAGE_MIND)
 
 
-/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
+/obj/item/alquadim_manual/attack(mob/living/M, mob/living/user)
 	if(!istype(M) || !istype(user))
 		return
 	if(M == user)
@@ -80,7 +80,7 @@
 	righthand_file = 'mod_celadon/_storge_icons/icons/items/mob/inhands/books_righthand.dmi'
 	icon_state = "thayos_book"
 
-/obj/item/codespeak_manual/attack_self(mob/living/user)
+/obj/item/thayos_manual/attack_self(mob/living/user)
 	if(!isliving(user))
 		return
 
@@ -92,7 +92,7 @@
 	user.grant_language(/datum/language/thayoss, TRUE, TRUE, LANGUAGE_MIND)
 
 
-/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
+/obj/item/thayos_manual/attack(mob/living/M, mob/living/user)
 	if(!istype(M) || !istype(user))
 		return
 	if(M == user)
@@ -117,7 +117,7 @@
 	righthand_file = 'mod_celadon/_storge_icons/icons/items/mob/inhands/books_righthand.dmi'
 	icon_state = "fuyo_book"
 
-/obj/item/codespeak_manual/attack_self(mob/living/user)
+/obj/item/fuyo_manual/attack_self(mob/living/user)
 	if(!isliving(user))
 		return
 
@@ -129,7 +129,7 @@
 	user.grant_language(/datum/language/fuyo, TRUE, TRUE, LANGUAGE_MIND)
 
 
-/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
+/obj/item/fuyo_manual/attack(mob/living/M, mob/living/user)
 	if(!istype(M) || !istype(user))
 		return
 	if(M == user)

diff --git a/mod_celadon/resprite/_resprite.dm b/mod_celadon/resprite/_resprite.dm
@@ -1,4 +1,4 @@
 /datum/modpack/resprite
 	name = "Resprite textures"
 	desc = "Включает различные респрайты объектов. Заменяет текстуры на наши."
-	author = "MrCat15352, Yata9arsu"
+	author = "MrCat15352, Yata9arsu, RalseiDreemuurr"
diff --git a/mod_celadon/resprite/_resprite.dme b/mod_celadon/resprite/_resprite.dme
@@ -7,5 +7,6 @@
 #include "code/camera.dm"
 #include "code/cowboy_boots.dm"
 #include "code/disposal.dm"
+#include "code/sarathi.dm"
 
 #endif
diff --git a/mod_celadon/resprite/code/sarathi.dm b/mod_celadon/resprite/code/sarathi.dm
@@ -0,0 +1,2 @@
+/obj/item/bodypart/head/robot/lizard
+	bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_SNOUT