cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tiger's comments

Browse Source
This commit is contained in:
Markolie
2017-01-22 19:15:26 +01:00
parent 2cedb7b20b
commit d6276ae978
12 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+1 -1
View File
@@ -138,7 +138,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
return 0
var/obj/effect/proc_holder/spell/noclothes/clothes_spell = locate() in (user.mob_spell_list | (user.mind ? user.mind.spell_list : list()))
if((ishuman(user) && clothes_req) && !(clothes_spell && istype(clothes_spell)))//clothes check
if((ishuman(user) && clothes_req) && !istype(clothes_spell))//clothes check
var/mob/living/carbon/human/H = user
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard))
to_chat(user, "<span class='notice'>I don't feel strong enough without my robe.</span>")
code/datums/spells/shapeshift.dm
+3 -3
View File
@@ -14,9 +14,9 @@
var/shapeshift_type
var/list/current_shapes = list()
var/list/current_casters = list()
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
/mob/living/simple_animal/pet/corgi,\
/mob/living/simple_animal/bot/ed209,\
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,
/mob/living/simple_animal/pet/corgi,
/mob/living/simple_animal/bot/ed209,
/mob/living/simple_animal/hostile/construct/armoured)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets, mob/user = usr)
code/datums/spells/wizard.dm
+4 -4
View File
@@ -145,8 +145,8 @@
action_icon_state = "spell_teleport"
sound1="sound/magic/Teleport_diss.ogg"
sound2="sound/magic/Teleport_app.ogg"
sound1 = "sound/magic/Teleport_diss.ogg"
sound2 = "sound/magic/Teleport_app.ogg"
/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
name = "Forcewall"
@@ -245,12 +245,12 @@
/obj/effect/proc_holder/spell/targeted/inflict_handler/blind
amt_eye_blind = 10
amt_eye_blurry = 20
sound="sound/magic/Blind.ogg"
sound = "sound/magic/Blind.ogg"
/obj/effect/proc_holder/spell/targeted/genetic/blind
disabilities = BLIND
duration = 300
sound="sound/magic/Blind.ogg"
sound = "sound/magic/Blind.ogg"
/obj/effect/proc_holder/spell/fireball
name = "Fireball"