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

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

code/modules/reagents/Chemistry-Machinery.dm

@@ -593,7 +593,7 @@
 				if (href_list["createpatch_multiple"]) count = isgoodnumber(input("Select the number of patches to make.", 10, patchamount) as num)
 				if (count > 20) count = 20	//Pevent people from creating huge stacks of patches easily. Maybe move the number to defines?
 				var/amount_per_patch = reagents.total_volume/count
-				if (amount_per_patch > 50) amount_per_patch = 50
+				if (amount_per_patch > 40) amount_per_patch = 40
 				var/name = reject_bad_text(input(usr,"Name:","Name your patch!","[reagents.get_master_reagent_name()] ([amount_per_patch] units)"))
 				while (count--)
 					var/obj/item/weapon/reagent_containers/pill/patch/P = new/obj/item/weapon/reagent_containers/pill/patch(src.loc)
@@ -699,7 +699,7 @@
 		if(!condi)
 			dat += "<HR><BR><A href='?src=\ref[src];createpill=1'>Create pill (50 units max)</A><a href=\"?src=\ref[src]&change_pill=1\"><img src=\"pill[pillsprite].png\" /></a><BR>"
 			dat += "<A href='?src=\ref[src];createpill_multiple=1'>Create multiple pills</A><BR>"
-			dat += "<HR><BR><A href='?src=\ref[src];createpatch=1'>Create patch (50 units max)</A><BR>"
+			dat += "<HR><BR><A href='?src=\ref[src];createpatch=1'>Create patch (40 units max)</A><BR>"
 			dat += "<A href='?src=\ref[src];createpatch_multiple=1'>Create multiple patches</A><BR>"
 			dat += "<A href='?src=\ref[src];createbottle=1'>Create bottle (30 units max)</A>"
 		else

code/modules/reagents/newchem/patch.dm

@@ -5,9 +5,10 @@
 	icon_state = "bandaid"
 	item_state = "bandaid"
 	possible_transfer_amounts = null
-	volume = 50
+	volume = 40
 	apply_type = TOUCH
 	apply_method = "apply"
+	transfer_efficiency = 0.5 //patches aren't as effective at getting chemicals into the bloodstream.
 
 /obj/item/weapon/reagent_containers/pill/patch/New()
 	..()

code/modules/reagents/newchem/toxins.dm

@@ -243,7 +243,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 
 			if(volume >=5 && volume <=10)
 				if(!H.unacidable)
-					M.take_organ_damage(max(volume-5,2)*4,0)
+					M.take_organ_damage(0,max(volume-5,2)*4)
 					M.emote("scream")
 
 
@@ -270,7 +270,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
 
 				if(!H.unacidable)
 					var/obj/item/organ/external/affecting = H.get_organ("head")
-					affecting.take_damage(75, 0)
+					affecting.take_damage(0, 75)
 					H.UpdateDamageIcon()
 					H.emote("scream")
 					H.status_flags |= DISFIGURED

code/modules/reagents/oldchem/reagents/_reagent_base.dm

@@ -24,28 +24,25 @@
 
 	if(self.holder)		//for catching rare runtimes
 		if(method == TOUCH && self.penetrates_skin)
-			var/block  = 0
-			for(var/obj/item/clothing/C in M.get_equipped_items())
-				if(istype(C, /obj/item/clothing/suit/bio_suit))
-					block += 1
-				if(istype(C, /obj/item/clothing/head/bio_hood))
-					block += 1
-			if(block < 2)
-				if(M.reagents)
-					M.reagents.add_reagent(self.id,self.volume)
+			if(isliving(M))
+				var/mob/living/L = M
+				var/block  = L.get_permeability_protection()
+				var/amount = round(self.volume * (1.0 - block), 0.1)
+				if(L.reagents)
+					if(amount >= 1)
+						L.reagents.add_reagent(self.id,amount)
 
 /*
 		if(method == INGEST && istype(M, /mob/living/carbon))
-			if(prob(1 * self.addictiveness))
-				if(prob(5 * volume))
-					var/datum/disease/addiction/A = new /datum/disease/addiction
-					A.addicted_to = self
-					A.name = "[self.name] Addiction"
-					A.addiction ="[self.name]"
-					A.cure = self.id
-					M.viruses += A
-					A.affected_mob = M
-					A.holder = M
+			if(prob(self.addictiveness))
+				var/datum/disease/addiction/A = new /datum/disease/addiction
+				A.addicted_to = self
+				A.name = "[self.name] Addiction"
+				A.addiction ="[self.name]"
+				A.cure = self.id
+				M.viruses += A
+				A.affected_mob = M
+				A.holder = M
 */
 		return 1
 

