diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 80f4d996dcb..96b9e2302e1 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -110,6 +110,10 @@ start_process() +/obj/structure/cult/pylon/Destroy() + processing_objects.Remove(src) + ..() + //Another subtype which starts with infinite empower shots. For empowered adminbus /obj/structure/cult/pylon/turret/empowered empowered = 99999999 @@ -202,12 +206,13 @@ if (2) if ((ticks % process_interval) == 0) handle_firing() - if (damagetaken && prob(50)) + if (damagetaken && prob(50) && empowered > 0) damagetaken = max(0, damagetaken-1) //An empowered pylon slowly self repairs + empowered = max(0, empowered - 0.2) if (prob(10)) visible_message("Cracks in the [src] gradually seal as new crystalline matter grows to fill them.") - if (empowered && prob(2)) + if (empowered && prob(4)) empowered = max(0, empowered - 1) //Overcharging gradually wears off over time if (empowered <= 0) update_icon() @@ -330,7 +335,7 @@ fire_at(target) return else - stuffcache = mobs_in_view(10, src) + stuffcache = mobs_in_view(9, src) //for (var/turf/T in stuffcache) //new /obj/effect/testtrans(T) if ((target in stuffcache) && isInSight(src, target)) @@ -342,7 +347,7 @@ //We may have already populated stuffcache this run, dont repeat work if (!stuffcache) - stuffcache = mobs_in_view(10, src) + stuffcache = mobs_in_view(9, src) target = null //Either we lost a target or lack one //for (var/turf/T in stuffcache) @@ -465,7 +470,7 @@ visible_message( "The beam refracts inside the pylon, splitting into an indistinct violet glow. The crystal takes on a new, more ominous aura!" ) - empowered += damage*0.3 + empowered += damage*0.2 //When shot with a laser, the pylon absorbs the beam, becoming empowered for a while, glowing brighter // and firing more powerful blasts which have some armor penetration // Using lasers to empower a defensive pylon yields more total damage than directly shooting your enemies @@ -485,7 +490,7 @@ if(!isbroken) if (user) user.do_attack_animation(src) - if(prob(damagetaken*0.5)) + if(prob(damagetaken*0.75)) shatter() else if (user && !ranged) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 449cdfe14ec..1da05c6eecf 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -269,9 +269,9 @@ name = "energy bolt" //For projectiles name is only shown in onhit messages, so its more of a layman's description //of what the projectile looks like - damage = 4 //Very weak - armor_penetration = 10 + damage = 3.5 //Very weak accuracy = 4 //Guided by magic, unlikely to miss + eyeblur = 0 //Not bright or blinding var/mob/living/ignore muzzle_type = /obj/effect/projectile/cult/muzzle @@ -289,8 +289,8 @@ /obj/item/projectile/beam/cult/heavy name = "glowing energy bolt" - damage = 12 //Stronger and better armor penetration, though still much weaker than a typical laser - armor_penetration = 15 + damage = 10 //Stronger and better armor penetration, though still much weaker than a typical laser + armor_penetration = 10 muzzle_type = /obj/effect/projectile/cult/heavy/muzzle tracer_type = /obj/effect/projectile/cult/heavy/tracer diff --git a/html/changelogs/Nanako-Pylontweak.yml b/html/changelogs/Nanako-Pylontweak.yml new file mode 100644 index 00000000000..32924cdee3f --- /dev/null +++ b/html/changelogs/Nanako-Pylontweak.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nanako + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Slightly reduced the power of cult pylon turrets. This is an iterative process, they will be rebalanced gradually."