cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Compatability

Browse Source
This commit is contained in:
Unknown
2020-05-03 09:57:18 -04:00
parent 15d0410863
commit 1fb96b3d6a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maps/submaps/surface_submaps/plains/plains.dm
View File

@@ -217,12 +217,8 @@
/datum/map_template/surface/plains/ChemSpill1
name = "Ruptured Canister"
desc = "A dumped chemical canister. Looks dangerous."
<<<<<<< HEAD
mappath = 'maps/submaps/surface_submaps/plains/chemspill1_vr.dmm' //VOREStation Edit
cost = 10
=======
mappath = 'maps/submaps/surface_submaps/plains/chemspill1.dmm'
cost = 10
/datum/map_template/surface/plains/PlainsKururak
name = "Lone Kururak"
@@ -250,4 +246,3 @@
mappath = 'maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm'
cost = 10
template_group = "Shallow Grave"
>>>>>>> aafd4b4... Explorer Expansion: New Horizons (#6960)