Remove old postit cleanables

* Postits with pixel_x/pixel_y map varedits are preserved
* Postits with mapvar words automatically apply the correct icon

Author: pgmzeta

code/modules/writing/pens_writing_etc.dm

@@ -7,7 +7,6 @@
  - Hand labeler
  - Clipboard
  - Booklet
- - Sticky notes
  - Folder
 */
 /* --------------------------------- */
@@ -1392,57 +1391,6 @@
 			..()
 		return
 
-/* =============== STICKY NOTES =============== */
-
-/obj/item/postit_stack
-	name = "SHOULDN'T BE SEEING THIS"
-	desc = "OLD AND BAD"
-	icon = 'icons/obj/writing.dmi'
-	icon_state = "postit_stack"
-	/* force = 1
-	throwforce = 1
-	w_class = W_CLASS_TINY
-	amount = 10
-	burn_point = 220
-	burn_output = 200
-	burn_possible = TRUE
-	health = 2
-
-	// @TODO
-	// HOLY SHIT REMOVE THIS THESE OLD POST ITS ARE GONE or something idk fuck
-	New()
-		..()
-		new /obj/item/item_box/postit(get_turf(src))
-
-	afterattack(var/atom/A as mob|obj|turf, var/mob/user as mob, reach, params)
-		if (!A)
-			return
-		if (isarea(A))
-			return
-		if (src.amount < 0)
-			qdel(src)
-			return
-		var/turf/T = get_turf(A)
-		var/obj/decal/cleanable/writing/postit/P = make_cleanable(/obj/decal/cleanable/writing/postit ,T)
-		if (params && islist(params) && params["icon-y"] && params["icon-x"])
-			// oh boy i can't wait to see people make huge post-it note trains across the station somehow!
-			P.pixel_x = text2num(params["icon-x"]) - 16 //round(A.bound_width/2)
-			P.pixel_y = text2num(params["icon-y"]) - 16 //round(A.bound_height/2)
-
-		P.layer = A.layer + 1 //Do this instead so the stickers don't show over bushes and stuff.
-		P.appearance_flags = RESET_COLOR | PIXEL_SCALE
-
-		user.visible_message("<b>[user]</b> sticks a sticky note to [T].",\
-		"You stick a sticky note to [T].")
-		var/obj/item/pen/pen = user.find_type_in_hand(/obj/item/pen)
-		if (pen)
-			P.Attackby(pen, user)
-		src.amount --
-		if (src.amount < 0)
-			qdel(src)
-			return
-*/
-
 /* ============== PRINTERS & TYPEWRITERS ================= */
 
 /obj/item/pen/typewriter

code/obj/decal/cleanable.dm

