Skip to content

Commit

Permalink
Merge branch 'master' into status-procs-cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 authored Dec 23, 2024
2 parents b996eaf + 3ec810e commit be830f7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/implants/implant_cloak.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define CLOAK_IMPLANT_ALPHA 38
#define CLOAK_IMPLANT_ALPHA 26
#define CLOAK_IMPLANT_COOLDOWN_TIME 50 SECONDS

/obj/item/implant/cloak
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/implants/implant_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@
desc = "A wicked-looking folding blade capable of being concealed within a human's arm."
icon_state = "armblade"
item_state = "armblade"
force = 75
attack_speed = 8
force = 80
attack_speed = 5
flags_atom = CONDUCT
flags_equip_slot = NONE
w_class = WEIGHT_CLASS_BULKY //not needed but just in case why not
sharp = IS_SHARP_ITEM_BIG
hitsound = 'sound/weapons/slash.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

/obj/item/weapon/mantisblade/equipped(mob/user, slot)
. = ..()
toggle_item_bump_attack(user, TRUE)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/machinery/research.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
RES_TIER_UNCOMMON = list(
/obj/item/research_product/money/uncommon,
/obj/item/implanter/chem/blood,
/obj/item/implanter/cloak,
/obj/item/attachable/shoulder_mount,
),
RES_TIER_RARE = list(
/obj/item/research_product/money/rare,
/obj/item/implanter/cloak,
),
),
)
Expand Down
6 changes: 6 additions & 0 deletions html/changelogs/AutoChangeLog-pr-857.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: "MalorMorfin"
delete-after: True
changes:
- balance: "Имплант невидимости дает чуть больше невидимости"
- balance: "Mantis blade был повышен урон и скорость атаки."
- balance: "Шанс выпадение импланта невидимости повышен."

0 comments on commit be830f7

Please sign in to comment.