From 89199bc19c86c44f104bd7f6069f2fcbbd7f7899 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 2 Jan 2017 00:19:36 -0600 Subject: [PATCH] Device cells fit in wall chargers --- code/game/machinery/recharger.dm | 2 +- html/changelogs/Anewbe - WallCharger.yml | 36 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Anewbe - WallCharger.yml diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index acba542dfaf..13168e19f46 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -189,7 +189,7 @@ obj/machinery/recharger icon = 'icons/obj/stationobjs.dmi' icon_state = "wrecharger0" active_power_usage = 25000 //25 kW , It's more specialized than the standalone recharger (guns and batons only) so make it more powerful - allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton) + allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/weapon/cell/device) icon_state_charged = "wrecharger2" icon_state_charging = "wrecharger1" icon_state_idle = "wrecharger0" diff --git a/html/changelogs/Anewbe - WallCharger.yml b/html/changelogs/Anewbe - WallCharger.yml new file mode 100644 index 00000000000..72d4bd48632 --- /dev/null +++ b/html/changelogs/Anewbe - WallCharger.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: 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: + - bugfix: "Device cells now fit in wall rechargers." \ No newline at end of file