Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ContainerTypeRefactor

code/modules/assembly/voice.dm

@@ -70,7 +70,7 @@
 /obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, msg)
 	return
 
-/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg)
+/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg)
 	pulse(0)
 	var/turf/T = get_turf(src)  //otherwise it won't work in hand
 	T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")

code/modules/martial_arts/brawling.dm

@@ -14,12 +14,12 @@
 	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 
 	var/atk_verb = pick("left hook","right hook","straight punch")
-
+	
 	var/damage = rand(5, 8) + A.dna.species.punchdamagelow
 	if(!damage)
 		playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 		D.visible_message("<span class='warning'>[A] has attempted to hit [D] with a [atk_verb]!</span>")
-		add_attack_logs(A, D, "Melee attacked with [src] (miss/block)")
+		add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL)
 		return 0
 
 
@@ -32,7 +32,7 @@
 								"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")
 
 	D.apply_damage(damage, STAMINA, affecting, armor_block)
-	add_attack_logs(A, D, "Melee attacked with [src]")
+	add_attack_logs(A, D, "Melee attacked with [src]", ATKLOG_ALL)
 	if(D.getStaminaLoss() > 50)
 		var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
 		if((D.stat != DEAD) && prob(knockout_prob))

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

@@ -1019,7 +1019,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	return 1
 
 /mob/living/carbon/proc/forceFedAttackLog(var/obj/item/reagent_containers/food/toEat, mob/user)
-	add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagents.log_list(toEat)]", ATKLOG_FEW)
+	add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagents.log_list(toEat)]", ATKLOG_MOST)
 	if(!iscarbon(user))
 		LAssailant = null
 	else

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

@@ -29,7 +29,7 @@
 	if(dna.species && dna.species.has_organ["brain"])
 		var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
 		if(sponge)
-			if(dna.species)
+			if(dna.species && amount > 0)
 				amount = amount * dna.species.brain_mod
 			sponge.receive_damage(amount, 1)
 	if(updating)
@@ -43,7 +43,7 @@
 	if(dna.species && dna.species.has_organ["brain"])
 		var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
 		if(sponge)
-			if(dna.species)
+			if(dna.species && amount > 0)
 				amount = amount * dna.species.brain_mod
 			sponge.damage = min(max(amount, 0), (maxHealth*2))
 	if(updating)
@@ -76,11 +76,10 @@
 		amount += O.burn_dam
 	return amount
 
-
 /mob/living/carbon/human/adjustBruteLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE)
-	if(dna.species)
-		amount = amount * dna.species.brute_mod
 	if(amount > 0)
+		if(dna.species)
+			amount = amount * dna.species.brute_mod
 		take_overall_damage(amount, 0, updating_health, used_weapon = damage_source)
 	else
 		heal_overall_damage(-amount, 0, updating_health, FALSE, robotic)
@@ -88,9 +87,9 @@
 	return STATUS_UPDATE_HEALTH
 
 /mob/living/carbon/human/adjustFireLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE)
-	if(dna.species)
-		amount = amount * dna.species.burn_mod
 	if(amount > 0)
+		if(dna.species)
+			amount = amount * dna.species.burn_mod
 		take_overall_damage(0, amount, updating_health, used_weapon = damage_source)
 	else
 		heal_overall_damage(0, -amount, updating_health, FALSE, robotic)
@@ -98,9 +97,8 @@
 	return STATUS_UPDATE_HEALTH
 
 /mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.brute_mod
-
 	if(organ_name in bodyparts_by_name)
 		var/obj/item/organ/external/O = get_organ(organ_name)
 
@@ -111,9 +109,8 @@
 			O.heal_damage(-amount, 0, internal = 0, robo_repair = O.is_robotic(), updating_health = updating_health)
 	return STATUS_UPDATE_HEALTH
 
-
 /mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.burn_mod
 
 	if(organ_name in bodyparts_by_name)
@@ -134,7 +131,7 @@
 	return ..()
 
 /mob/living/carbon/human/adjustCloneLoss(amount)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.clone_mod
 	. = ..()
 
@@ -174,22 +171,22 @@
 
 // Defined here solely to take species flags into account without having to recast at mob/living level.
 /mob/living/carbon/human/adjustOxyLoss(amount)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.oxy_mod
 	. = ..()
 
 /mob/living/carbon/human/setOxyLoss(amount)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.oxy_mod
 	. = ..()
 
 /mob/living/carbon/human/adjustToxLoss(amount)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.tox_mod
 	. = ..()
 
 /mob/living/carbon/human/setToxLoss(amount)
-	if(dna.species)
+	if(dna.species && amount > 0)
 		amount = amount * dna.species.tox_mod
 	. = ..()
 

code/modules/reagents/chemistry/holder.dm

@@ -594,6 +594,11 @@ var/const/INGEST = 2
 
 	return 1
 
+/datum/reagents/proc/check_and_add(reagent, check, add)
+	if(get_reagent_amount(reagent) < check)
+		add_reagent(reagent, add)
+		return TRUE
+
 /datum/reagents/proc/remove_reagent(reagent, amount, safety)//Added a safety check for the trans_id_to
 
 	if(!isnum(amount))

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -20,7 +20,7 @@
 
 /obj/machinery/chem_master/New()
 	create_reagents(100)
-	overlays += "waitlight"
+	update_icon()
 
 /obj/machinery/chem_master/ex_act(severity)
 	switch(severity)
@@ -32,6 +32,12 @@
 				qdel(src)
 				return
 
+/obj/machinery/chem_master/update_icon()
+	overlays.Cut()
+	icon_state = "mixer[beaker ? "1" : "0"][powered() ? "" : "_nopower"]"
+	if(powered())
+		overlays += "waitlight"
+
 /obj/machinery/chem_master/blob_act()
 	if(prob(50))
 		qdel(src)
@@ -57,7 +63,7 @@
 		B.forceMove(src)
 		to_chat(user, "<span class='notice'>You add the beaker to the machine!</span>")
 		SSnanoui.update_uis(src)
-		icon_state = "mixer1"
+		update_icon()
 
 	else if(istype(B, /obj/item/storage/pill_bottle))
 
@@ -184,7 +190,7 @@
 				beaker.forceMove(get_turf(src))
 				beaker = null
 				reagents.clear_reagents()
-				icon_state = "mixer0"
+				update_icon()
 		else if(href_list["createpill"] || href_list["createpill_multiple"])
 			if(!condi)
 				var/count = 1

code/modules/response_team/ert_outfits.dm

@@ -411,6 +411,7 @@
 	l_pocket = /obj/item/grenade/clusterbuster/holy
 	shoes = /obj/item/clothing/shoes/magboots/advance
 	glasses = /obj/item/clothing/glasses/night
+	r_pocket = /obj/item/nullrod
 
 	cybernetic_implants = list(
 		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,