Resomi port (#2047)

Co-authored-by: Daeberdir <[email protected]>

code/__defines/~mods/~master_defines.dm

@@ -42,3 +42,8 @@
 // LOADOUT_ITEMS - Start
 #define ACCESSORY_SLOT_OVER     "Over"
 // LOADOUT_ITEMS - End
+
+// RESOMI - Start
+#define SPECIES_RESOMI  "Resomi"
+#define LANGUAGE_RESOMI "Schechi"
+// RESOMI - End

code/modules/client/preference_setup/loadout/lists/misc.dm

@@ -120,6 +120,9 @@
 	plushes["deer plush"] = /obj/item/toy/plushie/deer
 	plushes["blue squid plush"] = /obj/item/toy/plushie/squid_blue
 	plushes["orange squid plush"] = /obj/item/toy/plushie/squid_orange
+	// [SIERRA-ADD] - RESOMI
+	plushes["resomi plush"] = /obj/item/toy/plushie/resomi
+	// [/SIERRA-ADD]
 	gear_tweaks += new /datum/gear_tweak/path(plushes)
 
 /datum/gear/foundation_civilian

code/modules/clothing/head/jobs.dm

@@ -99,17 +99,29 @@
 	icon_state = "beret"
 	slot_flags = SLOT_HEAD | SLOT_BELT
 	body_parts_covered = 0
+	// [SIERRA-ADD] - RESOMI
+	var/base_sprite_sheets = list()
+	// [/SIERRA-ADD]
+
+// [SIERRA-ADD] - RESOMI
+/obj/item/clothing/head/beret/Initialize()
+	. = ..()
+	base_sprite_sheets = sprite_sheets
+// [/SIERRA-ADD]
 
 /obj/item/clothing/head/beret/equipped(mob/user, slot)
 	switch(slot)
 		if(slot_belt)
 			sprite_sheets = list()
 		if(slot_head)
-			sprite_sheets = list(
-				SPECIES_VOX = 'icons/mob/species/vox/onmob_head_vox.dmi',
-				SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_head_unathi.dmi',
-				SPECIES_NABBER = 'icons/mob/species/nabber/onmob_head_gas.dmi'
-				)
+			// [SIERRA-EDIT] - RESOMI
+			//sprite_sheets = list( // SIERRA-EDIT - ORIGINAL
+			//	SPECIES_VOX = 'icons/mob/species/vox/onmob_head_vox.dmi', // SIERRA-EDIT - ORIGINAL
+			//	SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_head_unathi.dmi', // SIERRA-EDIT - ORIGINAL
+			//	SPECIES_NABBER = 'icons/mob/species/nabber/onmob_head_gas.dmi' // SIERRA-EDIT - ORIGINAL
+			//	) // SIERRA-EDIT - ORIGINAL
+			sprite_sheets = base_sprite_sheets
+			// [/SIERRA-EDIT]
 	return ..()
 
 /obj/item/clothing/head/beret/sec

code/modules/clothing/masks/miscellaneous.dm

@@ -241,6 +241,9 @@
 			icon_state = initial(icon_state)
 			sprite_sheets = list(
 				SPECIES_VOX = 'icons/mob/species/vox/onmob_mask_vox.dmi',
+				// [SIERRA-ADD] - RESOMI
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_mask_resomi.dmi',
+				// [/SIERRA-ADD]
 				SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_mask_unathi.dmi'
 				)
 		if(slot_head)
@@ -249,6 +252,9 @@
 			icon_state = "[initial(icon_state)]_up"
 			sprite_sheets = list(
 				SPECIES_VOX = 'icons/mob/species/vox/onmob_head_vox.dmi',
+				// [SIERRA-ADD] - RESOMI
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
+				// [/SIERRA-ADD]
 				SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_head_unathi.dmi'
 				)
 

code/modules/mob/living/carbon/human/human.dm

@@ -1576,26 +1576,67 @@
 	set category = "IC"
 	species.toggle_stance(src)
 
+// [SIERRA-ADD] - RESOMI
+#define PULSE_NUMBER_NONE 0
+#define PULSE_NUMBER_SLOW 50
+#define PULSE_NUMBER_NORM 75
+#define PULSE_NUMBER_FAST 105
+#define PULSE_NUMBER_2FAST 140
+#define PULSE_NUMBER_THREADY PULSE_MAX_BPM
+// [/SIERRA-ADD]
+
 // Similar to get_pulse, but returns only integer numbers instead of text.
 /mob/living/carbon/human/proc/get_pulse_as_number()
 	var/obj/item/organ/internal/heart/heart_organ = internal_organs_by_name[BP_HEART]
+
+	// [SIERRA-EDIT] - RESOMI
+
+	//if(!heart_organ) // SIERRA-EDIT - ORIGINAL
+	//	return 0 // SIERRA-EDIT - ORIGINAL
+	//switch(pulse()) // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_NONE) // SIERRA-EDIT - ORIGINAL
+	//		return 0 // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_SLOW) // SIERRA-EDIT - ORIGINAL
+	//		return rand(40, 60) // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_NORM) // SIERRA-EDIT - ORIGINAL
+	//		return rand(60, 90) // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_FAST) // SIERRA-EDIT - ORIGINAL
+	//		return rand(90, 120) // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_2FAST) // SIERRA-EDIT - ORIGINAL
+	//		return rand(120, 160) // SIERRA-EDIT - ORIGINAL
+	//	if(PULSE_THREADY) // SIERRA-EDIT - ORIGINAL
+	//		return PULSE_MAX_BPM // SIERRA-EDIT - ORIGINAL
+	//return 0 // SIERRA-EDIT - ORIGINAL
+
 	if(!heart_organ)
-		return 0
+		return PULSE_NUMBER_NONE
 
+	var/raw_pulse_number
 	switch(pulse())
 		if(PULSE_NONE)
-			return 0
+			return PULSE_NUMBER_NONE
 		if(PULSE_SLOW)
-			return rand(40, 60)
+			raw_pulse_number = PULSE_NUMBER_SLOW
 		if(PULSE_NORM)
-			return rand(60, 90)
+			raw_pulse_number = PULSE_NUMBER_NORM
 		if(PULSE_FAST)
-			return rand(90, 120)
+			raw_pulse_number = PULSE_NUMBER_FAST
 		if(PULSE_2FAST)
-			return rand(120, 160)
+			raw_pulse_number = PULSE_NUMBER_2FAST
 		if(PULSE_THREADY)
-			return PULSE_MAX_BPM
-	return 0
+			return PULSE_NUMBER_THREADY
+	return ((raw_pulse_number * (2 - species.blood_volume / SPECIES_BLOOD_DEFAULT)) + (raw_pulse_number * rand(-0.2, 0.2)))
+
+	// [/SIERRA-EDIT]
+
+// [SIERRA-ADD] - RESOMI
+#undef PULSE_NUMBER_NONE
+#undef PULSE_NUMBER_SLOW
+#undef PULSE_NUMBER_NORM
+#undef PULSE_NUMBER_FAST
+#undef PULSE_NUMBER_2FAST
+#undef PULSE_NUMBER_THREADY
+// [/SIERRA-ADD]
 
 //generates realistic-ish pulse output based on preset levels as text
 /mob/living/carbon/human/proc/get_pulse(method)	//method 0 is for hands, 1 is for machines, more accurate

code/modules/organs/external/_external_icons.dm

@@ -184,6 +184,9 @@ var/global/list/limb_icon_cache = list()
 		if(!limb_icon_cache[cache_key])
 			var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
 			I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_ADD)
