Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2018-03-05 13:25:04 -06:00
parent 214e008e3d df11e970f7
commit 6a688f2588
44 changed files with 172 additions and 346 deletions
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes: 
+  - code_imp: "First pass on cleaning up junk defines and unused code"