shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344

Browse Source
This commit is contained in:
Poojawa
2017-05-21 00:37:53 -05:00
parent 587bc1795c e28130f70c
commit f4e7e152df
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/rune_spawn_action.dm
+10 -10
View File
@@ -7,9 +7,9 @@
var/scribe_time = 100 var/scribe_time = 100
var/damage_interrupt = TRUE var/damage_interrupt = TRUE
var/action_interrupt = TRUE var/action_interrupt = TRUE
var/obj/effect/overlay/temp/cult/rune_spawn/rune_word_type var/obj/effect/temp_visual/cult/rune_spawn/rune_word_type
var/obj/effect/overlay/temp/cult/rune_spawn/rune_innerring_type var/obj/effect/temp_visual/cult/rune_spawn/rune_innerring_type
var/obj/effect/overlay/temp/cult/rune_spawn/rune_center_type var/obj/effect/temp_visual/cult/rune_spawn/rune_center_type
var/rune_color var/rune_color
/datum/action/innate/cult/create_rune/IsAvailable() /datum/action/innate/cult/create_rune/IsAvailable()
@@ -27,15 +27,15 @@
if(!chosen_keyword) if(!chosen_keyword)
return return
//the outer ring is always the same across all runes //the outer ring is always the same across all runes
var/obj/effect/overlay/temp/cult/rune_spawn/R1 = new(owner.loc, scribe_time, rune_color) var/obj/effect/temp_visual/cult/rune_spawn/R1 = new(owner.loc, scribe_time, rune_color)
//the rest are not always the same, so we need types for em //the rest are not always the same, so we need types for em
var/obj/effect/overlay/temp/cult/rune_spawn/R2 var/obj/effect/temp_visual/cult/rune_spawn/R2
if(rune_word_type) if(rune_word_type)
R2 = new rune_word_type(owner.loc, scribe_time, rune_color) R2 = new rune_word_type(owner.loc, scribe_time, rune_color)
var/obj/effect/overlay/temp/cult/rune_spawn/R3 var/obj/effect/temp_visual/cult/rune_spawn/R3
if(rune_innerring_type) if(rune_innerring_type)
R3 = new rune_innerring_type(owner.loc, scribe_time, rune_color) R3 = new rune_innerring_type(owner.loc, scribe_time, rune_color)
var/obj/effect/overlay/temp/cult/rune_spawn/R4 var/obj/effect/temp_visual/cult/rune_spawn/R4
if(rune_center_type) if(rune_center_type)
R4 = new rune_center_type(owner.loc, scribe_time, rune_color) R4 = new rune_center_type(owner.loc, scribe_time, rune_color)
@@ -64,7 +64,7 @@
/datum/action/innate/cult/create_rune/tele /datum/action/innate/cult/create_rune/tele
button_icon_state = "telerune" button_icon_state = "telerune"
rune_type = /obj/effect/rune/teleport rune_type = /obj/effect/rune/teleport
rune_word_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2 rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune2
rune_innerring_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2/inner rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/inner
rune_center_type = /obj/effect/overlay/temp/cult/rune_spawn/rune2/center rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/center
rune_color = RUNE_COLOR_TELEPORT rune_color = RUNE_COLOR_TELEPORT