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

2019-07-03 03:24:28 +02:00
parent d5279c8373 d01eb661cd
commit ffecca8c11
328 changed files with 9909 additions and 6862 deletions
@@ -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'
@@ -1,31 +0,0 @@
-/obj/item/flashlight
-	light_color = "#FFCC66"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/pen
-	light_color = "#FFDDCC"
-	flashlight_power = 0.3
-
-/obj/item/flashlight/seclite
-	light_color = "#CDDDFF"
-	flashlight_power = 0.9
-
-/obj/item/flashlight/lamp
-	light_color = "#FFDDBB"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare
-	light_color = "#FA421A"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare/torch
-	light_color = "#FAA44B"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/lantern
-	light_color = "#FFAA44"
-	flashlight_power = 0.75
-
-/obj/item/flashlight/slime
-	light_color = "#FFEEAA"
-	flashlight_power = 0.6
@@ -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))