cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Funny HEAD/MASTER conflict resolved

Browse Source
This commit is contained in:
Anthony Rodriguez
2021-06-18 13:55:01 -07:00
parent 71303a2069
commit 68a49b60c6
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-03-surface3.dmm
-4
View File
@@ -36805,11 +36805,7 @@
cell_type = /obj/item/weapon/cell/super;
dir = 8;
name = "west bump";
<<<<<<< HEAD
nightshift_setting = 0;
=======
nightshift_setting = 2;
>>>>>>> origin/master
pixel_x = -30
},
/obj/structure/cable/green{