Merge pull request #7557 from Zuhayr/dev-freeze

Some fixes, siemens coefficient rebalance for species.

code/modules/mob/language.dm

@@ -61,7 +61,9 @@
 	var/ending = copytext(scrambled_text, length(scrambled_text))
 	if(ending == ".")
 		scrambled_text = copytext(scrambled_text,1,length(scrambled_text)-1)
-	scrambled_text += copytext(input, length(input))
+	var/input_ending = copytext(input, input_size)
+	if(input_ending in list("!","?","."))
+		scrambled_text += input_ending
 	return scrambled_text
 
 /datum/language/proc/format_message(message, verb)
@@ -241,11 +243,11 @@
 	space_chance = 100
 	syllables = list("lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit",
 					 "sed", "do", "eiusmod", "tempor", "incididunt", "ut", "labore", "et", "dolore",
-					 "magna", "aliqua", "ut", "enim", "ad", "minim", "veniam", "quis", "nostrud", 
-					 "exercitation", "ullamco", "laboris", "nisi", "ut", "aliquip", "ex", "ea", "commodo", 
-					 "consequat", "duis", "aute", "irure", "dolor", "in", "reprehenderit", "in", 
-					 "voluptate", "velit", "esse", "cillum", "dolore", "eu", "fugiat", "nulla", 
-					 "pariatur", "excepteur", "sint", "occaecat", "cupidatat", "non", "proident", "sunt", 
+					 "magna", "aliqua", "ut", "enim", "ad", "minim", "veniam", "quis", "nostrud",
+					 "exercitation", "ullamco", "laboris", "nisi", "ut", "aliquip", "ex", "ea", "commodo",
+					 "consequat", "duis", "aute", "irure", "dolor", "in", "reprehenderit", "in",
+					 "voluptate", "velit", "esse", "cillum", "dolore", "eu", "fugiat", "nulla",
+					 "pariatur", "excepteur", "sint", "occaecat", "cupidatat", "non", "proident", "sunt",
 					 "in", "culpa", "qui", "officia", "deserunt", "mollit", "anim", "id", "est", "laborum")
 
 /datum/language/gutter

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

@@ -90,9 +90,8 @@
 		return 0
 
 	src.apply_damage(shock_damage, BURN, def_zone, used_weapon="Electrocution")
-
 	playsound(loc, "sparks", 50, 1, -1)
