diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 27428ab0f9..295a8e9580 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -178,13 +178,8 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion -<<<<<<< HEAD - containername = "Explorer equipment" - access = access_explorer -======= - containername = "Away Team equipment" - access = list(access_eva, access_explorer) ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + containername = "Explorer equipment" //CHOMP explo keep + access = access_explorer //CHOMP explo keep /datum/supply_pack/pilotgear name= "Pilot gear"