Merge pull request #807 from Citadel-Station-13/upstream-merge-26631

[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
parent ddee13467a eac970c1f1
commit 4710beca0e
28 changed files with 834 additions and 200 deletions
@@ -230,7 +230,15 @@
 	name = "blood sparks"
 	icon_state = "bloodsparkles"

-/obj/effect/overlay/temp/dir_setting/cult/phase
+/obj/effect/overlay/temp/cult/blood  // The traditional teleport
+	name = "blood jaunt"
+	duration = 12
+	icon_state = "bloodin"
+
+/obj/effect/overlay/temp/cult/blood/out
+	icon_state = "bloodout"
+
+/obj/effect/overlay/temp/dir_setting/cult/phase  // The veil shifter teleport
 	name = "phase glow"
 	duration = 7
 	icon_state = "cultin"
@@ -0,0 +1,10 @@
+diff a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm	(rejected hunks)
+@@ -214,7 +214,7 @@
+ 	icon = 'icons/effects/fire.dmi'
+ 	icon_state = "3"
+ 	duration = 20
+-	
+
+ /obj/effect/overlay/temp/cult
+ 	randomdir = 0
+ 	duration = 10