mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #3294 from LorenLuke/Chairs-Away
Can buckle people adjacent to chairs.
This commit is contained in:
@@ -74,7 +74,12 @@
|
|||||||
add_fingerprint(user)
|
add_fingerprint(user)
|
||||||
unbuckle_mob()
|
unbuckle_mob()
|
||||||
|
|
||||||
if(buckle_mob(M))
|
//can't buckle unless you share locs so try to move M to the obj.
|
||||||
|
if(M.loc != src.loc)
|
||||||
|
step_towards(M, src)
|
||||||
|
|
||||||
|
. = buckle_mob(M)
|
||||||
|
if(.)
|
||||||
if(M == user)
|
if(M == user)
|
||||||
M.visible_message(\
|
M.visible_message(\
|
||||||
"<span class='notice'>[M.name] buckles themselves to [src].</span>",\
|
"<span class='notice'>[M.name] buckles themselves to [src].</span>",\
|
||||||
|
|||||||
36
html/changelogs/LorenLuke - Bucklechanges.yml
Normal file
36
html/changelogs/LorenLuke - Bucklechanges.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: LorenLuke
|
||||||
|
|
||||||
|
# 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: "Can click-drag people onto chairs/beds from 1 tile away to buckle them."
|
||||||
Reference in New Issue
Block a user