-	if (shock_damage > 10)
+	if (shock_damage > 15)
 		src.visible_message(
 			"\red [src] was shocked by the [source]!", \
 			"\red <B>You feel a powerful shock course through your body!</B>", \
@@ -200,7 +199,7 @@
 			if (istype(src,/mob/living/carbon/human) && src:w_uniform)
 				var/mob/living/carbon/human/H = src
 				H.w_uniform.add_fingerprint(M)
-				
+
 			if(player_logged)
 				M.visible_message("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!</span>", \
 				"<span class='notice'>You shake [src], but they do not respond... Maybe they have S.S.D?</span>")

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

@@ -77,8 +77,8 @@ emp_act
 				if (affected.status & ORGAN_ROBOT)
 					emote("me", 1, "drops what they were holding, their [affected.display_name] malfunctioning!")
 				else
-					var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and")
-					emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [affected.display_name]!")
+					var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+					emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [affected.display_name]!")
 
 	..(stun_amount, agony_amount, def_zone)
 
@@ -107,7 +107,7 @@ emp_act
 	if (!def_zone)
 		return 1.0
 
-	var/siemens_coefficient = 1.0
+	var/siemens_coefficient = species.siemens_coefficient
 
 	var/list/clothing_items = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
 	for(var/obj/item/clothing/C in clothing_items)

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

@@ -280,6 +280,7 @@
 				radiation -= rads
 				nutrition += rads
 				adjustBruteLoss(-(rads))
+				adjustFireLoss(-(rads))
 				adjustOxyLoss(-(rads))
 				adjustToxLoss(-(rads))
 				updatehealth()
@@ -949,10 +950,11 @@
 			traumatic_shock -= light_amount
 
 			if(species.flags & IS_PLANT)
-				if(nutrition > 500)
-					nutrition = 500
+				if(nutrition > 450)
+					nutrition = 450
 				if(light_amount >= 3) //if there's enough light, heal
-					adjustBruteLoss(-(light_amount))
+					adjustBruteLoss(-(round(light_amount/2)))
+					adjustFireLoss(-(round(light_amount/2)))
 					adjustToxLoss(-(light_amount))
 					adjustOxyLoss(-(light_amount))
 					//TODO: heal wounds, heal broken limbs.
@@ -995,7 +997,7 @@
 	proc/handle_regular_status_updates()
 
 		if(status_flags & GODMODE)	return 0
-		
+
 		//SSD check, if a logged player is awake put them back to sleep!
 		if(player_logged && sleeping < 2)
 			sleeping = 2
@@ -1055,7 +1057,7 @@
 				adjustHalLoss(-3)
 				if (mind)
 					//Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of stoxin or similar.
-					if(player_logged) 
+					if(player_logged)
 						sleeping = max(sleeping-1, 2)
 					else
 						sleeping = max(sleeping-1, 0)

code/modules/mob/living/carbon/human/species/outsider/shadow.dm

@@ -10,6 +10,7 @@
 	light_dam = 2
 	darksight = 8
 	has_organ = list()
+	siemens_coefficient = 0
 
 	blood_color = "#CCCCCC"
 	flesh_color = "#AAAAAA"

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -28,7 +28,7 @@
 
 	breath_type = "nitrogen"
 	poison_type = "oxygen"
-	insulated = 1
+	siemens_coefficient = 0.2
 
 	flags = IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
 

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

@@ -72,7 +72,7 @@
 	// Body/form vars.
 	var/list/inherent_verbs 	  // Species-specific verbs.
 	var/has_fine_manipulation = 1 // Can use small items.
-	var/insulated                 // Immune to electrocution and glass shards to the feet.
+	var/siemens_coefficient = 1   // The lower, the thicker the skin and better the insulation.
 	var/darksight = 2             // Native darksight distance.
 	var/flags = 0                 // Various specific features.
 	var/slowdown = 0              // Passive movement speed malus (or boost, if negative)

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

@@ -6,7 +6,7 @@
 	var/has_pressure = 1  // Draw the pressure indicator.
 	var/has_nutrition = 1 // Draw the nutrition indicator.
 	var/has_bodytemp = 1  // Draw the bodytemp indicator.
-	var/has_hands = 1     // Set to draw shand.
+	var/has_hands = 1     // Set to draw hands.
 	var/has_drop = 1      // Set to draw drop button.
 	var/has_throw = 1     // Set to draw throw button.
 	var/has_resist = 1    // Set to draw resist button.
@@ -18,8 +18,8 @@
 	// unless you know exactly what it does.
 	var/list/gear = list(
 		"i_clothing" =   list("loc" = ui_iclothing, "slot" = slot_w_uniform, "state" = "center", "toggle" = 1, "dir" = SOUTH),
-		"o_clothing" =   list("loc" = ui_oclothing, "slot" = slot_wear_suit, "state" = "equip",  "toggle" = 1,  "dir" = SOUTH),
-		"mask" =         list("loc" = ui_mask,      "slot" = slot_wear_mask, "state" = "equip",  "toggle" = 1,  "dir" = NORTH),
+		"o_clothing" =   list("loc" = ui_oclothing, "slot" = slot_wear_suit, "state" = "equip",  "toggle" = 1, "dir" = SOUTH),
+		"mask" =         list("loc" = ui_mask,      "slot" = slot_wear_mask, "state" = "equip",  "toggle" = 1, "dir" = NORTH),
 		"gloves" =       list("loc" = ui_gloves,    "slot" = slot_gloves,    "state" = "gloves", "toggle" = 1),
 		"eyes" =         list("loc" = ui_glasses,   "slot" = slot_glasses,   "state" = "glasses","toggle" = 1),
 		"l_ear" =        list("loc" = ui_l_ear,     "slot" = slot_l_ear,     "state" = "ears",   "toggle" = 1),
@@ -51,3 +51,18 @@
 		equip_slots |= slot_tie
 
 	equip_slots |= slot_legcuffed
+
+/datum/hud_data/diona
+	has_internals = 0
+	gear = list(
+		"i_clothing" =   list("loc" = ui_iclothing, "slot" = slot_w_uniform, "state" = "center", "toggle" = 1, "dir" = SOUTH),
+		"o_clothing" =   list("loc" = ui_shoes,     "slot" = slot_wear_suit, "state" = "equip",  "toggle" = 1, "dir" = SOUTH),
+		"l_ear" =        list("loc" = ui_gloves,    "slot" = slot_l_ear,     "state" = "ears",   "toggle" = 1),
+		"head" =         list("loc" = ui_oclothing, "slot" = slot_head,      "state" = "hair",   "toggle" = 1),
+		"suit storage" = list("loc" = ui_sstore1,   "slot" = slot_s_store,   "state" = "belt",   "dir" = 8),
+		"back" =         list("loc" = ui_back,      "slot" = slot_back,      "state" = "back",   "dir" = NORTH),
+		"id" =           list("loc" = ui_id,        "slot" = slot_wear_id,   "state" = "id",     "dir" = NORTH),
+		"storage1" =     list("loc" = ui_storage1,  "slot" = slot_l_store,   "state" = "pocket"),
+		"storage2" =     list("loc" = ui_storage2,  "slot" = slot_r_store,   "state" = "pocket"),
+		"belt" =         list("loc" = ui_belt,      "slot" = slot_belt,      "state" = "belt")
+		)

code/modules/mob/living/carbon/human/species/station/golem.dm

@@ -8,6 +8,7 @@
 	language = "Sol Common" //todo?
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
 	flags = IS_RESTRICTED | NO_BREATHE | NO_PAIN | NO_BLOOD | IS_SYNTHETIC | NO_SCAN | NO_POISON
+	siemens_coefficient = 0
 
 	breath_type = null
 	poison_type = null

code/modules/mob/living/carbon/human/species/station/slime.dm

@@ -8,17 +8,23 @@
 	language = "Sol Common" //todo?
 	unarmed_types = list(/datum/unarmed_attack/slime_glomp)
 	flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_BREATHE
+	siemens_coefficient = 3
 	darksight = 3
 
 	blood_color = "#05FF9B"
 	flesh_color = "#05FFFB"
 
+	remains_type = /obj/effect/decal/cleanable/ash
+	death_message = "rapidly loses cohesion, splattering across the ground..."
+
 	has_organ = list(
 		"brain" = /datum/organ/internal/brain/slime
 		)
 
-	inherent_verbs = list(
-		)
-
 	breath_type = null
-	poison_type = null
+	poison_type = null
+
+/datum/species/slime/handle_death(var/mob/living/carbon/human/H)
+	spawn(1)
+		if(H)
+			H.gib()

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

@@ -107,6 +107,9 @@
 	primitive = /mob/living/carbon/alien/diona
 	slowdown = 7
 	rarity_value = 3
+	hud_type = /datum/hud_data/diona
+	siemens_coefficient = 0.3
+
 	blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
 	species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \
 	there is no effective upper limit to the number that can fuse in gestalt, and reports exist	of the Epsilon Ursae \

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -10,7 +10,7 @@
 	rarity_value = 3
 
 	has_fine_manipulation = 0
-	insulated = 1
+	siemens_coefficient = 0
 	gluttonous = 2
 
 	eyes = "blank_eyes"

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

@@ -388,9 +388,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 	//tail
 	update_tail_showing(0)
 
-
-
-
 //HAIR OVERLAY
 /mob/living/carbon/human/proc/update_hair(var/update_icons=1)
 	//Reset our hair
@@ -411,7 +408,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	if(f_style)
 		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
-		if(facial_hair_style && facial_hair_style.species_allowed && src.species.name in facial_hair_style.species_allowed)
+		if(facial_hair_style && facial_hair_style.species_allowed && (src.species.name in facial_hair_style.species_allowed))
 			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
 			if(facial_hair_style.do_colouration)
 				facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)