powder that makes you say yes

This commit is contained in:
Nadyr
2023-05-11 18:52:48 -04:00
committed by GitHub
parent f6a026e879
commit a832d7b2d2

View File

@@ -139,11 +139,8 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov captain voidsuit crate"
access = access_captain
<<<<<<< HEAD
access = access_captain
// CHOMPStation EDIT End
=======
/datum/supply_pack/voidsuits/csc_breaker
name = "Shipbreaker's Industrial Suit (inc. jetpack)"
@@ -155,4 +152,3 @@
cost = 100
containertype = /obj/structure/closet/crate/secure
name = "Coyote Salvage Corp industrial voidsuit crate"
>>>>>>> 3596f94516... Merge pull request #14842 from KillianKirilenko/kk-coyotesuit