diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 1157d5df50d..7c4a4f5919b 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -97,10 +97,11 @@ if(isturf(A) || isturf(A.loc)) if(A.Adjacent(src)) // see adjacent.dm - var/resolved = A.attackby(W, src) - if(!resolved && A && W) - W.afterattack(A, src, 1, params) - return + if(W) + var/resolved = W.resolve_attackby(A, src, params) + if(!resolved && A && W) + W.afterattack(A, src, 1, params) + return else W.afterattack(A, src, 0, params) return diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index f05d9fd7fe2..c0b69c9e0b5 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -262,8 +262,6 @@ RFD Service-Class number_of_modes = 5 /obj/item/weapon/rfd/service/resolve_attackby(atom/A, mob/user as mob, var/click_parameters) - - if(istype(user,/mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user if(R.stat || !R.cell || R.cell.charge <= 0) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 37d4aeda10a..8310978cc0d 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -6,7 +6,6 @@ throw_speed = 3 throw_range = 3 max_amount = 50 - center_of_mass = null var/default_type = DEFAULT_WALL_MATERIAL var/material/material diff --git a/html/changelogs/190924-bugfix_rfd.yml b/html/changelogs/190924-bugfix_rfd.yml new file mode 100644 index 00000000000..84c1ae60581 --- /dev/null +++ b/html/changelogs/190924-bugfix_rfd.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: Ferner + +# 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: "Fixed missing impact wrench sprites, fixed rfd-s not working for stationbounds, fixed pixel-precision when placing material sheets on tables." diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 244385ab3da..db4f06eb8f9 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