cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 20:54:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3140 from CHOMPStationBot/upstream-merge-11701

Browse Source 
[MIRROR] ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
This commit is contained in:
Nadyr
2021-10-27 19:30:01 -04:00
committed by GitHub
parent 616d079be5 daa50cb5ac
commit 4bd02ef673
10 changed files with 504 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/kinetic_crusher.dm
+1 -1
View File
@@ -246,7 +246,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi',
)
item_state = "c-machete"
w_class = ITEMSIZE_SMALL
w_class = ITEMSIZE_NORMAL
attack_verb = list("cleaved", "chopped", "pulped", "stabbed", "skewered")
can_cleave = TRUE
requires_wield = FALSE
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+1 -1
View File
@@ -76,7 +76,7 @@
EQUIPMENT("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
EQUIPMENT("KA Efficiency Increase", /obj/item/borg/upgrade/modkit/efficiency, 1200),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200),
EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350),