Merge branch 'SierraBay:dev-sierra' into fd-cultures

code/__defines/~mods/~master_defines.dm

@@ -57,3 +57,8 @@
 // IPC_COOLING_UNIT - Start
 #define BP_COOLING "cooling system"
 // IPC_COOLING_UNIT - End
+
+// RESOMI - Start
+#define SPECIES_RESOMI  "Resomi"
+#define LANGUAGE_RESOMI "Schechi"
+// RESOMI - End

code/_helpers/text.dm

@@ -442,6 +442,14 @@
 	t = replacetext(t, "\[foundlogo\]", "<img src = foundlogo.png>")
 	t = replacetext(t, "\[ccalogo\]", "<img src = ccalogo.png>")
 	t = replacetext(t, "\[sierralogo\]", "<img src = sierralogo.png>")
+	t = replacetext(t, "\[saarelogo\]", "<img src = saarelogo.png>")
+	t = replacetext(t, "\[pcrclogo\]", "<img src = pcrclogo.png>")
+	t = replacetext(t, "\[zpcilogo\]", "<img src = zpcilogo.png>")
+	t = replacetext(t, "\[hegemonylogo\]", "<img src = heglogo.png>")
+	t = replacetext(t, "\[conventlogo\]", "<img src = convlogo.png>")
+	t = replacetext(t, "\[leaguelogo\]", "<img src = leaguelogo.png>")
+	t = replacetext(t, "\[ouerelogo\]", "<img src = ouerelogo.png>")
+	t = replacetext(t, "\[terstenlogo\]", "<img src = terstenlogo.png>")
 	// [/SIERRA-ADD]
 	t = replacetext(t, "\[editorbr\]", "")
 	return t
@@ -506,6 +514,14 @@
 	t = replacetext(t, "<img src = foundlogo.png>", "\[foundlogo\]" )
 	t = replacetext(t, "<img src = ccalogo.png>", "\[ccalogo\]" )
 	t = replacetext(t, "<img src = sierralogo.png>", "\[sierralogo\]" )
+	t = replacetext(t, "<img src = saarelogo.png>", "\[saarelogo\]")
+	t = replacetext(t, "<img src = pcrclogo.png>", "\[pcrclogo\]")
+	t = replacetext(t, "<img src = zpcilogo.png>", "\[zpcilogo\]")
+	t = replacetext(t, "<img src = heglogo.png>", "\[hegemonylogo\]")
+	t = replacetext(t, "<img src = convlogo.png>", "\[conventlogo\]")
+	t = replacetext(t, "<img src = leaguelogo.png>", "\[leaguelogo\]")
+	t = replacetext(t, "<img src = ouerelogo.png>", "\[ouerelogo\]")
+	t = replacetext(t, "<img src = terstenlogo.png>", "\[terstenlogo\]")
 	// [/SIERRA-ADD]
 	t = replacetext(t, "<span class=\"paper_field\"></span>", "\[field\]")
 	t = replacetext(t, "<span class=\"redacted\">R E D A C T E D</span>", "\[redacted\]")

code/modules/client/client_procs.dm

@@ -407,6 +407,14 @@
 		'html/images/foundlogo.png',
 		'html/images/ccalogo.png',
 		'html/images/sierralogo.png',
+		'html/images/saarelogo.png',
+		'html/images/pcrclogo.png',
+		'html/images/zpcilogo.png',
+		'html/images/heglogo.png',
+		'html/images/convlogo.png',
+		'html/images/leaguelogo.png',
+		'html/images/ouerelogo.png',
+		'html/images/terstenlogo.png',
 		// [/SIERRA-ADD]
 		)
 	addtimer(new Callback(src, .proc/after_send_resources), 1 SECOND)

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