From ae14a366565bd1cb35bbee93ffe15e1608a344e0 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:55:07 -0600 Subject: [PATCH] fur colors adds fur to rattus, along with changing the food prefs --- .../carbon/human/species_type/rattus.dm | 7 ++-- .../monkestation/fur.tsx | 36 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/rattus.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/rattus.dm index 3f623e6f9fb2..dd61b61da198 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/rattus.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/rattus.dm @@ -19,8 +19,9 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN species_traits = list( NO_UNDERWEAR, - MUTCOLORS, NOEYESPRITES, + SPECIES_FUR, + NOAUGMENTS, ) inherent_traits = list( TRAIT_NO_JUMPSUIT, @@ -28,19 +29,19 @@ TRAIT_NIGHT_VISION, TRAIT_POOR_AIM, TRAIT_SMOKER, - NOAUGMENTS, ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID species_cookie = /obj/item/food/cheese/wedge meat = /obj/item/food/meat/slab/mouse liked_food = DAIRY | SUGAR | ALCOHOL //("Sad European" -MechaDH) - disliked_food = MEAT | VEGETABLES | RAW | JUNKFOOD | GRAIN | FRUIT | FRIED | GROSS | TOXIC | PINEAPPLE | BREAKFAST | CLOTH | NUTS | SEAFOOD | ORANGES | BUGS | GORE + disliked_food = MEAT | VEGETABLES | RAW | FRIED | GROSS | NUTS | BUGS | GORE maxhealthmod = 0.75 stunmod = 1.25 speedmod = -0.3 brutemod = 1.75 burnmod = 4 payday_modifier = 0.5 + uses_fur = TRUE mutanttongue = /obj/item/organ/internal/tongue/rattus species_language_holder = /datum/language_holder/rattus death_sound = "monkestation/sound/voice/rattus/rattusdeath.ogg" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/monkestation/fur.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/monkestation/fur.tsx index 6b0458613f7b..62b57258f147 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/monkestation/fur.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/monkestation/fur.tsx @@ -9,6 +9,42 @@ const furPresets = { '#ce7d54': 'Orange', '#c47373': 'Red', '#f4e2d5': 'Cream', + // Rattus Colors v v v + '#494949': 'Grey-1', + '#565656': 'Grey-2', + '#606060': 'Grey-3', + '#606060': 'Grey-4', + '8A8A8A': 'Grey-5', + 'B0B0B0': 'Grey-6', + 'C6C6C6': 'Grey-7', + '#274554': 'Blue-1', + '#38505B': 'Blue-2', + '#4A606B': 'Blue-3', + '#596C76': 'Blue-4', + '#79919D': 'Blue-5', + '#8EA6B1': 'Blue-6', + '#AFC6D1': 'Blue-7', + '#511400': 'Orange-1', + '#5B1600': 'Orange-2', + '#681A00': 'Orange-3', + '#7A2000': 'Orange-4', + '#962800': 'Orange-5', + '#A82700': 'Orange-6', + '#CE3E06': 'Orange-7', + '#44220D': 'Brown-1', + '#562B10': 'Brown-2', + '#723915': 'Brown-3', + '#874319': 'Brown-4', + '#9E4F1E': 'Brown-5', + '#C16024': 'Brown-6', + '#D86C29': 'Brown-7', + '#204424': 'Green-1', + '#27542C': 'Green-2', + '#27632D': 'Green-3', + '#27632D': 'Green-4', + '#437F49': 'Green-5', + '#45964D': 'Green-6', + '#47A550': 'Green-7', }; export const fur: Feature = {