+// [SIERRA-ADD] - RESOMI - BUGFIX FOR UPSTREAM
+			limb_icon_cache[cache_key] = I
+// [/SIERRA-ADD]
 		mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
 
 	//Fix leg layering here

maps/sierra/job/jobs.dm

@@ -18,16 +18,14 @@
 			/datum/job/qm,
 			/datum/job/senior_engineer, /datum/job/senior_doctor,
 			/datum/job/senior_scientist, /datum/job/security_assistant
-		)
+		),
+		/datum/species/resomi = list(
+	 		HUMAN_ONLY_JOBS, /datum/job/officer, /datum/job/exploration_leader,
+	 		/datum/job/warden, /datum/job/chief_engineer, /datum/job/rd,
+	 		/datum/job/iaa, /datum/job/security_assistant
+ 		)
 	)
 
-	// SIERRA TODO: Добавить на сьерру рякалок
-	//	/datum/species/resomi = list(
-	// 		HUMAN_ONLY_JOBS, /datum/job/officer, /datum/job/exploration_leader,
-	// 		/datum/job/warden, /datum/job/chief_engineer, /datum/job/rd,
-	// 		/datum/job/iaa, /datum/job/security_assistant
-	// 	)
-
 	allowed_jobs = list(
 		/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos,
 		/datum/job/iaa, /datum/job/adjutant,

maps/sierra/sierra.dm

@@ -67,8 +67,6 @@
 	#include "items/rigs.dm"
 	#include "items/stamps.dm"
 	#include "items/pouches.dm"
-	#include "items/backpack.dm"
-	#include "items/vendomat.dm"
 
 	#include "items/clothing/clothing.dm"
 	#include "items/clothing/exploration.dm"
@@ -185,6 +183,7 @@
 	#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
 	#include "../../mods/legalese_language/_legalese.dme"
 	#include "../../mods/petting_zoo/_petting_zoo.dme"
+	#include "../../mods/resomi/_resomi.dme"
 	#include "../../mods/screentips/_screentips.dme"
 	#include "../../mods/tajara/_tajara.dme"
 	#include "../../mods/sauna_props/_sauna_props.dme"
@@ -193,8 +192,6 @@
 	// Keep them in ascending alphabetical order too, please
 
 	// #include "../../mods/atmos_ret_field/_atm_ret_field.dme"
-	// #include "../../mods/resomi/_resomi.dme"
-	// #include "../../mods/_maps/miningpirate/_map_miningpirate.dme"
 
 	// Почему UNUSED MODS стоит хранить?
 	// Потому что никто не проверяет использование тех или иных файлов

mods/ai/code/ai.dm

@@ -15,6 +15,7 @@
 	. = ..()
 	add_language(LANGUAGE_SIIK_MAAS, TRUE)
 	add_language(LANGUAGE_LEGALESE, TRUE)
+	add_language(LANGUAGE_RESOMI, TRUE)
 
 
 // New verbs

mods/emote_panel/code/audible.dm

@@ -1,4 +1,4 @@
-#define SOUNDED_SPECIES list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_TRITONIAN, SPECIES_GRAVWORLDER, SPECIES_MULE, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_TAJARA, SPECIES_SKRELL)
+#define SOUNDED_SPECIES list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_TRITONIAN, SPECIES_GRAVWORLDER, SPECIES_MULE, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_TAJARA, SPECIES_SKRELL, SPECIES_RESOMI)
 
 /singleton/emote/audible
 	// three-dimensional array

mods/hardsuits/code/void.dm

@@ -19,11 +19,13 @@
 			SETUP_SPECIES_OBJ = list(
 				SPECIES_HUMAN = 'icons/obj/clothing/obj_head.dmi',
 				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/hats.dmi',
+				SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
 				SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/obj_head_skrell.dmi'
 				),
 			SETUP_SPECIES_ONMOB = list(
 				SPECIES_HUMAN = 'icons/mob/onmob/onmob_head.dmi',
 				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi',
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
 				SPECIES_SKRELL = 'icons/mob/species/skrell/onmob_head_skrell.dmi'
 				)
 		),
