Merge branch 'master' into master

2019-06-29 15:48:25 +01:00
parent 7be7f05228 c3ae7e5522
commit 696d879874
158 changed files with 3775 additions and 2492 deletions
@@ -1,11 +0,0 @@
-SUBSYSTEM_DEF(religion)
-	name = "Religion"
-	flags = SS_NO_FIRE|SS_NO_INIT
-
-	var/religion
-	var/deity
-	var/bible_name
-	var/bible_icon_state
-	var/bible_item_state
-	var/holy_weapon_type
-	var/holy_armor_type