conflict resolution

cmss13-devs · Aug 4, 2023 · e8235fc · e8235fc
1 parent 593a384
commit e8235fc
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm
@@ -1790,8 +1790,7 @@
 /obj/structure/closet/crate/secure{
 	req_one_access_txt = "392";
 	color = "#6b675e";
-	name = "Secure Yautja crate";
-	req_one_access_txt = "252"
+	name = "Secure Yautja crate"
 	},
 /obj/item/explosive/grenade/spawnergrenade/hellhound,
 /obj/item/explosive/grenade/spawnergrenade/hellhound,
@@ -2427,8 +2426,7 @@
 /obj/structure/closet/crate/secure{
 	req_one_access_txt = "392";
 	color = "#6b675e";
-	name = "Secure Yautja crate";
-	req_one_access_txt = "252"
+	name = "Secure Yautja crate"
 	},
 /obj/item/weapon/yautja/combistick,
 /obj/item/weapon/yautja/combistick{