Ports TG's Holy Weapons

This commit is contained in:
Fox-McCloud
2016-05-26 23:38:31 -04:00
parent 87c13977af
commit 78437d5e46
11 changed files with 338 additions and 74 deletions
+1 -1
View File
@@ -265,7 +265,7 @@
desc = "God wills it!"
icon_state = "knight_templar"
item_state = "knight_templar"
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/weapon/nullrod/sword)
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/weapon/nullrod/claymore)
//Non-hardsuit ERT armor.
/obj/item/clothing/suit/armor/vest/ert
+2 -2
View File
@@ -340,9 +340,9 @@
flags_inv = HIDEFACE
/obj/item/weapon/nullrod/fluff/chronx //chronx100: Hughe O'Splash
transform_into = /obj/item/weapon/nullrod/sword/fluff/chronx
fluff_transformations = list(/obj/item/weapon/nullrod/fluff/chronx/scythe)
/obj/item/weapon/nullrod/sword/fluff/chronx
/obj/item/weapon/nullrod/fluff/chronx/scythe
name = "Soul Collector"
desc = "An ancient scythe used by the worshipers of Cthulhu. Tales say it is used to prepare souls for Cthulhu's great devouring. Someone carved their name into the handle: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
@@ -39,6 +39,10 @@
if(back)
tally += back.slowdown
if(l_hand && (l_hand.flags & HANDSLOW))
tally += l_hand.slowdown
if(r_hand && (r_hand.flags & HANDSLOW))
tally += r_hand.slowdown
if(FAT in src.mutations)
tally += 1.5