diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index 7e963a929ed..a7dc420d36e 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -278,6 +278,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Applied into wounds when they're scanned with the wound analyzer, halves time to treat them manually.
 #define TRAIT_WOUND_SCANNED "wound_scanned"
 
+/// Owner will ignore any fire protection when calculating fire damage
+#define TRAIT_IGNORE_FIRE_PROTECTION "ignore_fire_protection"
+
 #define TRAIT_NODEATH "nodeath"
 #define TRAIT_NOHARDCRIT "nohardcrit"
 #define TRAIT_NOSOFTCRIT "nosoftcrit"
diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm
index 00be3fd11bf..485c2e948c0 100644
--- a/code/modules/surgery/organs/internal/eyes/_eyes.dm
+++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm
@@ -69,8 +69,8 @@
 
 	eye_recipient.cure_blind(NO_EYES)
 	apply_damaged_eye_effects()
-	refresh(receiver, call_update = TRUE)
-	RegisterSignal(receiver, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
+	refresh(eye_recipient, call_update = TRUE)
+	RegisterSignal(eye_recipient, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
 
 /// Refreshes the visuals of the eyes
 /// If call_update is TRUE, we also will call update_body
@@ -126,10 +126,10 @@
 	if(!special)
 		eye_owner.become_blind(NO_EYES)
 
-	organ_owner.update_tint()
-	organ_owner.update_sight()
+	eye_owner.update_tint()
+	eye_owner.update_sight()
 	is_emissive = FALSE // SKYRAT EDIT ADDITION
-	UnregisterSignal(organ_owner, COMSIG_ATOM_BULLET_ACT)
+	UnregisterSignal(eye_owner, COMSIG_ATOM_BULLET_ACT)
 
 /obj/item/organ/internal/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone)
 	SIGNAL_HANDLER
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm
index c6ad52f494d..ba9be16a980 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm
@@ -251,7 +251,7 @@
 	base_icon_state = "pillowpile_small"
 	pseudo_z_axis = 4
 	var/current_color = "pink"
-	var/mutable_appearance/armrest
+	has_armrest = TRUE
 
 	//Containing pillows that we have here.
 	var/pillow1_color = "pink"
@@ -272,7 +272,7 @@
 	update_icon()
 	return ..()
 
-/obj/structure/chair/pillow_small/proc/GetArmrest()
+/obj/structure/chair/pillow_small/GetArmrest()
 	if(current_color == "pink")
 		return mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_structures/pillows.dmi', "pillowpile_small_pink_overlay")
 	if(current_color == "teal")