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

painful

Browse Source
This commit is contained in:
zerothebigboy
2021-06-09 18:28:21 -04:00
parent 1a90c96e4b
commit 190edf57e8
12 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/weaponry.dm
View File

@@ -611,9 +611,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
name = "throwing star"
desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
icon_state = "throwingstar"
item_state = "eshield0"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
item_state = "throwingstar"
lefthand_file = 'icons/mob/inhands/equipment/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/swords_righthand.dmi'
force = 2
throwforce = 10 //10 + 2 (WEIGHT_CLASS_SMALL) * 4 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = 18 damage on hit due to guaranteed embedding
throw_speed = 4
@@ -626,8 +626,12 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
resistance_flags = FIRE_PROOF
/obj/item/throwing_star/stamina
name = "shock throwing star"
name = "energy throwing star"
desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
icon_state = "energystar"
item_state = "energystar"
lefthand_file = 'icons/mob/inhands/equipment/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/swords_righthand.dmi'
throwforce = 5
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)

4
code/modules/ninja/suit/ninja_equipment_actions/ninja_stars.dm
View File

@@ -40,5 +40,9 @@
*/
/obj/item/throwing_star/stamina/ninja
name = "ninja throwing star"
icon_state = "ninjastar"
item_state = "ninjastar"
lefthand_file = 'icons/mob/inhands/equipment/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/swords_righthand.dmi'
throwforce = 10
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 10, "jostle_chance" = 10, "pain_stam_pct" = 2.5, "jostle_pain_mult" = 3)