Merge branch 'beta-dev' into new_snake_syndie

Signed-off-by: MrCat15352 <[email protected]>
CeladonSS13 · Jul 22, 2024 · e45f56c · e45f56c
2 parents 522f32c + 6b0b5de
commit e45f56c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 5 deletions.
diff --git a/mod_celadon/_storge_icons/icons/mobs/syndimouse.dmi b/mod_celadon/_storge_icons/icons/mobs/syndimouse.dmi
diff --git a/mod_celadon/mobs/README.md b/mod_celadon/mobs/README.md
@@ -24,6 +24,7 @@ ID мода: MOBS
 Питомцы:
 - Синди Кот
 - Синди Фокс
+- Синди Мышь
 Мобы:
 - Ириска
 
@@ -78,7 +79,7 @@ ID мода: MOBS
 
 ### Авторы:
 
-MrCat15352
+MrCat15352, Molniz
 <!--
   Здесь находится твой никнейм
   Если работал совместно - никнеймы тех, кто помогал.

diff --git a/mod_celadon/mobs/_mobs.dm b/mod_celadon/mobs/_mobs.dm
@@ -2,8 +2,8 @@
 	/// Строковое имя модпака. Используется для поиска других модпаков в init.
 	name = "Mobs"
 	/// Строковое описание для модпака. Может использоваться для списка глаголов модпака в качестве описания.
-	desc = "Содержит новых мобов: синди кот, фокс, Ириска"
+	desc = "Содержит новых мобов: синди кот, фокс, Ириска, синдимышь"
 	/// Строка с авторами этого модпака.
-	author = "MrCat15352"
+	author = "MrCat15352, Molniz"
 
 ///**********************************************************************///
diff --git a/mod_celadon/mobs/_mobs.dme b/mod_celadon/mobs/_mobs.dme
@@ -4,9 +4,11 @@
 #include "_mobs.dm"
 
 #include "code/iriska.dm"
+#include "code/pets/rouge.dm"
 #include "code/pets/syndicat.dm"
 #include "code/pets/syndifox.dm"
-#include "code/pets/rouge.dm"
+#include "code/pets/syndimouse.dm"
+
 
 #include "code/burrows.dm"
 #include "code/roaches/reagent_containers.dm"

diff --git a/mod_celadon/mobs/code/pets/syndimouse.dm b/mod_celadon/mobs/code/pets/syndimouse.dm
@@ -0,0 +1,34 @@
+/mob/living/simple_animal/mouse/syndie
+	icon = 'mod_celadon/_storge_icons/icons/mobs/syndimouse.dmi'
+	name = "SyndiMouse"
+	body_color = "red"
+	icon_state = "mouse_red"
+	icon_living = "mouse_red"
+	desc = "It's a SyndiMouse in a spacesuit."
+	icon_dead = "mouse_red_dead"
+	held_state = "mouse_red"
+	gender = MALE
+	health = 175
+	maxHealth = 175
+	unsuitable_atmos_damage = 0
+	minbodytemp = 800
+	minbodytemp = 0
+	melee_damage_lower = 15
+	melee_damage_upper = 45
+	faction = list("Syndicate")
+
+/mob/living/simple_animal/mouse/Initialize()
+	. = ..()
+	GLOB.mouse_spawned += 1
+	ADD_TRAIT(src, TRAIT_HOLDABLE, INNATE_TRAIT)
+	AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever
+	if(!body_color)
+		body_color = pick( list("brown","gray","white","red") )
+	icon_state = "mouse_[body_color]"
+	icon_living = "mouse_[body_color]"
+	icon_dead = "mouse_[body_color]_dead"
+
+/obj/item/reagent_containers/food/snacks/deadmouse
+	icon = 'mod_celadon/_storge_icons/icons/mobs/syndimouse.dmi'
+	icon_state = "mouse_red_dead"
+	desc = "Dead mouse in a spacesuit. Taraja's favorite food"
diff --git a/mod_celadon/qol/README.md b/mod_celadon/qol/README.md
@@ -94,7 +94,7 @@ ID мода: CELADON_QOL
 
 ### Оверрайды
 
-- Отсутствуют
+- `/datum/outfit/debug`
 <!--
   Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
   Здесь указываются оверрайды в твоём моде и папке `_master_files`

diff --git a/mod_celadon/qol/_qol.dme b/mod_celadon/qol/_qol.dme
@@ -11,5 +11,6 @@
 #include "code/fixchat2.dm"
 #include "code/fax.dm"
 #include "code/firstaid.dm"
+#include "code/admin.dm"
 
 #endif
diff --git a/mod_celadon/qol/code/admin.dm b/mod_celadon/qol/code/admin.dm
@@ -0,0 +1,2 @@
+/datum/outfit/debug
+	name = "A debug outfit"