From 9df9e135a6b05cc05fe096b7e46d9e490b3d35a0 Mon Sep 17 00:00:00 2001 From: Neerti Date: Mon, 22 Apr 2019 00:26:44 -0400 Subject: [PATCH 1/2] Merge pull request #6105 from Heroman3003/climbybois Fixes borgs being unable to use ladders --- code/modules/multiz/structures.dm | 4 +++ .../changelogs/Heroman3003 - borgclimbing.yml | 36 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 html/changelogs/Heroman3003 - borgclimbing.yml diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index c22e17a789e..a13a1457a34 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -68,6 +68,10 @@ if(target_ladder) M.forceMove(get_turf(target_ladder)) +/obj/structure/ladder/attack_robot(var/mob/M) + attack_hand(M) + return + /obj/structure/ladder/proc/getTargetLadder(var/mob/M) if((!target_up && !target_down) || (target_up && !istype(target_up.loc, /turf) || (target_down && !istype(target_down.loc,/turf)))) to_chat(M, "\The [src] is incomplete and can't be climbed.") diff --git a/html/changelogs/Heroman3003 - borgclimbing.yml b/html/changelogs/Heroman3003 - borgclimbing.yml new file mode 100644 index 00000000000..d65dad24bd5 --- /dev/null +++ b/html/changelogs/Heroman3003 - borgclimbing.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: N3X15 + +# 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: "Cyborgs can now use ladders regardless of whether they have a tool enabled or not."