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

[TM] Temporary R-Corp Fix #2594

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 3 additions & 17 deletions ModularTegustation/ego_weapons/melee/non_abnormality/rcorp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,20 @@
TEMPERANCE_ATTRIBUTE = 55,
JUSTICE_ATTRIBUTE = 55,
)
var/rcorp_buff = 0

/obj/item/ego_weapon/city/rabbit_blade/Initialize()
if(SSmaptype.maptype == "rcorp")
rcorp_buff = 20
force += rcorp_buff
return ..()

/obj/item/ego_weapon/city/rabbit_blade/attack_self(mob/living/user)
switch(damtype)
if(RED_DAMAGE)
damtype = WHITE_DAMAGE
if(WHITE_DAMAGE)
damtype = BLACK_DAMAGE
force = rcorp_buff + 30
force = 30
if(BLACK_DAMAGE)
damtype = PALE_DAMAGE
force = rcorp_buff + 25
force = 25
if(PALE_DAMAGE)
damtype = RED_DAMAGE
force = rcorp_buff + 35
force = 35
to_chat(user, span_notice("\The [src] will now deal [damtype] damage."))
playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)

Expand Down Expand Up @@ -235,13 +228,6 @@
JUSTICE_ATTRIBUTE = 55
)
var/teleporting
var/rcorp_buff = 0

/obj/item/ego_weapon/city/rabbit_rush/Initialize()
if(SSmaptype.maptype == "rcorp")
rcorp_buff = 20
force += rcorp_buff
return ..()

/obj/item/ego_weapon/city/rabbit_rush/attack_self(mob/user)
if(!CanUseEgo(user))
Expand Down
22 changes: 0 additions & 22 deletions ModularTegustation/tegu_items/rcorp/!abno_overwrites.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,3 @@
if(SSmaptype.maptype == "rcorp")
bullet_damage = 200
return ..()

//Warden deals even less damage then more bodies they eat, and they take more damage from all attacks.
//Warden currently slowballs far to quickly, so this nerf should give R-Corp a better chance at fighting back against them.
/mob/living/simple_animal/hostile/abnormality/warden/Initialize()
if(IsCombatMap())
damage_down = 10
return ..()

//Censored no longer applies his statues effect passivly, Now he needs to hit his ranged attack to apply it.
//For that reason, I am reducing the cooldown for that ranged attack and lowering it's damage by around 50%, so they can at least try to apply it more often.
/mob/living/simple_animal/hostile/abnormality/censored/Initialize()
if(SSmaptype.maptype == "rcorp")
ability_damage = 120
ability_cooldown_time = 6 SECONDS
return ..()

