From f284970358d1955664310774329dcaafcd159e47 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 28 Mar 2017 23:50:21 -0500 Subject: [PATCH] Adds craftable whetstones, changelog --- code/modules/materials/material_recipes.dm | 1 + html/changelogs/Anewbe - Weapons.yml | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 html/changelogs/Anewbe - Weapons.yml diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index e7c7d0ecd9..81fbf14afd 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -96,6 +96,7 @@ recipes += new/datum/stack_recipe("knife grip", /obj/item/weapon/material/butterflyhandle, 4, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("dark floor tile", /obj/item/stack/tile/floor_dark, 1, 4, 20) recipes += new/datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1) + recipes += new/datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10) /material/sandstone/generate_recipes() ..() diff --git a/html/changelogs/Anewbe - Weapons.yml b/html/changelogs/Anewbe - Weapons.yml new file mode 100644 index 0000000000..353ffdc505 --- /dev/null +++ b/html/changelogs/Anewbe - Weapons.yml @@ -0,0 +1,38 @@ +################################ +# 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: Anewbe + +# 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: + - rscadd: "Material weapons now go dull instead of shattering. Certain weapons, like spears, will still shatter." + - rscadd: "Dull weapons do less damage, but can be sharpened with a whetstone." + - rscadd: "Whetstones can be crafted using plasteel." \ No newline at end of file