From 9549976ba2d2b9bc89378547fb7b6a050ccdf07e Mon Sep 17 00:00:00 2001 From: jonathan123700 Date: Mon, 11 Nov 2024 19:02:22 +0200 Subject: [PATCH 1/2] scarab gaming --- .../heavy_vehicle/equipment/utility.dm | 2 +- html/changelogs/Snowy1237-mech_lathe_fix.yml | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Snowy1237-mech_lathe_fix.yml diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index 0b35a3a96f2..7fb3a638012 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -621,7 +621,7 @@ /obj/item/mecha_equipment/autolathe/afterattack(atom/target, mob/living/user, inrange, params) . = ..() - if(istype(target, /obj/item/stack/material/steel) || istype(target, /obj/item/stack/material/glass)) + if(istype(target, /obj/item/stack/material/steel) || istype(target, /obj/item/stack/material/glass) || istype(target, /obj/item/stack/material/aluminium) || istype(target, /obj/item/stack/material/lead) || istype(target, /obj/item/stack/material/plastic)) owner.visible_message(SPAN_NOTICE("\The [owner] loads \the [target] into \the [src].")) lathe.attackby(target, owner) diff --git a/html/changelogs/Snowy1237-mech_lathe_fix.yml b/html/changelogs/Snowy1237-mech_lathe_fix.yml new file mode 100644 index 00000000000..a90fb31eaa9 --- /dev/null +++ b/html/changelogs/Snowy1237-mech_lathe_fix.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Snowy1237 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed the exosuit autolathe being unable to pick up lead, aluminium or plastic." From f4e0c4a3d727a9363f00c70aa1d7738dd3b0b7e6 Mon Sep 17 00:00:00 2001 From: jonathan123700 Date: Mon, 11 Nov 2024 23:17:30 +0200 Subject: [PATCH 2/2] should work --- code/modules/heavy_vehicle/equipment/utility.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index 7fb3a638012..aa1fc9119ed 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -621,7 +621,7 @@ /obj/item/mecha_equipment/autolathe/afterattack(atom/target, mob/living/user, inrange, params) . = ..() - if(istype(target, /obj/item/stack/material/steel) || istype(target, /obj/item/stack/material/glass) || istype(target, /obj/item/stack/material/aluminium) || istype(target, /obj/item/stack/material/lead) || istype(target, /obj/item/stack/material/plastic)) + if(is_type_in_list(target, list(/obj/item/stack/material/steel, /obj/item/stack/material/glass, /obj/item/stack/material/aluminium, /obj/item/stack/material/lead, /obj/item/stack/material/plastic))) owner.visible_message(SPAN_NOTICE("\The [owner] loads \the [target] into \the [src].")) lathe.attackby(target, owner)