cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fire breath can be used without the ability to speak (+ code improvement) (#64796)

Browse Source
This commit is contained in:
John Willard
2022-02-09 21:24:34 -06:00
committed by GitHub
parent b2ceaee337
commit 63ae8829d4
15 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell.dm
+1 -1
View File
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/antimagic_allowed = FALSE // If false, the spell cannot be cast while under the effect of antimagic
var/invocation = "HURP DURP" //what is uttered when the wizard casts the spell
var/invocation_emote_self = null
var/invocation_type = "none" //can be none, whisper, emote and shout
var/invocation_type = INVOCATION_NONE //can be none, whisper, emote and shout
var/range = 7 //the range of the spell; outer radius for aoe spells
var/message = "" //whatever it says to the guy affected by it
var/selection_type = "view" //can be "range" or "view"
code/modules/spells/spell_types/cone_spells.dm
+1 -1
View File
@@ -5,7 +5,7 @@
charge_max = 100
clothes_req = FALSE
invocation = "FUKAN NOTHAN"
invocation_type = "shout"
invocation_type = INVOCATION_SHOUT
sound = 'sound/magic/forcewall.ogg'
action_icon_state = "shield"
range = -1
code/modules/spells/spell_types/conjure.dm
+1 -1
View File
@@ -79,7 +79,7 @@
/obj/effect/proc_holder/spell/targeted/conjure_item
name = "Summon weapon"
desc = "A generic spell that should not exist. This summons an instance of a specific type of item, or if one already exists, un-summons it. Summons into hand if possible."
invocation_type = "none"
invocation_type = INVOCATION_NONE
include_user = TRUE
range = -1
clothes_req = FALSE
code/modules/spells/spell_types/construct_spells.dm
+11 -11
View File
@@ -16,7 +16,7 @@
charge_max = 5 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 2
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "areaconvert"
@@ -36,7 +36,7 @@
charge_max = 2 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 0
summon_type = list(/turf/open/floor/engine/cult)
action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -52,7 +52,7 @@
charge_max = 10 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 0
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "lesserconstruct"
@@ -69,7 +69,7 @@
charge_max = 30 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 0
summon_type = list(/turf/closed/wall/r_wall)
@@ -82,7 +82,7 @@
charge_max = 4 MINUTES
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 0
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "summonsoulstone"
@@ -110,7 +110,7 @@
charge_max = 40 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
wall_type = /obj/effect/forcefield/cult
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "cultforcewall"
@@ -126,7 +126,7 @@
charge_max = 25 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
jaunt_duration = 5 SECONDS
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "phaseshift"
@@ -155,7 +155,7 @@
charge_max = 40 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
max_targets = 6
action_icon_state = "magicm"
action_background_icon_state = "bg_demon"
@@ -173,7 +173,7 @@
charge_max = 20 SECONDS
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = -1
include_user = TRUE
cooldown_min = 20 //25 deciseconds reduction per rank
@@ -192,7 +192,7 @@
school = SCHOOL_EVOCATION
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_background_icon_state = "bg_demon"
@@ -252,7 +252,7 @@
school = SCHOOL_EVOCATION
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_background_icon_state = "bg_demon"
code/modules/spells/spell_types/ethereal_jaunt.dm
+1 -1
View File
@@ -6,7 +6,7 @@
charge_max = 30 SECONDS
clothes_req = TRUE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = -1
cooldown_min = 10 SECONDS
include_user = TRUE
code/modules/spells/spell_types/infinite_guns.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/effect/proc_holder/spell/targeted/infinite_guns
name = "Lesser Summon Guns"
desc = "Why reload when you have infinite guns? Summons an unending stream of bolt action rifles that deal little damage, but will knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Arcane Barrage."
invocation_type = "none"
invocation_type = INVOCATION_NONE
include_user = TRUE
range = -1
code/modules/spells/spell_types/touch_attacks.dm
+1 -1
View File
@@ -3,7 +3,7 @@
var/obj/item/melee/touch_attack/attached_hand = null
var/drawmessage = "You channel the power of the spell to your hand."
var/dropmessage = "You draw the power out of your hand."
invocation_type = "none" //you scream on connecting, not summoning
invocation_type = INVOCATION_NONE //you scream on connecting, not summoning
include_user = TRUE
range = -1
code/modules/spells/spell_types/wizard.dm
+5 -5
View File
@@ -65,7 +65,7 @@
charge_max = 120
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = -1
include_user = TRUE
cooldown_min = 20 //25 deciseconds reduction per rank
@@ -84,7 +84,7 @@
charge_max = 360
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = -1
include_user = TRUE
@@ -116,7 +116,7 @@
charge_max = 20
clothes_req = TRUE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = -1
include_user = TRUE
cooldown_min = 5 //4 deciseconds reduction per rank
@@ -202,7 +202,7 @@
charge_max = 600
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
invocation_type = INVOCATION_NONE
range = 0
summon_type = list(/obj/structure/constructshell)
action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -306,7 +306,7 @@
antimagic_allowed = TRUE
range = 2
cooldown_min = 150
invocation_type = "none"
invocation_type = INVOCATION_NONE
sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep
action_icon = 'icons/mob/actions/actions_xeno.dmi'
action_icon_state = "tailsweep"