From 908489b1bd2edd68aaf4f4ee134537837a3b311f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 21 Jan 2020 15:13:49 -0800 Subject: [PATCH] Merge pull request #6640 from TheFurryFeline/patch-5 Aaaa, typo fixy --- .../items/weapons/grenades/spawnergrenade.dm | 4 +-- .../TheFurryFeline - Typo_Fixy_Again.yml | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/TheFurryFeline - Typo_Fixy_Again.yml diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 625fb11e0cf..5cab6580987 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -1,5 +1,5 @@ /obj/item/weapon/grenade/spawnergrenade - desc = "It is set to detonate in 5 seconds. It will unleash unleash an unspecified anomaly into the vicinity." + desc = "It is set to detonate in 5 seconds. It will unleash an unspecified anomaly into the vicinity." name = "delivery grenade" icon = 'icons/obj/grenade.dmi' icon_state = "delivery" @@ -76,4 +76,4 @@ throw_speed = 1 throw_range = 4 w_class = ITEMSIZE_LARGE - deliveryamt = 6 \ No newline at end of file + deliveryamt = 6 diff --git a/html/changelogs/TheFurryFeline - Typo_Fixy_Again.yml b/html/changelogs/TheFurryFeline - Typo_Fixy_Again.yml new file mode 100644 index 00000000000..fb38f29e2aa --- /dev/null +++ b/html/changelogs/TheFurryFeline - Typo_Fixy_Again.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: TheFurryFeline + +# 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: + - bugfix: "Fixes an extra 'unleash' in desc.."