Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -288,7 +288,7 @@
 			contained = "\[[contained]\]"
 
 		var/where = "[AREACOORD(location)]"
-		if(carry.my_atom.fingerprintslast)
+		if(carry.my_atom && carry.my_atom.fingerprintslast)
 			var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
 			var/more = ""
 			if(M)

code/game/objects/items/devices/dogborg_sleeper.dm

@@ -544,4 +544,26 @@
 			user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
 			playsound(hound, 'sound/effects/bin_close.ogg', 80, 1)
 		return
+	else if(issilicon(target))
+		var/mob/living/silicon/trashbot = target
+		if (!trashbot.devourable)
+			to_chat(user, "<span class='warning'>[target] registers an error code to your [src]</span>")
+			return
+		if(patient)
+			to_chat(user,"<span class='warning'>Your [src] is already occupied.</span>")
+			return
+		if(trashbot.buckled)
+			to_chat(user,"<span class='warning'>[trashbot] is buckled and can not be put into your [src].</span>")
+			return
+		user.visible_message("<span class='warning'>[hound.name] is ingesting [trashbot] into their [src].</span>", "<span class='notice'>You start ingesting [trashbot] into your [src.name]...</span>")
+		if(do_after(user, 30, target = trashbot) && !patient && !trashbot.buckled && length(contents) < max_item_count)
+			if(!in_range(src, trashbot)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't eat them.
+			trashbot.forceMove(src)
+			trashbot.reset_perspective(src)
+			update_gut()
+			user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashbot] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashbot] slips inside.</span>")
+			playsound(hound, 'sound/effects/bin_close.ogg', 80, 1)
+		return
+
 	return

code/game/objects/structures/bedsheet_bin.dm

@@ -288,17 +288,19 @@ LINEN BINS
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	var/amount = 10
+	var/list/sheet_types = list(/obj/item/bedsheet)
+	var/static/allowed_sheets = list(/obj/item/bedsheet, /obj/item/reagent_containers/rag/towel)
 	var/list/sheets = list()
 	var/obj/item/hidden = null
 
 /obj/structure/bedsheetbin/examine(mob/user)
 	..()
 	if(amount < 1)
-		to_chat(user, "There are no bed sheets in the bin.")
+		to_chat(user, "There are no sheets in the bin.")
 	else if(amount == 1)
-		to_chat(user, "There is one bed sheet in the bin.")
+		to_chat(user, "There is one sheet in the bin.")
 	else
-		to_chat(user, "There are [amount] bed sheets in the bin.")
+		to_chat(user, "There are [amount] sheets in the bin.")
 
 
 /obj/structure/bedsheetbin/update_icon()
@@ -317,8 +319,9 @@ LINEN BINS
 	..()
 
 /obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/bedsheet))
+	if(is_type_in_list(I, allowed_sheets))
 		if(!user.transferItemToLoc(I, src))
+			to_chat(user, "<span class='warning'>\The [I] is stuck to your hand, you cannot place it into the bin!</span>")
 			return
 		sheets.Add(I)
 		amount++
@@ -339,18 +342,19 @@ LINEN BINS
 	. = ..()
 	if(.)
 		return
-	if(user.lying)
+	if(user.incapacitated())
 		return
 	if(amount >= 1)
 		amount--
 
-		var/obj/item/bedsheet/B
+		var/obj/item/B
 		if(sheets.len > 0)
 			B = sheets[sheets.len]
 			sheets.Remove(B)
 
 		else
-			B = new /obj/item/bedsheet(loc)
+			var/chosen = pick(sheet_types)
+			B = new chosen
 
 		B.forceMove(drop_location())
 		user.put_in_hands(B)
@@ -362,19 +366,20 @@ LINEN BINS
 			to_chat(user, "<span class='notice'>[hidden] falls out of [B]!</span>")
 			hidden = null
 
-
 	add_fingerprint(user)
+
 /obj/structure/bedsheetbin/attack_tk(mob/user)
 	if(amount >= 1)
 		amount--
 
-		var/obj/item/bedsheet/B
+		var/obj/item/B
 		if(sheets.len > 0)
 			B = sheets[sheets.len]
 			sheets.Remove(B)
 
 		else
-			B = new /obj/item/bedsheet(loc)
+			var/chosen = pick(sheet_types)
+			B = new chosen
 
 		B.forceMove(drop_location())
 		to_chat(user, "<span class='notice'>You telekinetically remove [B] from [src].</span>")
@@ -384,5 +389,11 @@ LINEN BINS
 			hidden.forceMove(drop_location())
 			hidden = null
 
+/obj/structure/bedsheetbin/towel
+	desc = "It looks rather cosy. This one is designed to hold towels."
+	sheet_types = list(/obj/item/reagent_containers/rag/towel)
 
-	add_fingerprint(user)
+/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)