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

This commit is contained in:

deathride58

2018-05-31 16:03:18 -07:00

committed by

kevinz000

parent b6e608cb4c

commit 2f9e3e403d

395 changed files with 134016 additions and 26287 deletions

code/controllers/subsystem/religion.dm

View File

@@ -8,3 +8,4 @@ SUBSYSTEM_DEF(religion)
 	var/bible_icon_state
 	var/bible_item_state
 	var/holy_weapon_type
 	var/holy_armor_type