Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-08-16 02:23:20 -04:00
740 changed files with 18761 additions and 24292 deletions
+1
View File
@@ -98,6 +98,7 @@
var/canmove = 1
density = 0
anchored = 1
burn_state = LAVA_PROOF
/obj/effect/dummy/spell_jaunt/Destroy()
// Eject contents if deleted somehow
+2 -2
View File
@@ -12,7 +12,6 @@
range = 7
cooldown_min = 30 //30 deciseconds reduction per rank
selection_type = "range"
var/list/compatible_mobs = list(/mob/living/carbon/human)
action_icon_state = "barn"
@@ -26,7 +25,8 @@
if(!target)
return
if((target.type in compatible_mobs) || ishuman(target))
if(!ishuman(target))
to_chat(user, "<span class='notice'>It'd be stupid to curse [target] with a horse's head!</span>")
return