//Nothing There passive healing will only start when they are under 50% health. But, I am increasing that healing by 50%.
/mob/living/simple_animal/hostile/abnormality/nothing_there/Initialize()
if(SSmaptype.maptype == "rcorp")
heal_percent_per_second = 0.01275
r_corp_regen_start = 0.5
return ..()
71 changes: 4 additions & 67 deletions _maps/map_files/Event/rcorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,6 @@
/obj/machinery/telecomms/server/presets/engineering,
/turf/open/floor/circuit/telecomms/mainframe,
/area/city/outskirts)
"cj" = (
/obj/structure/closet/crate{
name = "rcorp explosives";
color = "#d67200"
},
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/effect/turf_decal/box/red,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/black,
/obj/item/grenade/r_corp/pale,
/obj/item/grenade/r_corp/pale,
/turf/open/floor/pod/dark,
/area/city/outskirts)
"co" = (
/obj/effect/landmark/abno_objectivespawn,
/turf/open/floor/plating/asteroid,
Expand Down Expand Up @@ -298,38 +273,6 @@
/obj/item/clothing/suit/armor/ego_gear/rcorp_officer,
/turf/open/floor/pod,
/area/city/outskirts)
"nV" = (
/obj/structure/closet/crate{
name = "rcorp explosives";
color = "#d67200"
},
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/effect/turf_decal/box/red,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp/white,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/obj/item/grenade/r_corp,
/turf/open/floor/pod/dark,
/area/city/outskirts)
"oi" = (
/turf/closed/indestructible/rock,
/area/city/outskirts)
Expand Down Expand Up @@ -806,12 +749,6 @@
/obj/machinery/telecomms/server/presets/common,
/turf/open/floor/circuit/telecomms/mainframe,
/area/city/outskirts)
"LX" = (
/obj/effect/turf_decal/caution/red{
dir = 8
},
/turf/open/floor/pod/light,
/area/city/outskirts)
"Mk" = (
/obj/effect/turf_decal/sand,
/obj/machinery/sleeper/syndie,
Expand Down Expand Up @@ -8818,9 +8755,9 @@ aC
aC
aC
UE
LX
Hk
LX
Hk
Hk
pi
aC
QY
Expand Down Expand Up @@ -9020,9 +8957,9 @@ fC
RY
aC
UE
nV
Qd
cj
Qd
Qd
oj
aC
aC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,17 @@
var/ability_cooldown
var/ability_cooldown_time = 10 SECONDS

/mob/living/simple_animal/hostile/abnormality/censored/Login()
. = ..()
to_chat(src, "<h1>You are CENSORED, A Tank Role Abnormality.</h1><br>\
<b>|'CENSORED, CENSORED'|: When you click on a tile outside your melee range, you will trigger your ranged attack.<br>\
When you trigger your ranged attack, there will be a short delay before you will send out a 'CENSORED' towards your target tile.<br>\
Anyone who is hit by your 'CENSORED' will take BLACK damage and will gain the statues effect 'Overwhelming Fear'<br>\
If you don't want to trigger you ranged attack when clicking on a tile, you can hold SHIFT while clicking on a tile to disable it.<br>\
<br>\
|Overwhelming Fear|: Humans with this statues effect will have their sanity quickly reduce to 30%, And this statues effect lasts for 20 seconds.<br>\
<br>\
|'...CENSORED?'|: When you attack a dead human, you will convert them into a mini 'CENSORED'.<br>\
Each time you convert a human into a mini 'CENSORED' you heal 10% of your max HP.<br>\
However, Once a mini 'CENSORED' is killed, all humans around them heal 40% of their SP.</b>")


/mob/living/simple_animal/hostile/abnormality/censored/Life()
. = ..()
if(!.)
return
// Apply and refresh status effect to all humans nearby
if(SSmaptype.maptype != "rcorp")
for(var/mob/living/carbon/human/H in view(7, src))
if(H.stat == DEAD)
continue
if(faction_check_mob(H))
continue
H.apply_status_effect(STATUS_EFFECT_OVERWHELMING_FEAR)
for(var/mob/living/carbon/human/H in view(7, src))
if(H.stat == DEAD)
continue
if(faction_check_mob(H))
continue
H.apply_status_effect(STATUS_EFFECT_OVERWHELMING_FEAR)

/mob/living/simple_animal/hostile/abnormality/censored/FearEffectText(mob/affected_mob, level = 0)
level = num2text(clamp(level, 3, 5))
Expand Down Expand Up @@ -199,7 +183,6 @@
for(var/turf/TT in turf_list)
for(var/mob/living/L in HurtInTurf(TT, list(), ability_damage, BLACK_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE))
new /obj/effect/temp_visual/dir_setting/bloodsplatter(get_turf(L), pick(GLOB.alldirs))
L.apply_status_effect(STATUS_EFFECT_OVERWHELMING_FEAR)
can_act = TRUE

/* Work */
Expand Down Expand Up @@ -276,7 +259,6 @@
del_on_death = TRUE
density = FALSE
var/list/breach_affected = list()
var/recoved_sanity = 0.2

/mob/living/simple_animal/hostile/mini_censored/Initialize()
. = ..()
Expand Down Expand Up @@ -316,18 +298,6 @@
to_chat(H, span_warning("Damn, it's scary."))
return

/mob/living/simple_animal/hostile/mini_censored/death(gibbed)
if(SSmaptype.maptype == "rcorp")
for(var/mob/living/carbon/human/H in view(5, src))
if(H.stat == DEAD)
continue
if(faction_check_mob(H))
continue
H.adjustSanityLoss(-(H.getMaxSanity() * recoved_sanity))
playsound(H, 'sound/abnormalities/voiddream/skill.ogg', 40, TRUE, 2)
to_chat(H, span_nicegreen("Good... It is now dead."))
return ..()

// Status effect applied by CENSORED
/datum/status_effect/overwhelming_fear
id = "overwhelming_fear"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@

var/last_heal_time = 0
var/heal_percent_per_second = 0.0085
var/regen_on = TRUE
var/r_corp_regen_start = 1

var/datum/looping_sound/nothingthere_ambience/soundloop
var/datum/looping_sound/nothingthere_heartbeat/heartbeat
Expand Down Expand Up @@ -230,15 +228,10 @@
GiveTarget(speaker)
say(line)
if((last_heal_time + 1 SECONDS) < world.time) // One Second between heals guaranteed
if(SSmaptype.maptype == "rcorp")
regen_on = TRUE
if(health > maxHealth * r_corp_regen_start)
regen_on = FALSE
if(regen_on == TRUE)
var/heal_amount = ((world.time - last_heal_time)/10)*heal_percent_per_second*maxHealth
if(health <= maxHealth*0.3)
heal_amount *= 2
adjustBruteLoss(-heal_amount)
var/heal_amount = ((world.time - last_heal_time)/10)*heal_percent_per_second*maxHealth
if(health <= maxHealth*0.3)
heal_amount *= 2
adjustBruteLoss(-heal_amount)
last_heal_time = world.time
if(next_transform && (world.time > next_transform))
next_stage()
Expand Down
23 changes: 3 additions & 20 deletions code/modules/mob/living/simple_animal/abnormality/he/eris.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@
Hours later, Eris dines with another stranger. <br>My head is resting on that very same plate."

var/girlboss_level = 0
var/can_heal = TRUE

/mob/living/simple_animal/hostile/abnormality/eris/Login()
. = ..()
to_chat(src, "<h1>You are Eris, A Tank Role Abnormality.</h1><br>\
<b>|Humanoid Disguise|: You are only able to attack humans who only have a very low amount of health, or if they are dead.<br>\
If they attack a human who fulfills the above conditions, you will devor them, and gain a stack of 'Girl Boss'<br>\
<br>\
|Dine with me...|: Every second, you heal ALL targets that you can see if they are bellow half health.<br>\
Your healing increases depending on the amount of 'Girl Boss' you have.<br>\
<br>\
|Elegant Form|: When you are attacked by a human, deal WHITE damage to the attack. This damage is increase depending on your 'Girl Boss' stacks.</b>")

//Okay, but here's the breach on death
/mob/living/simple_animal/hostile/abnormality/eris/Initialize()
Expand Down Expand Up @@ -192,17 +180,12 @@
//Okay, but here's the math
/mob/living/simple_animal/hostile/abnormality/eris/proc/healpulse()
for(var/mob/living/H in view(10, get_turf(src)))
can_heal = TRUE
if(H.stat >= SOFT_CRIT)
continue
//Shamelessly fucking stolen from risk of rain's teddy bear. Maxes out at 20.
if(SSmaptype.maptype == "rcorp")
if(H.health > H.maxHealth*0.5)
can_heal = FALSE
if (can_heal == TRUE)
var/healamount = 20 * (TOUGHER_TIMES(girlboss_level))
H.adjustBruteLoss(-healamount) //Healing for those around.
new /obj/effect/temp_visual/heal(get_turf(H), "#FF4444")
var/healamount = 20 * (TOUGHER_TIMES(girlboss_level))
H.adjustBruteLoss(-healamount) //Healing for those around.
new /obj/effect/temp_visual/heal(get_turf(H), "#FF4444")

//Okay but here's the defensive options
/mob/living/simple_animal/hostile/abnormality/eris/bullet_act(obj/projectile/Proj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,6 @@
/datum/action/innate/abnormality_attack/kog_teleport,
)

/mob/living/simple_animal/hostile/abnormality/greed_king/Login()
. = ..()
to_chat(src, "<h1>You are King of Greed, A Tank Role Abnormality.</h1><br>\
<b>|Gilded Cage|: Your size is 3 by 3 tiles wide, however you can still fit in 1 by 1 areas.<br>\
<br>\
|Endless Hunger|: When you click on a tile outside your melee range, you will start charging into the direction you clicked.<br>\
There is a 1.5 second delay before you start charging, once you start charging into a direction you will constantly move in one direction.<br>\
If human gets within your melee range while charging, you will instantly gib them. If a abnormality appears in your path, you will deal damage to them.<br>\
Your charge ends after you move into a wall, or any dense object. (RHINOS/OTHER ABNORMALITIES WILL STOP YOUR CHARGE)</b>")

/datum/action/innate/abnormality_attack/kog_dash
name = "Ravenous Charge"
button_icon_state = "kog_charge"
Expand Down Expand Up @@ -182,35 +172,9 @@
if(1)
var/dir_to_target = get_cardinal_dir(get_turf(src), get_turf(target))
can_act = FALSE
// do particle effect
if (IsCombatMap())
manual_emote("starts shaking...")
SLEEP_CHECK_DEATH(15)
addtimer(CALLBACK(src, PROC_REF(warning_effect), get_turf(src), dir_to_target, 0, target), 0 SECONDS)
charge(dir_to_target, 0, target)
return

/obj/effect/temp_visual/cult/sparks/greed
duration = 4

/mob/living/simple_animal/hostile/abnormality/greed_king/proc/warning_effect(turf, move_dir, times_ran, target)
var/stop_warning = FALSE
if(times_ran >= dash_num)
stop_warning = TRUE
var/turf/T = get_step(turf, move_dir)
if(!T)
stop_warning = TRUE
return
if(T.density)
stop_warning = TRUE
for(var/obj/machinery/door/D in T.contents)
if(D.density)
stop_warning = TRUE
for(var/turf/open/R in range(1, T))
new /obj/effect/temp_visual/cult/sparks/greed(R)
if (!stop_warning)
addtimer(CALLBACK(src, PROC_REF(warning_effect), T, move_dir, (times_ran + 1)), 1)

/mob/living/simple_animal/hostile/abnormality/greed_king/proc/charge(move_dir, times_ran, target)
setDir(move_dir)
var/stop_charge = FALSE
Expand Down
Loading
Loading