@@ -35,11 +37,13 @@
 			SETUP_SPECIES_OBJ = list(
 				SPECIES_HUMAN = 'icons/obj/clothing/obj_suit.dmi',
 				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/suits.dmi',
+				SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
 				SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/obj_suit_skrell.dmi'
 				),
 			SETUP_SPECIES_ONMOB = list(
 				SPECIES_HUMAN = 'icons/mob/onmob/onmob_suit.dmi',
 				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi',
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
 				SPECIES_SKRELL = 'icons/mob/onmob/onmob_suit.dmi'
 				)
 		)
@@ -154,11 +158,13 @@
 			SETUP_SPECIES_OBJ = list(
 				SPECIES_HUMAN = 'maps/torch/icons/obj/obj_head_solgov.dmi',
 				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/hats.dmi',
+				SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi',
 				SPECIES_SKRELL = 'maps/torch/icons/obj/skrell/obj_head_solgov_skrell.dmi'
 				),
 			SETUP_SPECIES_ONMOB = list(
 				SPECIES_HUMAN = 'maps/torch/icons/mob/onmob_head_solgov.dmi',
 				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_head_unathi.dmi',
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi',
 				SPECIES_SKRELL = 'maps/torch/icons/mob/skrell/onmob_head_solgov_skrell.dmi'
 				)
 		),
