Merge branch 'master' into master

modular_citadel/code/game/objects/items/devices/PDA/PDA.dm

@@ -1,4 +0,0 @@
-//Overrides TG's PDA sprites with Cit's PDA sprites. Remind me to turn this into a pref somewhere down the line.
-
-/obj/item/pda
-	icon = 'modular_citadel/icons/obj/pda.dmi'

modular_citadel/code/game/objects/items/holy_weapons.dm

@@ -11,8 +11,8 @@
 
 /obj/item/nullrod/rosary/Initialize()
 	.=..()
-	if(SSreligion.religion)
-		deity_name = SSreligion.deity
+	if(GLOB.religion)
+		deity_name = GLOB.deity
 
 /obj/item/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	if(!istype(M))