@@ -748,80 +748,6 @@ var/list/blood_decal_violent_icon_states = list("floor1", "floor2", "floor3", "f
 	invisibility = INVIS_INFRA
 	font_color = "#D20040"
 
-/obj/decal/cleanable/writing/postit
-	name = "sticky note"
-	desc = "Someone's stuck a little note here."
-	icon_state = "postit"
-	random_icon_states = list()
-	color = null
-	words = ""
-	var/max_message = 128
-
-	New()
-		..()
-		pixel_y += rand(-12,12)
-		pixel_x += rand(-12,12)
-
-	attackby(obj/item/W, mob/living/user)
-		if (istype(W, /obj/item/stamp))
-
-			var/obj/item/stamp/S = W
-			switch (S.current_mode)
-				if ("Granted")
-					src.icon_state = "postit-approved"
-				if ("Denied")
-					src.icon_state = "postit-rejected"
-				if ("Void")
-					src.icon_state = "postit-void"
-				if ("X")
-					src.icon_state = "postit-x"
-				else
-					boutput(user, "It doesn't look like that kind of stamp fits here...")
-					return
-
-			// words here, info there, result is same: SCREEAAAAAAAMMMMMMMMMMMMMMMMMMM
-			src.words += "<br>\[[S.current_mode]\]<br>"
-			boutput(user, SPAN_NOTICE("You stamp \the [src]."))
-
-
-		else if (istype(W, /obj/item/pen))
-			if(!user.literate)
-				boutput(user, SPAN_ALERT("You don't know how to write."))
-				return ..()
-			var/obj/item/pen/pen = W
-			pen.in_use = 1
-			var/t = input(user, "What do you want to write?", null, null) as null|text
-			if (!t)
-				pen.in_use = 0
-				return
-			if ((length(src.words) + length(t)) > src.max_message)
-				user.show_text("All that won't fit on [src]!", "red")
-				pen.in_use = 0
-				return
-			logTheThing(LOG_STATION, user, "writes on [src] with [pen] at [log_loc(src)]: [t]")
-			t = copytext(html_encode(t), 1, MAX_MESSAGE_LEN)
-			if (pen.uses_handwriting && user?.mind?.handwriting)
-				src.font = user.mind.handwriting
-				src.webfont = 1
-			else if (pen.font)
-				src.font = pen.font
-				if (pen.webfont)
-					src.webfont = 1
-			if (src.words)
-				src.words += "<br>"
-			if (src.icon_state == initial(src.icon_state))
-				var/search_t = lowertext(t)
-				if (copytext(search_t, -1) == "?")
-					src.icon_state = "postit-quest"
-				else if (copytext(search_t, -1) == "!")
-					src.icon_state = "postit-excl"
-				else
-					src.icon_state = "postit-writing"
-			src.words += "[t]"
-			pen.in_use = 0
-		else
-			return ..()
-
 /obj/decal/cleanable/water
 	name = "water"
 	desc = "Water, on the floor. Amazing!"

code/obj/item/stickers.dm

@@ -28,8 +28,10 @@
 		..()
 		if (islist(src.random_icons) && length(src.random_icons))
 			src.icon_state = pick(src.random_icons)
-		pixel_y = rand(-8, 8)
-		pixel_x = rand(-8, 8)
+		if (pixel_y == 0)
+			pixel_y = rand(-8, 8)
+		if (pixel_x == 9)
+			pixel_x = rand(-8, 8)
 
 	afterattack(var/atom/A as mob|obj|turf, var/mob/user as mob, reach, params)
 		if (!A)
@@ -136,6 +138,10 @@
 	get_desc()
 		. = "<br>[SPAN_NOTICE("It says:")]<br><blockquote style='margin: 0 0 0 1em;'>[words]</blockquote>"
 
+	New()
+		. = ..()
+		src.set_writing_icon(src.words)
+
 	attack_hand(mob/user)
 		user.lastattacked = get_weakref(user)
 		if (src.attached)
@@ -190,14 +196,7 @@
 				return
 			logTheThing(LOG_STATION, user, "writes on [src] with [pen] at [log_loc(src)]: [t]")
 			t = copytext(html_encode(t), 1, MAX_MESSAGE_LEN)
-			if (src.icon_state == initial(src.icon_state))
-				var/search_t = lowertext(t)
-				if (copytext(search_t, -1) == "?")
-					src.icon_state = "postit-quest"
-				else if (copytext(search_t, -1) == "!")
-					src.icon_state = "postit-excl"
-				else
-					src.icon_state = "postit-writing"
+			src.set_writing_icon(t)
 			src.words += "[src.words ? "<br>" : ""][t]"
 			tooltip_rebuild = TRUE
 			pen.in_use = 0
@@ -261,6 +260,18 @@
 		if(src.attached && src.loc != src.attached)
 			remove_from_attached(do_loc = FALSE)
 
+	proc/set_writing_icon(text)
+		if (src.icon_state != initial(src.icon_state))
+			return
+		if (length(text) < 1)
+			return
+		var/search_t = lowertext(text)
+		if (copytext(search_t, -1) == "?")
+			src.icon_state = "postit-quest"
+		else if (copytext(search_t, -1) == "!")
+			src.icon_state = "postit-excl"
+		else
+			src.icon_state = "postit-writing"
 
 /obj/item/sticker/gold_star
 	name = "gold star sticker"

maps/z2.dmm

@@ -74747,9 +74747,10 @@
 "txa" = (
 /obj/table/auto,
 /obj/random_item_spawner/tools,
-/obj/decal/cleanable/writing/postit{
-	desc = "TODO: Fix leaky sink in command section.";
-	pixel_y = 26
+/obj/item/sticker/postit{
+	words = "TODO: Fix leaky sink in command section.";
+	pixel_y = 26;
+	icon_state = "postit-writing"
 	},
 /turf/unsimulated/floor/plating,
 /area/hospital/underground)