From 7039f319fe1d623cb106b616d468c67bddfa2a08 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Thu, 20 Aug 2020 14:28:24 +0100 Subject: [PATCH] Any type of wirecutter can now be used to carve a bucket into a hat. (#9710) --- .../reagents/reagent_containers/glass.dm | 4 +- html/changelogs/bucket_carving.yml | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/bucket_carving.yml diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 95aa567875b..b81b88d23b3 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -236,7 +236,6 @@ unacidable = 0 drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' - var/carving_weapon = /obj/item/wirecutters var/helmet_type = /obj/item/clothing/head/helmet/bucket no_shatter = TRUE fragile = 0 @@ -248,7 +247,7 @@ user.put_in_hands(new /obj/item/bucket_sensor) qdel(src) return - else if(istype(D, carving_weapon)) + else if(D.iswirecutter()) to_chat(user, "You cut a big hole in \the [src] with \the [D].") user.put_in_hands(new helmet_type) qdel(src) @@ -288,7 +287,6 @@ matter = list("wood" = 50) drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' - carving_weapon = /obj/item/material/hatchet helmet_type = /obj/item/clothing/head/helmet/bucket/wood /obj/item/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob) diff --git a/html/changelogs/bucket_carving.yml b/html/changelogs/bucket_carving.yml new file mode 100644 index 00000000000..397742c4573 --- /dev/null +++ b/html/changelogs/bucket_carving.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: mikomyazaki + +# 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: "Any type of wirecutter can now be used to carve a bucket into a hat." \ No newline at end of file