diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 11f087d052..b2ad2917eb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,8 +1,23 @@
+<<<<<<< HEAD
 /obj/structure/closet/secure_closet/freezer
 	icon_state = "freezer"
 
 /obj/structure/closet/secure_closet/freezer/kitchen
 	name = "kitchen Cabinet"
+=======
+/obj/structure/closet/secure_closet/freezer
+	icon_state = "freezer"
+	var/jones = FALSE
+
+/obj/structure/closet/secure_closet/freezer/ex_act()
+	if(!jones)
+		jones = TRUE
+	else
+		..()
+
+/obj/structure/closet/secure_closet/freezer/kitchen
+	name = "kitchen Cabinet"
+>>>>>>> ac67dfe... You can now Indiana Jones one explosion. (#30961)
 	req_access = list(ACCESS_KITCHEN)
 
 /obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()