From 45e9c3d4fc382d4a2800b3832888d181f825dd52 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 26 Jun 2022 14:11:49 +0200 Subject: [PATCH] Fixes sensors being unrepairable. (#14364) --- .../overmap/ships/computers/sensors.dm | 4 +- html/changelogs/mattatlas-sensorsfix.yml | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/mattatlas-sensorsfix.yml diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 6288f14c957..b3b2b4ed101 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -129,7 +129,7 @@ /obj/machinery/shipsensors/attackby(obj/item/W, mob/user) var/damage = max_health - health - if(damage && iswelder(W)) + if(damage && W.iswelder()) var/obj/item/weldingtool/WT = W @@ -139,7 +139,7 @@ if(WT.use(0,user)) to_chat(user, "You start repairing the damage to [src].") playsound(src, 'sound/items/welder.ogg', 100, 1) - if(WT.use_tool(src, user, max(5, damage / 5),, volume = 50) && WT && WT.isOn()) + if(WT.use_tool(src, user, max(5, damage / 5), volume = 50) && WT && WT.isOn()) to_chat(user, "You finish repairing the damage to [src].") take_damage(-damage) else diff --git a/html/changelogs/mattatlas-sensorsfix.yml b/html/changelogs/mattatlas-sensorsfix.yml new file mode 100644 index 00000000000..e33512ae735 --- /dev/null +++ b/html/changelogs/mattatlas-sensorsfix.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: + - bugfix: "Sensors can now actually be repaired with a welder."