cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes realism issues with rapiers being able to dismember (#19779)

Browse Source 
* Rapier Fixes

* Typo

* Rapiers are not canon

* Removes rogue apostrophe
This commit is contained in:
KorPhaeron
2016-08-11 15:43:18 +12:00
committed by oranges
parent 044da33752
commit 2a71f7e3b2
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/misc.dm
+5 -5
View File
@@ -21,9 +21,9 @@
return (OXYLOSS)
/obj/item/weapon/melee/rapier
name = "captain's rapier"
desc = "An elegant weapon, for a more civilized age."
/obj/item/weapon/melee/sabre
name = "officer's sabre"
desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease."
icon_state = "rapier"
item_state = "rapier"
flags = CONDUCT
@@ -38,7 +38,7 @@
hitsound = 'sound/weapons/rapierhit.ogg'
materials = list(MAT_METAL = 1000)
/obj/item/weapon/melee/rapier/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
/obj/item/weapon/melee/sabre/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
if(attack_type == PROJECTILE_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight
return ..()
@@ -238,4 +238,4 @@
T.CalculateAdjacentTurfs()
/obj/item/weapon/melee/supermatter_sword/add_blood(list/blood_dna)
return 0
return 0
code/game/objects/items/weapons/storage/belt.dm
+9 -9
View File
@@ -415,18 +415,18 @@
icon_state = "fannypack_yellow"
item_state = "fannypack_yellow"
/obj/item/weapon/storage/belt/rapier
name = "rapier sheath"
desc = "Can hold rapiers."
icon_state = "sheath"
item_state = "sheath"
/obj/item/weapon/storage/belt/sabre
name = "sabre sheath"
desc = "An ornate sheath designed to hold an officer's blade."
icon_state = "sheath-rapier"
item_state = "sheath-rapier"
storage_slots = 1
max_w_class = 4
can_hold = list(
/obj/item/weapon/melee/rapier
/obj/item/weapon/melee/sabre
)
/obj/item/weapon/storage/belt/rapier/update_icon()
/obj/item/weapon/storage/belt/sabre/update_icon()
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
if(contents.len)
@@ -437,6 +437,6 @@
L.regenerate_icons()
..()
/obj/item/weapon/storage/belt/rapier/New()
/obj/item/weapon/storage/belt/sabre/New()
..()
new /obj/item/weapon/melee/rapier(src)
new /obj/item/weapon/melee/sabre(src)