Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update

code/modules/mob/living/butchering.dm

@@ -9,17 +9,23 @@
 
 	var/list/butchery_loot				// Associated list, path = number.
 
+	var/being_butchered = FALSE 		// No multiproccing
+
 // Harvest an animal's delicious byproducts
 /mob/living/proc/harvest(var/mob/user, var/obj/item/I)
-	if(meat_type && meat_amount>0 && (stat == DEAD))
+	if(meat_type && meat_amount>0 && (stat == DEAD) && !being_butchered)
+		being_butchered = TRUE
 		while(meat_amount > 0 && do_after(user, 0.5 SECONDS * (mob_size / 10), src))
 			var/obj/item/meat = new meat_type(get_turf(src))
 			meat.name = "[src.name] [meat.name]"
 			new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
 			meat_amount--
+		being_butchered = FALSE
 
-	if(!meat_amount)
+	if(!meat_amount && !being_butchered)
+		being_butchered = TRUE
 		handle_butcher(user, I)
+		being_butchered = FALSE
 
 /mob/living/proc/can_butcher(var/mob/user, var/obj/item/I)	// Override for special butchering checks.
 	if(((meat_type && meat_amount) || LAZYLEN(butchery_loot)) && stat == DEAD)

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

@@ -137,6 +137,7 @@
 	var/poison_type = "phoron"								// Poisonous air.
 	var/exhale_type = "carbon_dioxide"						// Exhaled gas type.
 	var/water_breather = FALSE
+	var/bad_swimmer = FALSE
 
 	var/body_temperature = 310.15							// Species will try to stabilize at this temperature. (also affects temperature processing)
 
@@ -407,6 +408,11 @@
 			O.organ_tag = organ_tag
 		H.internal_organs_by_name[organ_tag] = O
 
+	// set butcherable meats from species
+	for(var/obj/item/organ/O in H.organs)
+		O.set_initial_meat()
+	for(var/obj/item/organ/O in H.internal_organs)
+		O.set_initial_meat()
 
 /datum/species/proc/hug(var/mob/living/carbon/human/H, var/mob/living/target)
 
@@ -513,6 +519,10 @@
 /datum/species/proc/can_breathe_water()
 	return water_breather
 
+// Called when standing on a water tile.
+/datum/species/proc/is_bad_swimmer()
+	return bad_swimmer
+
 // Impliments different trails for species depending on if they're wearing shoes.
 /datum/species/proc/get_move_trail(var/mob/living/carbon/human/H)
 	if( H.shoes || ( H.wear_suit && (H.wear_suit.body_parts_covered & FEET) ) )
@@ -570,4 +580,3 @@
 
 /datum/species/proc/post_spawn_special(mob/living/carbon/human/H)
 	return
-

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

@@ -219,6 +219,12 @@
 	var_changes = list("gun_accuracy_mod" = -35)
 	custom_only = FALSE
 	varchange_type = TRAIT_VARCHANGE_MORE_BETTER
+/datum/trait/negative/bad_swimmer
+	name = "Bad Swimmer"
+	desc = "You can't swim very well, all water slows you down a lot and you drown in deep water."
+	cost = -1
+	custom_only = FALSE
+	var_changes = list("bad_swimmer" = 1, "water_movement" = 4)
 
 //YW ADDITIONS: START
 /datum/trait/negative/light_sensitivity

code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

@@ -331,7 +331,7 @@
 		var/burncolor = (patient.getFireLoss() < 60 ? "color:gray;" : "color:red;")
 
 		dat += "<span style='[pulsecolor]'>\t-Pulse, bpm: [patient.get_pulse(GETPULSE_TOOL)]</span><BR>"
-		dat += "<span style='[healthcolor]'>\t-Overall Health %: [round(patient.health)]</span><BR>"
+		dat += "<span style='[healthcolor]'>\t-Overall Health %: [round(100 * (patient.health / patient.getMaxHealth()))]</span><BR>"
 		dat += "<span style='[brutecolor]'>\t-Brute Damage %: [patient.getBruteLoss()]</span><BR>"
 		dat += "<span style='[o2color]'>\t-Respiratory Damage %: [patient.getOxyLoss()]</span><BR>"
 		dat += "<span style='[toxcolor]'>\t-Toxin Content %: [patient.getToxLoss()]</span><BR>"

code/modules/mob/living/simple_mob/simple_mob_vr.dm

@@ -31,6 +31,7 @@
 	var/vore_digest_chance = 25			// Chance to switch to digest mode if resisted
 	var/vore_absorb_chance = 0			// Chance to switch to absorb mode if resisted
 	var/vore_escape_chance = 25			// Chance of resisting out of mob
+	var/vore_escape_chance_absorbed = 20// Chance of absorbed prey finishing an escape. Requires a successful escape roll against the above as well.
 
 	var/vore_stomach_name				// The name for the first belly if not "stomach"
 	var/vore_stomach_flavor				// The flavortext for the first belly if not the default
@@ -236,6 +237,7 @@
 	B.contamination_color = vore_default_contamination_color
 	B.escapable = vore_escape_chance > 0
 	B.escapechance = vore_escape_chance
+	B.escapechance_absorbed = vore_escape_chance_absorbed
 	B.digestchance = vore_digest_chance
 	B.absorbchance = vore_absorb_chance
 	B.human_prey_swallow_time = swallowTime

code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm

@@ -185,4 +185,4 @@
 			qdel(src)
 
 		else
-			to_chat(user, "You need more space to release the egg!")
+			to_chat(user, "You need more space to release the egg!")

code/modules/mob/new_player/sprite_accessories.dm

@@ -3636,7 +3636,7 @@ shaved
 	species_allowed = list(SPECIES_TESHARI)
 
 /datum/sprite_accessory/marking/bandage/r_foot/r_foot3
-	name = "Bandage, Rufgt Foot 3"
+	name = "Bandage, Right Foot 3"
 	icon_state = "bandage3"
 
 /datum/sprite_accessory/marking/bandage/r_foot/r_foot3/teshari