Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revolutionary sign damage scales with number of nearby revs #15962

Merged
merged 5 commits into from
Sep 25, 2023
Merged

Revolutionary sign damage scales with number of nearby revs #15962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e8c6b6
revsign changes
unfunnyperson Sep 23, 2023
45dd131
non-revs shouldnt get the bonus
unfunnyperson Sep 23, 2023
2f95988
both of these might be overkill
unfunnyperson Sep 23, 2023
7067236
update desc
unfunnyperson Sep 23, 2023
f8fff95
improvements
unfunnyperson Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/syndicate_buylist.dm
View file
Open in desktop
unfunnyperson marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ ABSTRACT_TYPE(/datum/syndicate_buylist/generic/head_rev)
name = "Revolutionary Sign"
item = /obj/item/revolutionary_sign
cost = 4
desc = "This large revolutionary sign will inspire all nearby revolutionaries and grant them small combat buffs. A rev head needs to be holding this sign for it to have any effect."
desc = "This large revolutionary sign will inspire all nearby revolutionaries and grant them small combat buffs. Additionally the sign will channel the fury of nearby revolutionaries to provide greater force when the sign is swung! Best used in conjunction with a horde of angry revolutionaries."

/datum/syndicate_buylist/generic/head_rev/rev_dagger
name = "Sacrificial Dagger"
Expand Down
11 changes: 10 additions & 1 deletion code/obj/item/misc_weapons.dm
View file
Open in desktop
unfunnyperson marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ TYPEINFO(/obj/item/sword/pink/angel)
throwforce = 8
flags = FPRINT | TABLEPASS | CONDUCT
c_flags = EQUIPPED_WHILE_HELD
force = 7
force = 3
stamina_damage = 30
stamina_cost = 15
stamina_crit_chance = 10
Expand All @@ -651,6 +651,15 @@ TYPEINFO(/obj/item/sword/pink/angel)
BLOCK_SETUP(BLOCK_LARGE)
processing_items.Add(src)

attack(mob/living/target, mob/user)
if (isrevolutionary(user))
var/nearby_revs = 0
for (var/mob/M in viewers(5, src.loc))
if (isrevolutionary(M))
nearby_revs++
random_brute_damage(target, min(25, nearby_revs * 5), TRUE)
..()

disposing()
..()
processing_items.Remove(src)
Expand Down