diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 8e5b755b91c..372b23a7b66 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -5,6 +5,7 @@ icon_state = "delivery" item_state = "flashbang" origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4) + var/flash = TRUE // this var handles whether we blind people when we explode var/banglet = 0 var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver @@ -16,9 +17,12 @@ // Make a quick flash var/turf/T = get_turf(src) playsound(T, 'sound/effects/phasein.ogg', 100, 1) - for(var/mob/living/carbon/human/M in viewers(T, null)) - if(M.eyecheck(TRUE) < FLASH_PROTECTION_MODERATE) - flick("e_flash", M.flash) + if (flash) + for(var/mob/living/carbon/human/M in viewers(T, null)) + if(M.eyecheck(TRUE) < FLASH_PROTECTION_MODERATE) + flick("e_flash", M.flash) + else + spark(T, 3, alldirs) //give spawning some flair if there's no flash for(var/i=1, i<=deliveryamt, i++) var/atom/movable/x = new spawner_type @@ -39,8 +43,9 @@ name = "manhack delivery grenade" desc = "It is set to detonate in 5 seconds. It will unleash a swarm of deadly manhack robots that will attack everyone but you and your allies." spawner_type = /mob/living/simple_animal/hostile/viscerator - deliveryamt = 5 + deliveryamt = 5 //Five seems a bit much, but we'll keep it as-is. origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) + flash = FALSE /obj/item/weapon/grenade/spawnergrenade/spesscarp name = "carp delivery grenade" diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 52cfc29f5e5..5785b10c898 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -146,7 +146,7 @@ pass_flags = PASSTABLE health = 15 maxHealth = 15 - melee_damage_lower = 15 + melee_damage_lower = 10 melee_damage_upper = 15 density = 0 attacktext = "cut" diff --git a/html/changelogs/geeves-visceratornerf.yml b/html/changelogs/geeves-visceratornerf.yml new file mode 100644 index 00000000000..dd20d156cb2 --- /dev/null +++ b/html/changelogs/geeves-visceratornerf.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: Geeves + +# 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: "Removed the flash effect from manhack grenades." + - tweak: "Made manhacks / viscerators easier to hit, and made them do less damage on average." diff --git a/icons/mob/npc/critter.dmi b/icons/mob/npc/critter.dmi index f63949af792..079df7c8035 100644 Binary files a/icons/mob/npc/critter.dmi and b/icons/mob/npc/critter.dmi differ