mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Improved Ashwalker Armory: Bone Equipment (#30600)
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix * sword inhands * Adds Light Bone Armor * Linters * Species sprites * Fixes my crap grammar * Updates belt icon sprite
This commit is contained in:
@@ -70,6 +70,23 @@
|
||||
"<span class='suicide'>[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>"))
|
||||
return BRUTELOSS
|
||||
|
||||
|
||||
// MARK: BONE SWORD
|
||||
/obj/item/melee/bone_sword
|
||||
name = "bone sword"
|
||||
desc = "A curved blade made of sharpened bone and bound with sinew."
|
||||
icon_state = "bone_sword"
|
||||
force = 18
|
||||
throwforce = 14
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
sharp = TRUE
|
||||
attack_verb = list("slashed", "sliced", "chopped")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
|
||||
/obj/item/melee/bone_sword/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/parry, _stamina_constant = 4, _stamina_coefficient = 0.6, _parryable_attack_types = NON_PROJECTILE_ATTACKS)
|
||||
|
||||
#define SECSWORD_OFF 0
|
||||
#define SECSWORD_STUN 1
|
||||
#define SECSWORD_BURN 2
|
||||
|
||||
@@ -65,6 +65,17 @@
|
||||
/obj/item/shield/riot/buckler/add_parry_component()
|
||||
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.7, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = (10 / 3) SECONDS) // 2.3333 seconds of cooldown for 30% uptime
|
||||
|
||||
/obj/item/shield/riot/bone
|
||||
name = "bone shield"
|
||||
desc = "A primitive yet durable shield made from bone."
|
||||
icon_state = "bone_shield"
|
||||
materials = list()
|
||||
origin_tech = "materials=1;combat=3;biotech=4"
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
/obj/item/shield/riot/bone/add_parry_component()
|
||||
AddComponent(/datum/component/parry, _stamina_constant = 3, _stamina_coefficient = 0.6, _parryable_attack_types = ALL_ATTACK_TYPES)
|
||||
|
||||
/obj/item/shield/energy
|
||||
name = "energy combat shield"
|
||||
desc = "A shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere."
|
||||
|
||||
@@ -785,12 +785,14 @@
|
||||
if(!..())
|
||||
return
|
||||
playsound(src, 'sound/weapons/blade_sheath.ogg', 20)
|
||||
update_appearance(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/storage/belt/sheath/remove_from_storage(obj/item/W, atom/new_location)
|
||||
if(!..())
|
||||
return
|
||||
if(!length(contents)) // telekinesis grab spawns inside of the sheath and leaves it immediately...
|
||||
playsound(src, 'sound/weapons/blade_unsheath.ogg', 20)
|
||||
update_appearance(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/storage/belt/sheath/update_icon_state()
|
||||
if(length(contents))
|
||||
@@ -808,6 +810,19 @@
|
||||
new /obj/item/melee/saber(src)
|
||||
update_appearance(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/storage/belt/sheath/bone_sword
|
||||
name = "bone sword sheath"
|
||||
desc = "Can hold bone swords."
|
||||
base_icon_state = "bonesword_sheath"
|
||||
can_hold = list(/obj/item/melee/bone_sword)
|
||||
|
||||
/obj/item/storage/belt/sheath/bone_sword/Initialize(mapload)
|
||||
. = ..()
|
||||
update_appearance(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/item/storage/belt/sheath/bone_sword/prefilled/populate_contents()
|
||||
new /obj/item/melee/bone_sword(src)
|
||||
|
||||
/obj/item/storage/belt/sheath/secsword
|
||||
name = "securiblade scabbard"
|
||||
desc = "Can hold securiblades."
|
||||
|
||||
Reference in New Issue
Block a user