code/modules/reagents/oldchem/reagents/reagents_toxin.dm

@@ -187,7 +187,8 @@
 
 /datum/reagent/radium/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
-	M.apply_effect(4*REM,IRRADIATE,0)
+	if(M.radiation < 80)
+		M.apply_effect(4,IRRADIATE,0)
 	// radium may increase your chances to cure a disease
 	if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
 		var/mob/living/carbon/C = M
@@ -313,13 +314,13 @@
 					if(prob(75))
 						var/obj/item/organ/external/affecting = H.get_organ("head")
 						if(affecting)
-							affecting.take_damage(20, 0)
+							affecting.take_damage(5, 10)
 							H.UpdateDamageIcon()
 							H.emote("scream")
 					else
-						M.take_organ_damage(15,0)
+						M.take_organ_damage(5,10)
 			else
-				M.take_organ_damage(15,0)
+				M.take_organ_damage(5,10)
 
 	if(method == INGEST)
 		if(ishuman(M))
@@ -330,7 +331,7 @@
 
 			if(volume >=10 && volume <=25)
 				if(!H.unacidable)
-					M.take_organ_damage(min(max(volume-10,2)*2,20),0)
+					M.take_organ_damage(0,min(max(volume-10,2)*2,20))
 					M.emote("scream")
 
 
@@ -339,11 +340,11 @@
 					if(prob(75))
 						var/obj/item/organ/external/affecting = H.get_organ("head")
 						if(affecting)
-							affecting.take_damage(20, 0)
+							affecting.take_damage(0, 20)
 							H.UpdateDamageIcon()
 							H.emote("scream")
 					else
-						M.take_organ_damage(15,0)
+						M.take_organ_damage(0,20)
 
 /datum/reagent/sacid/reaction_obj(var/obj/O, var/volume)
 	if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))

code/modules/reagents/reagent_containers/pill.dm

@@ -11,6 +11,7 @@
 	volume = 50
 	var/apply_type = INGEST
 	var/apply_method = "swallow"
+	var/transfer_efficiency = 1.0
 
 	New()
 		..()
@@ -32,7 +33,7 @@
 			if(reagents.total_volume)
 				reagents.reaction(M, apply_type)
 				spawn(0)
-					reagents.trans_to_ingest(M, reagents.total_volume)
+					reagents.trans_to_ingest(M, reagents.total_volume*transfer_efficiency)
 					qdel(src)
 			else
 				qdel(src)
@@ -66,7 +67,7 @@
 			if(reagents.total_volume)
 				reagents.reaction(M, apply_type)
 				spawn(0)
-					reagents.trans_to_ingest(M, reagents.total_volume)
+					reagents.trans_to_ingest(M, reagents.total_volume*transfer_efficiency)
 					qdel(src)
 			else
 				qdel(src)

code/modules/reagents/reagent_containers/spray.dm

@@ -62,7 +62,7 @@
 /obj/item/weapon/reagent_containers/spray/proc/spray(var/atom/A)
 	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
 	D.create_reagents(amount_per_transfer_from_this)
-	reagents.trans_to(D, amount_per_transfer_from_this)
+	reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_currentrange)
 	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
 	spawn(0)
 		for(var/i=0, i<spray_currentrange, i++)