From 3a44f7272ece48638e2d4da3ae2579a0a11887b3 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 28 Feb 2017 22:34:10 -0800 Subject: [PATCH 1/3] Nerfs Validhunting Chaplains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: - Nerfs nullrod damage from 18 to 14, spellblade/carpblade from 15 to 12. Nullrod keeps is many forms and abilities, but now you have to choose between a weapon with holy effects, and really good damage. You no longer get both. - Chaplain no longer get crusader armor (roundstart riot armor!) in their locker. Roundstart riot armor is rather silly, especially for someone in the service department. 🆑 Kyep tweak: Chaplains no longer get roundstart riot-grade armor. In addition, their nullrods do less damage. /🆑 --- code/game/objects/items/weapons/holy_weapons.dm | 8 ++++---- .../structures/crates_lockers/closets/secure/chaplain.dm | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index d82ec9fdf00..9a275d78085 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -3,7 +3,7 @@ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers." icon_state = "nullrod" item_state = "nullrod" - force = 18 + force = 14 throw_speed = 3 throw_range = 4 throwforce = 10 @@ -197,7 +197,7 @@ item_state = "hfrequency1" desc = "Bad references are the DNA of the soul." attack_verb = list("chopped", "sliced", "cut", "zandatsu'd") - + /obj/item/weapon/nullrod/scythe/spellblade icon_state = "spellblade" item_state = "spellblade" @@ -328,7 +328,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" item_state = "carp_plushie" - force = 15 + force = 12 attack_verb = list("bitten", "eaten", "fin slapped") hitsound = 'sound/weapons/bite.ogg' var/used_blessing = FALSE @@ -346,7 +346,7 @@ name = "monk's staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown." w_class = 4 - force = 15 + force = 12 block_chance = 40 slot_flags = SLOT_BACK sharp = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm index 7c58f4a2b1a..37bd7a8476d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm @@ -18,8 +18,6 @@ new /obj/item/clothing/suit/holidaypriest(src) new /obj/item/clothing/under/wedding/bride_white(src) new /obj/item/weapon/storage/backpack/cultpack (src) - new /obj/item/clothing/head/helmet/riot/knight/templar(src) - new /obj/item/clothing/suit/armor/riot/knight/templar(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) From 257a34e82174d3cc28e1391476c300522f363b45 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 28 Feb 2017 23:12:09 -0800 Subject: [PATCH 2/3] Re-adds crusader armor with nerfed stats --- .../structures/crates_lockers/closets/secure/chaplain.dm | 2 ++ code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/suits/armor.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm index 37bd7a8476d..7c58f4a2b1a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm @@ -18,6 +18,8 @@ new /obj/item/clothing/suit/holidaypriest(src) new /obj/item/clothing/under/wedding/bride_white(src) new /obj/item/weapon/storage/backpack/cultpack (src) + new /obj/item/clothing/head/helmet/riot/knight/templar(src) + new /obj/item/clothing/suit/armor/riot/knight/templar(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) new /obj/item/weapon/storage/fancy/candle_box/eternal(src) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index cb5faac3eda..1bcc120b549 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -222,7 +222,7 @@ obj/item/clothing/head/blob desc = "Deus Vult." icon_state = "knight_templar" item_state = "knight_templar" - + armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0) //Commander /obj/item/clothing/head/helmet/ert/command diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 29cdc893cdc..8acc66b5647 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -209,6 +209,7 @@ icon_state = "knight_templar" item_state = "knight_templar" allowed = list(/obj/item/weapon/nullrod/claymore) + armor = list(melee = 25, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/armor/bulletproof name = "Bulletproof Vest" From dd767648d094c19adc954ec254a44c4f3f289126 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 7 Mar 2017 22:33:04 -0800 Subject: [PATCH 3/3] Fox requests --- code/game/objects/items/weapons/holy_weapons.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 9a275d78085..68d75f1e7bb 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -3,7 +3,7 @@ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers." icon_state = "nullrod" item_state = "nullrod" - force = 14 + force = 15 throw_speed = 3 throw_range = 4 throwforce = 10 @@ -328,7 +328,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" item_state = "carp_plushie" - force = 12 + force = 13 attack_verb = list("bitten", "eaten", "fin slapped") hitsound = 'sound/weapons/bite.ogg' var/used_blessing = FALSE @@ -346,7 +346,7 @@ name = "monk's staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown." w_class = 4 - force = 12 + force = 13 block_chance = 40 slot_flags = SLOT_BACK sharp = 0