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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-03-17 01:57:02 -04:00
committed by GitHub
parent 4a44fb90ab
commit 3381d79c4f
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/overmap/sectors.dm
View File

@@ -81,12 +81,9 @@
color = null color = null
real_desc = desc real_desc = desc
desc = "Scan this to find out more information." desc = "Scan this to find out more information."
<<<<<<< HEAD
=======
//at the moment only used for the OM location renamer. Initializing here in case we want shuttles incl as well in future. Also proc definition convenience. //at the moment only used for the OM location renamer. Initializing here in case we want shuttles incl as well in future. Also proc definition convenience.
visitable_overmap_object_instances |= src visitable_overmap_object_instances |= src
>>>>>>> ec61e89345... Merge pull request #14616 from Runa-Dacino/OMNameLandmarkTry2
// You generally shouldn't destroy these. // You generally shouldn't destroy these.