From effd1b0158f2e62cf80a44d450bb4cecdbd0ea27 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 31 May 2020 01:46:16 +0200 Subject: [PATCH] Fixing bedsheet magic in a better fashion. --- code/game/objects/structures/bedsheet_bin.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index bd6dcb2aff..5f4294e52c 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -41,7 +41,7 @@ LINEN BINS return /obj/item/bedsheet/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/wirecutters) || I.get_sharpness()) + if(!(flags_1 & HOLOGRAM_1) && (istype(I, /obj/item/wirecutters) || I.get_sharpness())) var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3) transfer_fingerprints_to(C) C.add_fingerprint(user) @@ -328,6 +328,8 @@ LINEN BINS else var/chosen = pick(sheet_types) B = new chosen + if(flags_1 & HOLOGRAM_1) + B.flags_1 |= HOLOGRAM_1 B.forceMove(drop_location()) user.put_in_hands(B) @@ -369,4 +371,4 @@ LINEN BINS /obj/structure/bedsheetbin/color sheet_types = list(/obj/item/bedsheet, /obj/item/bedsheet/blue, /obj/item/bedsheet/green, /obj/item/bedsheet/orange, \ /obj/item/bedsheet/purple, /obj/item/bedsheet/red, /obj/item/bedsheet/yellow, /obj/item/bedsheet/brown, \ - /obj/item/bedsheet/black) \ No newline at end of file + /obj/item/bedsheet/black)