Commit Graph

2 Commits

Author SHA1 Message Date
dapnee
cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00