shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing bedsheet magic in a better fashion.

Browse Source
This commit is contained in:
Ghom
2020-05-31 01:46:16 +02:00
committed by GitHub
parent 25dbed5b0b
commit effd1b0158
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bedsheet_bin.dm
+4 -2
View File
@@ -41,7 +41,7 @@ LINEN BINS
return return
/obj/item/bedsheet/attackby(obj/item/I, mob/user, params) /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) var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
transfer_fingerprints_to(C) transfer_fingerprints_to(C)
C.add_fingerprint(user) C.add_fingerprint(user)
@@ -328,6 +328,8 @@ LINEN BINS
else else
var/chosen = pick(sheet_types) var/chosen = pick(sheet_types)
B = new chosen B = new chosen
if(flags_1 & HOLOGRAM_1)
B.flags_1 |= HOLOGRAM_1
B.forceMove(drop_location()) B.forceMove(drop_location())
user.put_in_hands(B) user.put_in_hands(B)
@@ -369,4 +371,4 @@ LINEN BINS
/obj/structure/bedsheetbin/color /obj/structure/bedsheetbin/color
sheet_types = list(/obj/item/bedsheet, /obj/item/bedsheet/blue, /obj/item/bedsheet/green, /obj/item/bedsheet/orange, \ 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/purple, /obj/item/bedsheet/red, /obj/item/bedsheet/yellow, /obj/item/bedsheet/brown, \
/obj/item/bedsheet/black) /obj/item/bedsheet/black)