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.

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

Endermage Rcorp Updates: Buffing/Reworking R-Corp Abnormalities Part 2 #2577

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
11806ad
Charge steering
azenkov Nov 22, 2024
b534b86
One more
azenkov Nov 22, 2024
f82edeb
Helper Vars
EnderMage99 Nov 22, 2024
a44f8a1
Clogged Blades
EnderMage99 Nov 24, 2024
3db6cab
clown smiling buffs part 1
EnderMage99 Nov 24, 2024
a028b09
LC Bleed!
EnderMage99 Nov 24, 2024
6e3cbc3
Abno Info
EnderMage99 Nov 24, 2024
49e7604
Fox/Clown Fix
EnderMage99 Nov 24, 2024
e0dab4b
Fox Info
EnderMage99 Nov 24, 2024
43d1cc6
Buffing Blue Shepherd
EnderMage99 Nov 24, 2024
75e7abc
cleanup
azenkov Nov 24, 2024
a62ad42
Yin fix / Helper hit cooldown
azenkov Nov 24, 2024
b0ccd24
Keybinding for shepherd dodge
azenkov Nov 24, 2024
389aa87
blue shepherd hotkeys/info
EnderMage99 Nov 25, 2024
1c42e38
Hotkey for Fragment
EnderMage99 Nov 25, 2024
9730941
No damage Counter
EnderMage99 Nov 25, 2024
595d757
Small Fixes
EnderMage99 Nov 25, 2024
bfdf0ca
der freischutz buff start
EnderMage99 Nov 25, 2024
a348345
Adding Area/Stopping Possessions
EnderMage99 Nov 26, 2024
b7447f5
Map Changes
EnderMage99 Nov 26, 2024
add394e
Templates for freischutz abilities
EnderMage99 Nov 26, 2024
bb43abe
Portal management
azenkov Nov 27, 2024
c72bef2
Toggle Fix
EnderMage99 Nov 27, 2024
3ecae6f
Portals
azenkov Nov 28, 2024
f1d41f2
Info/Keybindings for der_freischutz
EnderMage99 Nov 28, 2024
e74dc53
keybindings
azenkov Nov 28, 2024
a432de6
der frei improvements
azenkov Nov 30, 2024
dd3f4e7
Removing Spaces
EnderMage99 Nov 28, 2024
d112793
der_freischutz portal removal sight fix
EnderMage99 Nov 28, 2024
062fe45
Trickester Clown
EnderMage99 Nov 30, 2024
7a543b4
Woodsman chain
azenkov Jan 13, 2025
9cca5a7
Censored Nerf
EnderMage99 Jan 13, 2025
c8e590b
judgement_bird fix
EnderMage99 Jan 14, 2025
9a725eb
woodsman icons
EnderMage99 Jan 14, 2025
719bcd6
Icon Fix
EnderMage99 Jan 15, 2025
b992b31
woodsman info
EnderMage99 Jan 16, 2025
73c22fb
Rebase fix
azenkov Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ModularTegustation/ego_weapons/ranged/ego_bullets/waw.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
range = 18 // Don't want people shooting it through the entire facility
hit_nondense_targets = TRUE

/obj/projectile/ego_bullet/ego_magicbullet/on_hit(atom/target, blocked = FALSE, pierce_hit)
if(istype(target, /mob/living/simple_animal/hostile/der_freis_portal))
var/mob/living/simple_animal/hostile/der_freis_portal/P = target
P.death()
. = ..()



/obj/projectile/ego_bullet/ego_solemnlament
name = "solemn lament"
icon_state = "whitefly"
Expand Down
22 changes: 22 additions & 0 deletions ModularTegustation/tegu_items/rcorp/!abno_overwrites.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
/mob/living/simple_animal/hostile/abnormality/helper/Initialize()
if(IsCombatMap())
stuntime = 2 SECONDS
dash_num = 250
dash_damage = 60
dash_speed = 0.75
dash_attack_volune = 25
dash_move_min_volune = 10
dash_move_max_volune = 20
return ..()

//Frag needs a little damage buff
Expand Down Expand Up @@ -96,3 +102,19 @@
heal_percent_per_second = 0.01275
r_corp_regen_start = 0.5
return ..()

/mob/living/simple_animal/hostile/abnormality/yin/Initialize()
if(IsCombatMap())
pulse_cooldown = 8 SECONDS
move_to_delay = 5
UpdateSpeed()
ranged = TRUE
return ..()

/mob/living/simple_animal/hostile/abnormality/clown/Initialize()
if(IsCombatMap())
ranged_cooldown_time = 0.5 SECONDS
projectiletype = /obj/projectile/clown_throw_rcorp
finishing_small_damage = 12
finishing_big_damage = 80
return ..()
Loading
Loading