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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

code/modules/projectiles/gun.dm

@@ -334,7 +334,6 @@ obj/item/weapon/gun/proc/newshot()
 
 /obj/item/weapon/gun/proc/rename_gun(mob/M)
 	var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
-
 	if(src && input && !M.stat && in_range(M,src) && !M.restrained() && M.canmove)
 		name = input
 		to_chat(M, "You name the gun [input]. Say hello to your new friend.")

code/modules/projectiles/guns/dartgun.dm

@@ -302,6 +302,4 @@
 	density = 0
 
 /obj/effect/syringe_gun_dummy/New()
-	var/datum/reagents/R = new/datum/reagents(15)
-	reagents = R
-	R.my_atom = src
+	create_reagents(15)

code/modules/projectiles/guns/projectile/revolver.dm

@@ -34,10 +34,6 @@
 		update_icon()
 		chamber_round(0)
 
-	if(unique_rename)
-		if(istype(A, /obj/item/weapon/pen))
-			rename_gun(user)
-
 /obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
 	chambered = null

code/modules/projectiles/guns/projectile/saw.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/automatic/l6_saw
 	name = "\improper L6 SAW"
-	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
+	desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
 	w_class = 5

code/modules/projectiles/projectile/bullets.dm

@@ -23,18 +23,18 @@
 /obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0)
 	if(..(target, blocked))
 		var/mob/living/M = target
-		M.dizziness += 20
-		M.slurring += 20
-		M.confused += 20
-		M.eye_blurry += 20
-		M.drowsyness += 20
-		for(var/datum/reagent/ethanol/A in M.reagents.reagent_list)
+		M.AdjustDizzy(20)
+		M.AdjustSlur(20)
+		M.AdjustConfused(20)
+		M.AdjustEyeBlurry(20)
+		M.AdjustDrowsy(20)
+		for(var/datum/reagent/consumable/ethanol/A in M.reagents.reagent_list)
 			M.AdjustParalysis(2)
-			M.dizziness += 10
-			M.slurring += 10
-			M.confused += 10
-			M.eye_blurry += 10
-			M.drowsyness += 10
+			M.AdjustDizzy(10)
+			M.AdjustSlur(10)
+			M.AdjustConfused(10)
+			M.AdjustEyeBlurry(10)
+			M.AdjustDrowsy(10)
 			A.volume += 5 //Because we can
 
 /obj/item/projectile/bullet/weakbullet2  //detective revolver instastuns, but multiple shots are better for keeping punks down
@@ -216,7 +216,7 @@
 	..(target, blocked)
 	if(iscarbon(target))
 		var/mob/living/carbon/M = target
-		M.silent = max(M.silent, 10)
+		M.Silence(10)
 	else if(istype(target, /obj/mecha/combat/honker))
 		var/obj/mecha/chassis = target
 		chassis.occupant_message("A mimetech anti-honk bullet has hit \the [chassis]!")

code/modules/projectiles/projectile/special.dm

@@ -186,7 +186,7 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
 		M.adjustBrainLoss(20)
-		M.hallucination += 20
+		M.AdjustHallucinate(20)
 
 /obj/item/projectile/clown
 	name = "snap-pop"