Merge branch 'master' into mapsyncs43293845982

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

@@ -4,6 +4,7 @@
 	icon = 'icons/effects/crayondecal.dmi'
 	icon_state = "rune1"
 	gender = NEUTER
+	mergeable_decal = FALSE
 	var/do_icon_rotate = TRUE
 	var/rotation = 0
 	var/paint_colour = "#FFFFFF"

code/game/objects/items/crayons.dm

@@ -240,7 +240,7 @@
 			out += a
 	return jointext(out,"")
 
-/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity)
+/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity, params)
 	if(!proximity || !check_allowed_items(target))
 		return
 
@@ -289,6 +289,14 @@
 			else
 				graf_rot = 0
 
+	var/list/click_params = params2list(params)
+	var/clickx
+	var/clicky
+
+	if(click_params && click_params["icon-x"] && click_params["icon-y"])
+		clickx = CLAMP(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
+		clicky = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
+
 	if(!instant)
 		to_chat(user, "<span class='notice'>You start drawing a [temp] on the	[target.name]...</span>")
 
@@ -317,6 +325,8 @@
 			if(PAINT_NORMAL)
 				var/obj/effect/decal/cleanable/crayon/C = new(target, paint_color, drawing, temp, graf_rot)
 				C.add_hiddenprint(user)
+				C.pixel_x = clickx
+				C.pixel_y = clicky
 				affected_turfs += target
 			if(PAINT_LARGE_HORIZONTAL)
 				var/turf/left = locate(target.x-1,target.y,target.z)

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

@@ -94,6 +94,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	update_icon()
 
 /obj/item/device/pda/equipped(mob/user, slot)
+	. = ..()
 	if(!equipped)
 		if(user.client)
 			background_color = user.client.prefs.pda_color

code/game/objects/items/stacks/wrap.dm

@@ -27,6 +27,7 @@
 
 /obj/item/stack/packageWrap
 	name = "package wrapper"
+	singular_name = "wrapping sheet"
 	desc = "You can use this to wrap items in."
 	icon = 'icons/obj/stack_objects.dmi'
 	icon_state = "deliveryPaper"

code/game/objects/structures/flora.dm

@@ -345,7 +345,7 @@
 
 /obj/structure/flora/rock
 	icon_state = "basalt"
-	desc = "A volcanic rock."
+	desc = "A volcanic rock. Pioneers used to ride these babies for miles."
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
 	density = TRUE