From ed3f216514153580a2997144fe7c4c6b2034e02e Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Mon, 10 Sep 2012 01:31:54 +0000 Subject: [PATCH] Cult swords are force 30 now, and don't fit in bags or on belts. Use the damn robes they come with if you want to use em. Artificers no longer have delay on spells, but can't create R-Walls Carp attack damage is now 15 flat, having a chance to deal only 5 makes them far too weak. Bears now actually have an attack value higher than zero, so players keyed into the bear can attack. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4672 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/spells/wizard.dm | 2 -- code/game/gamemodes/cult/cult_items.dm | 4 ++-- code/game/gamemodes/wizard/soulstone.dm | 1 - code/modules/mob/living/simple_animal/bear.dm | 2 ++ code/modules/mob/living/simple_animal/carp.dm | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 1372c501a09..760079bc9ac 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -253,7 +253,6 @@ range = 0 summon_type = list("/turf/simulated/floor/engine/cult") centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles - delay = 10 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall name = "Leser Construction" @@ -267,7 +266,6 @@ range = 0 summon_type = list("/turf/simulated/wall/cult") centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles - delay = 20 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced name = "Greater Construction" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 26bf308cdc7..6e0492df825 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -4,8 +4,8 @@ icon_state = "cultblade" item_state = "cultblade" flags = FPRINT | TABLEPASS - slot_flags = SLOT_BELT - force = 40 + w_class = 4 + force = 30 throwforce = 10 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index d9a4ff69845..46df39582b1 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -211,7 +211,6 @@ Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser(Z) Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wall(Z) Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/floor(Z) - Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced(Z) Z.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone(Z) Z.cancel_camera() del(C) diff --git a/code/modules/mob/living/simple_animal/bear.dm b/code/modules/mob/living/simple_animal/bear.dm index 817ac945847..6c1aca47fc3 100644 --- a/code/modules/mob/living/simple_animal/bear.dm +++ b/code/modules/mob/living/simple_animal/bear.dm @@ -26,6 +26,8 @@ stop_automated_movement_when_pulled = 0 maxHealth = 60 health = 60 + melee_damage_lower = 20 + melee_damage_upper = 30 //Space bears aren't affected by atmos. min_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/carp.dm b/code/modules/mob/living/simple_animal/carp.dm index 17229573d09..3c74cfe3b7f 100644 --- a/code/modules/mob/living/simple_animal/carp.dm +++ b/code/modules/mob/living/simple_animal/carp.dm @@ -21,7 +21,7 @@ health = 25 harm_intent_damage = 8 - melee_damage_lower = 5 + melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg'