From 98c1bcb6144cc3594c04c963ae75b1940bfd4f76 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 20 Nov 2016 01:39:50 +0000 Subject: [PATCH 1/3] Allows borgs to use toggle lock on closets/crates --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- .../structures/crates_lockers/closets/secure/secure_closets.dm | 2 +- code/game/objects/structures/crates_lockers/crates.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 28fea14370..74746c37d0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -317,7 +317,7 @@ if(!usr.canmove || usr.stat || usr.restrained()) return - if(ishuman(usr)) + if(ishuman(usr) || isrobot(usr)) src.add_fingerprint(usr) src.toggle(usr) else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 49fe7bbdd3..5a6962f710 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -134,7 +134,7 @@ if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain return - if(ishuman(usr)) + if(ishuman(usr) || isrobot(usr)) src.add_fingerprint(usr) src.togglelock(usr) else diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 931a990085..62a3c64e48 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -177,7 +177,7 @@ if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain return - if(ishuman(usr)) + if(ishuman(usr) || isrobot(usr)) src.add_fingerprint(usr) src.togglelock(usr) else From 9822c9bbdb5137b90e666a22b0b301d6519a5831 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 20 Nov 2016 02:53:05 +0000 Subject: [PATCH 2/3] changelog --- html/changelogs/Yoshax-Robots.yml | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Yoshax-Robots.yml diff --git a/html/changelogs/Yoshax-Robots.yml b/html/changelogs/Yoshax-Robots.yml new file mode 100644 index 0000000000..c18c6a14b5 --- /dev/null +++ b/html/changelogs/Yoshax-Robots.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: Yoshax + +# 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: + - tweak: "Robots can now use the toggle lock verb on crates and lockers." From 2c6d023fc78b3f329f3f200000ea48f6ca0ff1b2 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 20 Nov 2016 17:23:50 +0000 Subject: [PATCH 3/3] Changes an attack_ai to attack_robot --- code/game/objects/structures/crates_lockers/closets.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 74746c37d0..df4fcc83f6 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -288,8 +288,8 @@ src.add_fingerprint(user) return -/obj/structure/closet/attack_ai(mob/user) - if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI. +/obj/structure/closet/attack_robot(mob/user) + if(Adjacent(user)) attack_hand(user) /obj/structure/closet/relaymove(mob/user as mob)