diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index adf5ab54b55..dd7cd7841fd 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -64,7 +64,6 @@ chosen_scan_type = "Bluespace readings" var/list/beacon_types = list( /mob/living/simple_animal/hostile/hivebotbeacon = 1, - /mob/living/simple_animal/hostile/hivebotbeacon/toxic = 1, /mob/living/simple_animal/hostile/hivebotbeacon/incendiary = 1 ) chosen_mob_types += pickweight(beacon_types) diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 1383f22cde3..e4662d1b829 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -207,16 +207,6 @@ taser_effect = TRUE agony = 0 -/obj/item/projectile/beam/hivebot/toxic - name = "concentrated gamma burst" - damage = 15 - damage_type = TOX - irradiate = 15 - taser_effect = 0 - muzzle_type = /obj/effect/projectile/muzzle/bfg - tracer_type = /obj/effect/projectile/tracer/bfg - impact_type = /obj/effect/projectile/impact/bfg - /obj/item/projectile/beam/hivebot/incendiary name = "archaic energy welder" damage_type = BURN @@ -277,12 +267,6 @@ var/list/close_destinations = list() var/area/latest_area attack_emote = "focuses on" - -/mob/living/simple_animal/hostile/hivebotbeacon/toxic - projectiletype = /obj/item/projectile/beam/hivebot/toxic - projectilesound = 'sound/weapons/laser3.ogg' - rapid = 0 - /mob/living/simple_animal/hostile/hivebotbeacon/incendiary projectiletype = /obj/item/projectile/beam/hivebot/incendiary projectilesound = 'sound/weapons/plasma_cutter.ogg' diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 10d89e840fd..638095bbec3 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1351,7 +1351,6 @@ /mob/living/simple_animal/hostile/krampus, /mob/living/simple_animal/hostile/gift, /mob/living/simple_animal/hostile/hivebotbeacon, - /mob/living/simple_animal/hostile/hivebotbeacon/toxic, /mob/living/simple_animal/hostile/hivebotbeacon/incendiary, /mob/living/simple_animal/hostile/republicon, /mob/living/simple_animal/hostile/republicon/ranged, diff --git a/html/changelogs/mattatlas-bruhmoments.yml b/html/changelogs/mattatlas-bruhmoments.yml new file mode 100644 index 00000000000..099ad8115a2 --- /dev/null +++ b/html/changelogs/mattatlas-bruhmoments.yml @@ -0,0 +1,41 @@ +################################ +# 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: MattAtlas + +# 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: + - rscdel: "Removes the toxin hivebot beacon as it is too powerful."