From c45145cd6a4f607a6bf6eb231f8e727367aa3bbc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:22:58 +0200
Subject: [PATCH] [MIRROR] Fixes bedsheets laid incorrectly onto beds (#29372)

* Fixes bedsheets laid incorrectly onto beds (#85837)

<!-- 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 #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. -->

* Fixes bedsheets laid incorrectly onto beds

---------

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
---
 code/game/objects/items/plushes.dm                              | 2 +-
 code/game/objects/structures/bedsheet_bin.dm                    | 2 +-
 .../antagonists/nukeop/equipment/nuclear_authentication_disk.dm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 93fd6cb947a..95f46da2e10 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -44,7 +44,7 @@
 /obj/item/toy/plush/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/squeak, squeak_override)
-	AddElement(/datum/element/bed_tuckable, mapload, 6, -5, 90)
+	AddElement(/datum/element/bed_tuckable, mapload, 6, 7, 90)
 	AddElement(/datum/element/toy_talk)
 
 	//have we decided if Pinocchio goes in the blue or pink aisle yet?
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index a843c3e3e4b..02a0e320d1f 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -38,7 +38,7 @@ LINEN BINS
 /obj/item/bedsheet/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/surgery_initiator)
-	AddElement(/datum/element/bed_tuckable, mapload, 0, 0, 0)
+	AddElement(/datum/element/bed_tuckable, mapload, 0, 12, 0)
 	if(bedsheet_type == BEDSHEET_DOUBLE)
 		stack_amount *= 2
 		dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
index 7e06dd0d6e0..fa2718833d3 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
@@ -26,7 +26,7 @@
 
 /obj/item/disk/nuclear/Initialize(mapload)
 	. = ..()
-	AddElement(/datum/element/bed_tuckable, mapload, 6, -6, 0)
+	AddElement(/datum/element/bed_tuckable, mapload, 6, 6, 0)
 	AddComponent(/datum/component/stationloving, !fake)
 
 	if(!fake)