diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index d50bfb6435c..3992f41c293 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -130,7 +130,7 @@ /mob/living/simple_animal/hostile/giant_spider/bombardier name = "greimorian bombardier" - desc = "A disgusting crawling Greimorian. This one has vents that shoot out condensed capsaicin." + desc = "A disgusting crawling Greimorian. This one has vents that shoot out acid." icon_state = "greimorian_bombardier" icon_living = "greimorian_bombardier" icon_dead = "greimorian_bombardier_dead" @@ -141,10 +141,10 @@ armor_penetration = 5 ranged = TRUE ranged_attack_range = 4 - poison_type = /singleton/reagent/capsaicin/condensed + poison_type = /singleton/reagent/acid/greimorian poison_per_bite = 2 speed = 5 - sample_data = list("Genetic markers identified as being linked with stem cell differentiaton", "Exocrinic caspaicin synthesis detected") + sample_data = list("Genetic markers identified as being linked with stem cell differentiaton", "Exocrinic acid synthesis detected") smart_melee = TRUE /mob/living/simple_animal/hostile/giant_spider/bombardier/Shoot(var/target, var/start, var/mob/user, var/bullet = 0) @@ -155,8 +155,8 @@ var/turf/target_turf = get_turf(target) var/obj/effect/effect/water/chempuff/pepperspray = new /obj/effect/effect/water/chempuff(get_turf(src)) - pepperspray.create_reagents(15) - pepperspray.reagents.add_reagent(poison_type, 15) + pepperspray.create_reagents(10) + pepperspray.reagents.add_reagent(poison_type, 10) pepperspray.set_color() pepperspray.set_up(target_turf, 3, 5) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index f9e4f6d4524..db40428533c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -548,6 +548,17 @@ ABSTRACT_TYPE(/singleton/reagent/alcohol) color = "#d8ff00" value = 0 +/// Acid used by Greimorians. More toxic but significantly less acidic +/singleton/reagent/acid/greimorian + name = "Greimorian Acid" + description = "Greimorian acid commonly used by bombardiers. Very toxic but hardly acidic." + taste_description = "coppery foulness" + reagent_state = LIQUID + color = "#aecc04" + power = 2 + meltdose = 100 // it fires 15u per shot, this needs to be very high + value = 2 + /singleton/reagent/silicon name = "Silicon" description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." diff --git a/html/changelogs/Ben10083 - Gremorian Acid.yml b/html/changelogs/Ben10083 - Gremorian Acid.yml new file mode 100644 index 00000000000..44dabf626f8 --- /dev/null +++ b/html/changelogs/Ben10083 - Gremorian Acid.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - experiment: "Greimorian bombardiers now shoot an acid instead of capsaicin."