-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixes bedsheets laid incorrectly onto beds #85837
Conversation
@@ -16,6 +16,7 @@ LINEN BINS | |||
pickup_sound = 'sound/items/handling/cloth_pickup.ogg' | |||
slot_flags = ITEM_SLOT_NECK | |||
layer = BELOW_MOB_LAYER | |||
base_pixel_z = 12 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably use the defines/macros, but broadly this feels a bit awkward on an item? Like what about placing it anywhere else like on tables or racks or somesuch?
Doesn't it spawning on a bed also already adjust the pixel_y
by DEPTH_OFFSET
to fit on the bed?
tgstation/code/game/objects/structures/bedsheet_bin.dm
Lines 47 to 50 in 1202be8
for(var/stuff as anything in loc) | |
if(istype(stuff, /obj/structure/bed)) | |
pixel_y = DEPTH_OFFSET | |
return |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably use the defines/macros
Realized that, added!
but broadly this feels a bit awkward on an item? Like what about placing it anywhere else like on tables or somesuch?
Maybe? Also thank you for finding that line. Okay, let me try a potential solution without shifting bedsheets upwards, it might not be necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thiiiiiiink the code for putting bedsheets on beds and having them be offset might be this, having looked into it a bit more:
AddElement(/datum/element/bed_tuckable, mapload, 0, 0, 0) |
tgstation/code/datums/elements/bed_tucking.dm
Lines 14 to 20 in 6c9cfa1
/datum/element/bed_tuckable/Attach(obj/target, mapload = FALSE, x = 0, y = 0, rotation = 0) | |
. = ..() | |
if(!isitem(target)) | |
return ELEMENT_INCOMPATIBLE | |
x_offset = x | |
y_offset = y |
tgstation/code/datums/elements/bed_tucking.dm
Lines 55 to 58 in 6c9cfa1
/datum/element/bed_tuckable/proc/tuck(obj/item/tucked, obj/structure/bed/target_bed) | |
tucked.dir = target_bed.dir | |
tucked.pixel_x = target_bed.dir & EAST ? -x_offset : x_offset | |
tucked.pixel_y = y_offset |
Which I believe is also used by other items you can put on beds.
So might be as simple as adding the right define to the y_offset
for adding the element.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You were right, I didn't need it after all, I can just fix the elements. Each one getting +12 and we're good. Thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
o7
(cherry picked from commit 8e28a03)
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This reverts commit 6b095f2.
This PR is reverting the wallening by reverting everything up to 8868a5d and replaying the PRs skipping #85491. The following 239 (39 + Wallening Main PR excluded) PRs need to be replayed (DO NOT EDIT THIS LIST MANUALLY, IT IS USED BY THE BOT TO TRACK PROGRESS): - [x] #85777 - Reverted in 3 - [x] #85767 - Reverted in 2 - [x] #85763 - Reverted in c - [x] #85762 - Reverted in 2 - [x] #85760 - Reverted in dbc19df - [x] #85733 - Reverted in 22f17d0 - [x] #85721 - Reverted in 6d90643 - [x] #85719 - Reverted in c529546 - [x] #85705 - Reverted in 3b5ddab - [x] #85684 - Reverted in cbc1839 - [x] #85662 - Reverted in 69cac24 - [x] #85663 - Reverted in f394c3b - [x] #85673 - Reverted in 8a9ae04 - [x] #85718 - Reverted in f8f18d8 - [x] #85667 - Reverted in a136576 - [x] #85683 - Reverted in 3bdb020 - [x] #85676 - Reverted in 0a5d667 - [x] #85661 - Reverted in 49fc6bc - [x] #85682 - Reverted in b41efe9 - [x] #85695 - Reverted in 89a173b - [x] #85654 - Reverted in 1e4836b - [x] #85655 - Reverted in b4dde41 - [x] #85634 - Reverted in 0c352fc - [x] #85700 - Reverted in 1327cf7 - [x] #85633 - Reverted in c71c8c9 - [x] #85649 - Reverted in 7348433 - [x] #85475 - Reverted in 839f700 - [x] #85467 - Reverted in 6f08421 - [x] #85472 - Reverted in 63c6a9b - [x] #85300 - Reverted in 7c77603 - [x] #85249 - Reverted in 257d022 - [x] #85236 - Reverted in f9f4c44 - [x] #85299 - Reverted in f24ddff - [x] #85228 - Reverted in cb8c318 - [x] #84910 - Reverted in 2a562ca - [x] #84889 - Reverted in 679da68 - [x] #84766 - Reverted in 4035dd7 - [x] #85607 - Reverted in dc9a046 - [x] #85618 - Reverted in 2a06f57 - [x] #85619 - Reverted in b98661a - [x] #85608 - Reverted in 57a9351 - [x] #85648 - Reverted in ab82c66 - [x] #85692 - Reverted in f04fac9 - [x] #85544 - Reverted in 7b1198e - [x] #85631 - Reverted in 81c04ce - [x] #85529 - Reverted in 2a7e2c8 - [x] #85525 - Reverted in 6ed2d9f - [x] #85514 - Reverted in a4fa2aa - [x] #85520 - Reverted in 6e1bd4b - [x] #85521 - Reverted in 79afdac - [x] #85519 - Reverted in a967cae - [x] #85513 - Reverted in e3934ed - [x] #85498 - Reverted in cf1fadb - [x] #85485 - Reverted in 2a650ef - [x] #85494 - Reverted in bbb9795 - [x] #85552 - Reverted in f178071 - [x] #85724 - Reverted in 6933699 - [x] #85735 - Reverted in a6564f1 - [x] #85729 - Reverted in f728d12 - [x] #85704 - Reverted in 38f5b03 - [x] #85660 - Reverted in 7db3986 - [x] #85752 - Reverted in 1f29880 - [x] #85592 - Reverted in 263cbcf - [x] #85580 - Reverted in a92d536 - [x] #85573 - Reverted in a7d5104 - [x] #85534 - Reverted in 31787e7 - [x] #85511 - Reverted in 2567a2e - [x] #85508 - Reverted in 69de2ac - [x] #85680 - Reverted in 44437ac - [x] #85551 - Reverted in 7f17d42 - [x] #85478 - Reverted in bd9e575 - [x] #85476 - Reverted in 4ce8052 - [x] #85593 - Reverted in 9ff5924 - [x] #85441 - Reverted in db96015 - [x] #85567 - Reverted in 62696ad - [x] #85337 - Reverted in 1267e9f - [x] #85348 - Reverted in 4fcc3c6 - [x] #85350 - Reverted in e691c83 - [x] #85744 - Reverted in 251578d - [x] #85772 - Reverted in bc6804a - [x] #85797 - Reverted in a05e36e - [x] #85787 - Reverted in a5393f9 - [x] #85742 - Reverted in cd99a2a - [x] #85440 - Reverted in 8b5ead7 - [x] #85739 - Reverted in 3511aae - [x] #85293 - Reverted in fc687ca - [x] #85716 - Reverted in 130b32a - ~~[ ] #85848 - Reverted in f6c46ca~~ (SKIPPED) - [x] #85795 - Reverted in 4684c33 - [x] #85859 - Reverted in 0e0838f - [x] #84873 - Reverted in 34407b7 - [x] #85864 - Reverted in 4b25a20 - ~~[ ] #85845 - Reverted in a326246~~ (SKIPPED) - [x] #85844 - Reverted in bdf1e6c - ~~[ ] #85843 - Reverted in 41a8acb~~ (NOT BEING INCLUDED) - ~~[ ] #85840 - Reverted in 4807bac~~ (NOT BEING INCLUDED) - ~~[ ] #85837 - Reverted in bc9edfa~~ (NOT BEING INCLUDED) - [x] #85865 - Reverted in 14c958b - ~~[ ] #85818 - Reverted in a77256f~~ (NOT BEING INCLUDED) - [x] #85822 - Reverted in caba685 - [x] #85794 - Reverted in 0d4de98 - [x] #85756 - Reverted in 9c5a7e1 - [x] #85852 - Reverted in 74303e5 - ~~[ ] #85841 - Reverted in e5831ce~~ (NOT BEING INCLUDED) - ~~[ ] #85834 - Reverted in 1be6652~~ (NOT BEING INCLUDED) - [x] #85792 - Reverted in 33b4e48 - [x] #85646 - Reverted in fd23a0d - ~~[ ] #85799 - Reverted in 4a7a6d8~~ (NOT BEING INCLUDED) - [x] #85819 - Reverted in 8bf001b - [x] #85479 - Reverted in 6aeb5ef - ~~[ ] #85824 - Reverted in 9ca3edf~~ (SKIPPED) - [x] #85406 - Reverted in 702280f - [x] #85778 - Reverted in ce0ec5c - ~~[ ] #85851 - Reverted in 610c68b~~ (NOT BEING INCLUDED) - [x] #85754 - Reverted in 5cbdda0 - [x] #85266 - Reverted in abdfec7 - ~~[ ] #85823 - Reverted in 86b766a~~ (NOT BEING INCLUDED) - ~~[ ] #85842 - Reverted in 7ddd47e~~ (NOT BEING INCLUDED) - [x] #85857 - Reverted in e32312e - [x] #85856 - Reverted in 7d5d74c - [x] #85276 - Reverted in 1d6fa88 - [x] #85886 - Reverted in f27d6ca - ~~[ ] #85771 - Reverted in 019d898~~ (SKIPPED) - [x] #85464 - Reverted in adc0041 - ~~[ ] #85870 - Reverted in d69b998~~ (NOT BEING INCLUDED) - ~~[ ] #85869 - Reverted in 0063c69~~ (NOT BEING INCLUDED) - [x] #85530 - Reverted in b40c933 - ~~[ ] #85871 - Reverted in 63908bb~~ (NOT BEING INCLUDED) - ~~[ ] #85832 - Reverted in b29dab0~~ (SKIPPED) - ~~[ ] #85825 - Reverted in d072b29~~ (NOT BEING INCLUDED) - [x] #85632 - Reverted in 290092c - [x] #85902 - Reverted in 76118d6 - [x] #85906 - Reverted in 82623c2 - [x] #85907 - Reverted in 68b7305 - [x] #85449 - Reverted in ab86a79 - ~~[ ] #85875 - Reverted in 0a1fcda~~ (NOT BEING INCLUDED) - ~~[ ] #85861 - Reverted in 6dad511~~ (NOT BEING INCLUDED) - [x] #85264 - Reverted in dc1d2dc - [x] #85726 - Reverted in dbd9ec8 - [x] #85730 - Reverted in 7de2c2a - [x] #85880 - Reverted in 02169d2 - [x] #85176 - Reverted in e3c85aa - ~~[ ] #85887 - Reverted in 56b35f2~~ (NOT BEING INCLUDED) - [x] #85883 - Reverted in 53be06a - ~~[ ] #85882 - Reverted in a8877ff~~ (NOT BEING INCLUDED) - [x] #85895 - Reverted in 741235d - ~~[ ] #85746 - Reverted in b7aebb6~~ (NOT BEING INCLUDED) - ~~[ ] #85889 - Reverted in d677231~~ (NOT BEING INCLUDED) - ~~[ ] #85888 - Reverted in 693f79a~~ (NOT BEING INCLUDED) - [x] #85898 - Reverted in 4f41fda - ~~[ ] #85821 - Reverted in 738c9a7~~ (NOT BEING INCLUDED) - [x] #85694 - Reverted in f7ea4d1 - [x] #85308 - Reverted in 4a89b62 - [x] #85904 - Reverted in 999dbe1 - ~~[ ] #85901 - Reverted in bbf832d~~ (NOT BEING INCLUDED) - ~~[ ] #85896 - Reverted in 542fe40~~ (NOT BEING INCLUDED) - [x] #85927 - Reverted in 7dc87df - [x] #85908 - Reverted in bcca80f - [x] #85929 - Reverted in 094bf36 - [x] #85877 - Reverted in 5874caf - [x] #85903 - Reverted in b3ba8ff - ~~[ ] #85913 - Reverted in 67f7ec4~~ (SKIPPED) - [x] #85914 - Reverted in 7efcd3a - [x] #85917 - Reverted in fc50a5f - ~~[ ] #85949 - Reverted in 10a8e0f~~ (NOT BEING INCLUDED) - ~~[ ] #85338 - Reverted in 847549a~~ (SKIPPED) - ~~[ ] #85922 - Reverted in 3d93882~~ (SKIPPED) - [x] #85923 - Reverted in 2c6ffa4 - ~~[ ] #85920 - Reverted in 1de5b03~~ (NOT BEING INCLUDED) - [x] #85919 - Reverted in 1773e9b - [x] #85271 - Reverted in aecf800 - [x] #85918 - Reverted in 023ec3a - [x] #85924 - Reverted in e488607 - [x] #85928 - Reverted in 7470b7d - [x] #85926 - Reverted in 7761c9e - [x] #85900 - Reverted in 633736c - [x] #85909 - Reverted in a47c7ec - ~~[ ] #85931 - Reverted in 9bc7a41~~ (NOT BEING INCLUDED) - ~~[ ] #85894 - Reverted in c15e171~~ (SKIPPED) - ~~[ ] #85759 - Reverted in f45d70b~~ (SKIPPED) - ~~[ ] #85892 - Reverted in fc08dc1~~ (SKIPPED) - ~~[ ] #85915 - Reverted in 428f475~~ (NOT BEING INCLUDED) - [x] #85222 - Reverted in 66e7ac2 - [x] #85150 - Reverted in 3079387 - [x] #85935 - Reverted in ce6114f - ~~[ ] #85936 - Reverted in f601fa7~~ (NOT BEING INCLUDED) - [x] #85937 - Reverted in 64242f5 - ~~[ ] #85940 - Reverted in a979c6c~~ (NOT BEING INCLUDED) - ~~[ ] #85942 - Reverted in 9562c14~~ (NOT BEING INCLUDED) - [x] #85944 - Reverted in adf8e19 - [x] #85605 - Reverted in 88dbfb4 - [x] #85945 - Reverted in dea9e79 - [x] #84964 - Reverted in 234481f - [x] #85952 - Reverted in c62d87a - [x] #85953 - Reverted in bd0e462 - ~~[ ] #85943 - Reverted in 697b684~~ (NOT BEING INCLUDED) - [x] #85946 - Reverted in f4afd4d - [x] #85950 - Reverted in 394fffc - [x] #85955 - Reverted in 2230a5b - [x] #85319 - Reverted in fdaddd9 - ~~[ ] #85934 - Reverted in 41bb612~~ (NOT BEING INCLUDED) - ~~[ ] #85255 - Reverted in 3e213b8~~ (SKIPPED) - ~~[ ] #85961 - Reverted in 6f3d000~~ (NOT BEING INCLUDED) - [x] #85956 - Reverted in a5bf22a - [x] #85958 - Reverted in c964a46 - ~~[ ] #85969 - Reverted in b599cd4~~ (NOT BEING INCLUDED) - [x] #85252 - Reverted in 5a0e2f3 - [x] #85984 - Reverted in b000da8 - [x] #85137 - Reverted in 1f31b55 - [x] #85881 - Reverted in f3913f9 - [x] #85972 - Reverted in d3afed8 - [x] #85998 - Reverted in 3d286b7 - [x] #85358 - Reverted in 75f84bd - ~~[ ] #85964 - Reverted in be1aeb0~~ (SKIPPED) - [x] #85960 - Reverted in 69cbfce - [x] #85992 - Reverted in 89e4a7b - [x] #85967 - Reverted in d398e41 - [x] #84888 - Reverted in bb98eb0 - ~~[ ] #85983 - Reverted in 81152a9~~ (NOT BEING INCLUDED) - [x] #85976 - Reverted in 93c0913 - ~~[ ] #85962 - Reverted in de32ea2~~ (NOT BEING INCLUDED) - [x] #85977 - Reverted in 393652a - [x] #85959 - Reverted in 52e6e07 - ~~[ ] #85988 - Reverted in a5853cc~~ (SKIPPED) - ~~[ ] #85974 - Reverted in eab20ba~~ (SKIPPED) - [x] #85939 - Reverted in ca85b05 - [x] #85878 - Reverted in 3b3d3db - [x] #85858 - Reverted in 08d6082 - [x] #85651 - Reverted in b76ab4a - [x] #85505 - Reverted in 0958eaa - ~~[ ] #85352 - Reverted in 620cec1~~ (SKIPPED) - [x] #85279 - Reverted in ba0fd52 - [x] #85954 - Reverted in d7fe033 - ~~[ ] #85996 - Reverted in 5fbd621~~ (SKIPPED) - [x] #85994 - Reverted in c99a03c - [x] #85470 - Reverted in fbd5ac4 - ~~[ ] #85981 - Reverted in dc74c75~~ (NOT BEING INCLUDED) - [x] #86011 - Reverted in b14b42e - [x] #85820 - Reverted in 2624854 - [x] #86013 - Reverted in e17ac14 - [x] #85986 - Reverted in 4021ffe - [x] #86019 - Reverted in c0801b3 - [x] #86010 - Reverted in 10dff00 - [x] #86029 - Reverted in 6646192 - [x] #86024 - Reverted in e74ea43 - [x] #86022 - Reverted in 0b2fc6a - [x] #86015 - Reverted in b99d935 - [x] #85415 - Reverted in d6102c7 - ~~[ ] #85703 - Reverted in 339b7ed~~ (SKIPPED) - [x] #85890 - Reverted in 4e54f37 - [x] #86046 - Reverted in 0bbe2c9 - [x] #86008 - Reverted in a0a0635 - [x] #86042 - Reverted in fa37631 - [x] #85891 - Reverted in 603dcd6 - [x] #86040 - Reverted in e42fc76 - [x] #86025 - Reverted in 536bb25 - [x] #86012 - Reverted in 5cb4ec5 - [x] #86004 - Reverted in e953614 - [x] #85989 - Reverted in 88a9232 - [x] #86044 - Reverted in d0a5fb5 - [x] #86001 - Reverted in 195c359 - [x] #86030 - Reverted in 5265796 - [x] #86055 - Reverted in e821387 - [x] #86057 - Reverted in c921900 - [x] #86014 - Reverted in c004d4e - [x] #85304 - Reverted in 611510b - [x] #86061 - Reverted in f14b0a2 - [x] #86075 - Reverted in 5339fe6 - [x] #86089 - Reverted in 10b5398 - [x] #86081 - Reverted in ba86f43 - [x] #85609 - Reverted in 9e5208f - [x] #86114 - Reverted in cf410a9 - [x] #86023 - Reverted in a7a2e95 - [x] #86027 - Reverted in 9cf7161 - [x] #86016 - Reverted in b67fa06 - [x] #86095 - Reverted in dc5abd8 - [x] #86105 - Reverted in f5b8e7e - [x] #86070 - Reverted in 6c460bb After that some startup commits on this branch need to be reverted then it can be merged. --------- Co-authored-by: tgstation-ci <179393467+tgstation-ci[bot]@users.noreply.github.com> Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: MrMelbert <kmelbert4@gmail.com>
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes tgstation#85571 ## Why It's Good For The Game Just a push in the direction of a de-jank'd wallening ## Changelog :cl: fix: bedsheets are laid on beds properly now /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
About The Pull Request
Fixes #85571
Why It's Good For The Game
Just a push in the direction of a de-jank'd wallening
Changelog
🆑
fix: bedsheets are laid on beds properly now
/:cl: