Deconf 2: Electric Boogaloo

code/game/objects/effects/decals/posters/posters.dm

@@ -3,7 +3,7 @@
 		if(exact)
 			return decls_repository.get_decl(path)
 		else
-			var/list/L = decls_repository.get_decls_of_type(path)
+			var/list/L = decls_repository.get_decls_of_subtype(path) // Use get_decls_of_subtype instead of get_decls_of_type, or it will get the map placing icon_state
 			return L[pick(L)]
 	return null
 

code/game/objects/items/devices/scanners/sleevemate.dm

@@ -72,6 +72,13 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
 			return
 		M = new_M
 
+	if(isrobot(M))
+		var/mob/living/silicon/robot/R = M
+		var/obj/item/dogborg/sleeper/S = locate() in R.module.modules
+		if(S && S.patient)
+			scan_mob(S.patient, user)
+			return
+
 	if(ishuman(M))
 		scan_mob(M, user)
 	else

code/game/objects/structures/alien/alien.dm

@@ -81,6 +81,13 @@
 				health = 0
 				healthcheck()
 				return
+			if(locate(/obj/item/organ/internal/xenos/resinspinner/replicant) in M.internal_organs)
+				if(!do_after(M, 3 SECONDS))
+					return
+				visible_message ("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
+				health = 0
+				healthcheck()
+				return
 		visible_message("<span class='warning'>[usr] claws at the [name]!</span>")
 		health -= rand(5,10)
 	healthcheck()

code/game/objects/structures/janicart.dm

@@ -29,6 +29,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
 		equippable_item_whitelist = typecacheof(list(
 			/obj/item/storage/bag/trash,
 			/obj/item/mop,
+			/obj/item/mop/advanced,
 			/obj/item/reagent_containers/spray,
 			/obj/item/lightreplacer,
 			/obj/item/clothing/suit/caution,
@@ -49,7 +50,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
 		mybag = I
 		setTguiIcon("mybag", mybag)
 
-	else if(istype(I, /obj/item/mop))
+	else if(istype(I, /obj/item/mop) || istype(I, /obj/item/mop/advanced))
 		if(mymop)
 			to_chat(user, "<span class='warning'>[src] already has \an [I].</span>")
 			return FALSE