shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies

Browse Source 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
This commit is contained in:
ZeroMan
2020-03-21 02:17:13 -04:00
parent 2978014a64 9c40389e4f
commit 93b1ade0bc
85 changed files with 151865 additions and 1683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/belt.dm
+1 -7
View File
@@ -795,18 +795,12 @@
/obj/item/storage/belt/sabre/rapier
name = "rapier sheath"
desc = "A black, thin sheath that looks to house only a long thin blade. Feels like its made of metal."
desc = "A sinister, thin sheath, suitable for a rapier."
icon_state = "rsheath"
item_state = "rsheath"
force = 5
throwforce = 15
block_chance = 30
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("bashed", "slashes", "prods", "pokes")
fitting_swords = list(/obj/item/melee/rapier)
starting_sword = /obj/item/melee/rapier
/obj/item/storage/belt/sabre/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
final_block_chance = 0 //To thin to block bullets
return ..()