cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-05-11 18:52:48 -04:00
committed by GitHub
parent f6a026e879
commit a832d7b2d2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/supplypacks/voidsuits_vr.dm
View File

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