diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 935ec9745bd..93a9bdc8b20 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -6,6 +6,6 @@ /obj/item/grenade/empgrenade/prime() ..() - if(empulse(src, 4, 10)) + if(empulse(src, 2, 5)) qdel(src) return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 7b9cf20965d..45fccf178e8 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -874,9 +874,9 @@ /datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. - // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. - empulse(location, round(created_volume / 24), round(created_volume / 14), 1) + // 100 created volume = ~1 heavy range & ~2 light range. + // 200 created volume = ~2 heavy range & ~4 light range. + empulse(location, round(created_volume / 6), round(created_volume / 3), 1) holder.clear_reagents() return diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm index 18165cf0d41..f4d2a02598e 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm @@ -10,5 +10,5 @@ /datum/artifact_effect/emp/DoEffectPulse() if(holder) var/turf/T = get_turf(holder) - empulse(T, effectrange/2, effectrange) + empulse(T, effectrange/1, effectrange) return 1 diff --git a/html/changelogs/paradoxspace-sparklesparkle.yml b/html/changelogs/paradoxspace-sparklesparkle.yml new file mode 100644 index 00000000000..bffef8d5750 --- /dev/null +++ b/html/changelogs/paradoxspace-sparklesparkle.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# 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: + - balance: "Antag emp grenades and artifacts have been halved in range." + - balance: "Chem EMP grenades have been massively scaled back in range." \ No newline at end of file