@@ -170,11 +176,13 @@
 			SETUP_SPECIES_OBJ = list(
 				SPECIES_HUMAN = 'maps/torch/icons/obj/obj_suit_solgov.dmi',
 				SPECIES_UNATHI = 'packs/infinity/icons/obj/clothing/species/erosan/suits.dmi',
+				SPECIES_RESOMI = 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi',
 				SPECIES_SKRELL = 'maps/torch/icons/obj/skrell/obj_suit_solgov_skrell.dmi'
 				),
 			SETUP_SPECIES_ONMOB = list(
 				SPECIES_HUMAN = 'maps/torch/icons/mob/onmob_suit_solgov.dmi',
 				SPECIES_UNATHI = 'mods/hardsuits/icons/voidsuits/onmob_suit_unathi.dmi',
+				SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi',
 				SPECIES_SKRELL = 'maps/torch/icons/mob/skrell/onmob_suit_solgov_skrell.dmi'
 				)
 		)

mods/loadout_items/code/loadout/loadout.dm

@@ -0,0 +1,32 @@
+/datum/gear
+	var/list/allowed_factions //Background factions required to spawn with this item.
+
+/datum/gear/plush_toy
+	var/list/toy_list = list(
+		"diona nymph plush" = /obj/item/toy/plushie/nymph,
+		"mouse plush" = /obj/item/toy/plushie/mouse,
+		"kitten plush" = /obj/item/toy/plushie/kitten,
+		"lizard plush" = /obj/item/toy/plushie/lizard,
+		"crow plush" = /obj/item/toy/plushie/crow,
+		"spider plush" = /obj/item/toy/plushie/spider,
+		"farwa plush" = /obj/item/toy/plushie/farwa,
+		"golden carp plush" = /obj/item/toy/plushie/carp_gold,
+		"purple carp plush" = /obj/item/toy/plushie/carp_purple,
+		"pink carp plush" = /obj/item/toy/plushie/carp_pink,
+		"corgi plush" = /obj/item/toy/plushie/corgi,
+		"corgi plush with bow" = /obj/item/toy/plushie/corgi_bow,
+		"deer plush" = /obj/item/toy/plushie/deer,
+		"blue squid plush" = /obj/item/toy/plushie/squid_blue,
+		"orange squid plush" = /obj/item/toy/plushie/squid_orange
+	)
+
+/datum/gear/plush_toy/New() // Now it can be used to add your own toys in different mods. Example in 'mods\resomi\code\datum\gear.dm'.
+	..()
+	gear_tweaks.Cut()
+	gear_tweaks += gear_tweak_free_name(display_name)
+	gear_tweaks += gear_tweak_free_desc(description)
+	var/list/completed_list = list()
+	for(var/plush_name in toy_list)
+		var/plush_path = toy_list[plush_name]
+		completed_list[plush_name] = plush_path
+	gear_tweaks += new /datum/gear_tweak/path(completed_list)

mods/nyc_posters/code/nyc_posters.dm

@@ -297,9 +297,6 @@
 	name = "Good Old Times"
 	desc = "A poster with a character from the old days, no one remembers his name, but they usually talk about him in a good way"
 
-/* Resomi....... */
-
-/*
 /singleton/poster/nyc/imperium_we_see
 	// by Derp
 	icon_state = "imperium_we_see"
@@ -329,7 +326,6 @@
 	name = "Together"
 	desc = "A handmade poster. The poster depicts the coat of arms of the new Resomi union in the form \
 	of three multi-colored feathers. The poster says \"Unite, feathers\", \"Let's build a new house\"."
-*/
 
 
 /* OBJECTS */