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

Whitespace Standardization [MDB IGNORE] (#15748)

Browse Source 
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
This commit is contained in:
Drathek
2024-02-20 11:28:51 +01:00
committed by GitHub
parent 3b61f677b3
commit 7c8bb85de3
1175 changed files with 818171 additions and 818145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/augment_items.dm
+36 -36
View File
@@ -1,37 +1,37 @@
// **For augment items that aren't subtypes of other things.**
/obj/item/weapon/melee/augment
name = "integrated item"
desc = "A surprisingly non-descript item, integrated into its user. You probably shouldn't be seeing this."
icon = 'icons/obj/surgery.dmi'
icon_state = "augment_box"
/obj/item/weapon/melee/augment/blade
name = "handblade"
desc = "A sleek-looking telescopic blade that fits inside the hand. Favored by infiltration specialists and assassins."
icon_state = "augment_handblade"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
w_class = ITEMSIZE_SMALL
force = 15
armor_penetration = 25
sharp = TRUE
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
defend_chance = 10
projectile_parry_chance = 5
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/weapon/melee/augment/blade/arm
name = "armblade"
desc = "A sleek-looking cybernetic blade that cleaves through people like butter. Favored by psychopaths and assassins."
icon_state = "augment_armblade"
w_class = ITEMSIZE_HUGE
force = 30
armor_penetration = 15
edge = TRUE
pry = 1
defend_chance = 40
// **For augment items that aren't subtypes of other things.**
/obj/item/weapon/melee/augment
name = "integrated item"
desc = "A surprisingly non-descript item, integrated into its user. You probably shouldn't be seeing this."
icon = 'icons/obj/surgery.dmi'
icon_state = "augment_box"
/obj/item/weapon/melee/augment/blade
name = "handblade"
desc = "A sleek-looking telescopic blade that fits inside the hand. Favored by infiltration specialists and assassins."
icon_state = "augment_handblade"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
w_class = ITEMSIZE_SMALL
force = 15
armor_penetration = 25
sharp = TRUE
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
defend_chance = 10
projectile_parry_chance = 5
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/weapon/melee/augment/blade/arm
name = "armblade"
desc = "A sleek-looking cybernetic blade that cleaves through people like butter. Favored by psychopaths and assassins."
icon_state = "augment_armblade"
w_class = ITEMSIZE_HUGE
force = 30
armor_penetration = 15
edge = TRUE
pry = 1
defend_chance = 40
projectile_parry_chance = 20