Merge pull request #5006 from ARF-SS13/new-taur

Some small things
ARF-SS13 · Apr 21, 2024 · fa86d72 · fa86d72
2 parents 3204754 + 449c90e
commit fa86d72
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
@@ -276,6 +276,13 @@
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
 
+/datum/sprite_accessory/taur/sergal
+	name = "sergal"
+	icon_state = "sergal"
+	taur_mode = STYLE_PAW_TAURIC
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_ALL
+
 
 
 

diff --git a/icons/mob/mam/citadel/mam_taur.dmi b/icons/mob/mam/citadel/mam_taur.dmi
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
diff --git a/modular_coyote/code/modules/food_and_drinks/recipes/drinks/drinks_coyote.dm b/modular_coyote/code/modules/food_and_drinks/recipes/drinks/drinks_coyote.dm
@@ -240,6 +240,25 @@
 	results = list(/datum/reagent/consumable/peachshake = 3)
 	required_reagents = list(/datum/reagent/consumable/peachjuice = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
 
+/datum/reagent/consumable/orangeshake
+	name = "Orange Shake"
+	description = "A frosty orange milkshake."
+	color = "#541B00"
+	quality = DRINK_VERYGOOD
+	nutriment_factor = 8 * REAGENTS_METABOLISM
+	taste_description = "sweet creamy oranges"
+	glass_icon_state = "orangeshake"
+	glass_name = "orange shake"
+	glass_desc = "A orange flavored milkshake."
+	value = REAGENT_VALUE_COMMON
+	canbrew = TRUE
+
+/datum/chemical_reaction/drink/orangehshake
+	name = "orange Shake"
+	id = /datum/reagent/consumable/orangeshake
+	results = list(/datum/reagent/consumable/orangeshake = 3)
+	required_reagents = list(/datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
+
 /datum/reagent/consumable/ethanol/cloverclub
 	name = "Clover Club"
 	description = "A light and refreshing raspberry cocktail."

diff --git a/modular_coyote/code/pmon_mob.dm b/modular_coyote/code/pmon_mob.dm
@@ -256,6 +256,16 @@
 	mob_size = MOB_SIZE_SMALL
 	p_traits = list(P_TRAIT_RIDEABLE)
 
+/mob/living/simple_animal/advanced/eeveealt
+	name = "eevee, alt"
+	desc = "Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokemon to evolve."
+	icon_state = "eevee2"
+	icon_living = "eevee2"
+	icon_dead = "eevee2_d"
+	p_types = list(P_TYPE_NORM)
+	mob_size = MOB_SIZE_SMALL
+	p_traits = list(P_TRAIT_RIDEABLE)
+
 /mob/living/simple_animal/advanced/espeon
 	name = "espeon"
 	desc = "Espeon is extremely loyal to any trainer it considers to be worthy. It is said to have developed precognitive powers to protect its trainer from harm."

diff --git a/modular_coyote/icons/mob/pokemon64.dmi b/modular_coyote/icons/mob/pokemon64.dmi