From 1ce1db5ae16f111061bf08f769e3cdfe20b1a30b Mon Sep 17 00:00:00 2001
From: tile4 <153015471+tile4@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:33:11 -0500
Subject: [PATCH] Some Bugfixes (#2576)

bugfixes
---
 ModularTegustation/ego_weapons/ranged/waw.dm                  | 2 +-
 code/modules/jobs/job_types/labs/medical/chemist.dm           | 4 ++++
 .../mob/living/simple_animal/abnormality/waw/caterpillar.dm   | 2 +-
 .../mob/living/simple_animal/abnormality/waw/clown_smiling.dm | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ModularTegustation/ego_weapons/ranged/waw.dm b/ModularTegustation/ego_weapons/ranged/waw.dm
index 2338e3bb8948..1eed0e4cb2b5 100644
--- a/ModularTegustation/ego_weapons/ranged/waw.dm
+++ b/ModularTegustation/ego_weapons/ranged/waw.dm
@@ -185,8 +185,8 @@
 	for(var/obj/item/ego_weapon/ranged/pistol/solemnlament/Lament in user.held_items)
 		projectile_damage_multiplier = 1.5
 		break
+	. = ..()
 	projectile_damage_multiplier = 1
-	return ..()
 
 
 /obj/item/ego_weapon/ranged/loyalty
diff --git a/code/modules/jobs/job_types/labs/medical/chemist.dm b/code/modules/jobs/job_types/labs/medical/chemist.dm
index 86aa0a3d209e..0ef3d9d81a46 100644
--- a/code/modules/jobs/job_types/labs/medical/chemist.dm
+++ b/code/modules/jobs/job_types/labs/medical/chemist.dm
@@ -24,6 +24,10 @@
 	job_important = "You are a pharmacist hired by LCB. Your job is to make the medicine used by the Medical Zone."
 	job_abbreviation = "PHAR"
 
+/datum/job/pharmacist/after_spawn(mob/living/carbon/human/H, mob/M, latejoin = FALSE)
+	..()
+	ADD_TRAIT(H, TRAIT_COMBATFEAR_IMMUNE, JOB_TRAIT)
+	ADD_TRAIT(H, TRAIT_WORK_FORBIDDEN, JOB_TRAIT)
 
 /datum/outfit/job/pharmacist
 	name = "Pharmacist"
diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/caterpillar.dm b/code/modules/mob/living/simple_animal/abnormality/waw/caterpillar.dm
index 8f1d91468f42..da7582ac919a 100644
--- a/code/modules/mob/living/simple_animal/abnormality/waw/caterpillar.dm
+++ b/code/modules/mob/living/simple_animal/abnormality/waw/caterpillar.dm
@@ -79,7 +79,7 @@
 
 		if(darts_smoked<8)
 			work_damage_amount+=2
-			max_boxes+=2
+			datum_reference.max_boxes+=2
 
 		if(darts_smoked>=3)
 			var/datum/effect_system/smoke_spread/pale/S = new
diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm b/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm
index a50fbbe46409..8959e6a6eabe 100644
--- a/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm
+++ b/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm
@@ -188,7 +188,7 @@
 	for(var/mob/living/L in view(5, src))
 		if(!faction_check_mob(L))
 			L.deal_damage(25, RED_DAMAGE)
-	new /obj/effect/particle_effect/foam in get_turf(src)
+	new /obj/effect/particle_effect/foam(get_turf(src))
 	gib()
 
 //Clown picture-related code