mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Merge pull request #2783 from Yoshax/robotsucks
Allows borgs to use toggle lock on closets/crates
This commit is contained in:
@@ -288,8 +288,8 @@
|
|||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/structure/closet/attack_ai(mob/user)
|
/obj/structure/closet/attack_robot(mob/user)
|
||||||
if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI.
|
if(Adjacent(user))
|
||||||
attack_hand(user)
|
attack_hand(user)
|
||||||
|
|
||||||
/obj/structure/closet/relaymove(mob/user as mob)
|
/obj/structure/closet/relaymove(mob/user as mob)
|
||||||
@@ -317,7 +317,7 @@
|
|||||||
if(!usr.canmove || usr.stat || usr.restrained())
|
if(!usr.canmove || usr.stat || usr.restrained())
|
||||||
return
|
return
|
||||||
|
|
||||||
if(ishuman(usr))
|
if(ishuman(usr) || isrobot(usr))
|
||||||
src.add_fingerprint(usr)
|
src.add_fingerprint(usr)
|
||||||
src.toggle(usr)
|
src.toggle(usr)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -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
|
if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
|
||||||
return
|
return
|
||||||
|
|
||||||
if(ishuman(usr))
|
if(ishuman(usr) || isrobot(usr))
|
||||||
src.add_fingerprint(usr)
|
src.add_fingerprint(usr)
|
||||||
src.togglelock(usr)
|
src.togglelock(usr)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -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
|
if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
|
||||||
return
|
return
|
||||||
|
|
||||||
if(ishuman(usr))
|
if(ishuman(usr) || isrobot(usr))
|
||||||
src.add_fingerprint(usr)
|
src.add_fingerprint(usr)
|
||||||
src.togglelock(usr)
|
src.togglelock(usr)
|
||||||
else
|
else
|
||||||
|
|||||||
36
html/changelogs/Yoshax-Robots.yml
Normal file
36
html/changelogs/Yoshax-Robots.yml
Normal file
@@ -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."
|
||||||
Reference in New Issue
Block a user