The moderate builder PR (More craftable furniture, structure pixelshift item)

code/datums/components/crafting/crafting.dm

@@ -321,7 +321,12 @@
 						if(ispath(R.result, /turf))
 							var/turf/X = T.PlaceOnTop(R.result)
 							if(X)
-								X.OnCrafted(user.dir, user)
+								// Caustic Edit - Allows 'diagonal' turfs. Used for roof corners atm
+								if(R.diagonal)
+									X.OnCrafted(X.SelectDiagDirection(), user)
+								else
+									X.OnCrafted(user.dir, user)
+								// Caustic Edit end
 								X.add_fingerprint(user)
 								if(R.loud)
 									X.loud_message("Construction sounds can be heard")

code/game/objects/items/rogueitems/natural/dirtclod.dm

@@ -139,3 +139,19 @@
 				dirtamt = min(dirtamt + 1, 5)
 				return
 	..()
+
+// Caustic Edit Start - Allows RMBing dirt piles to take dirt out
+/obj/structure/fluff/clodpile/attack_right(mob/user)
+	if(isliving(user))
+		var/mob/living/L = user
+		if(L.stat != CONSCIOUS)
+			return
+		var/obj/item/I = new /obj/item/natural/dirtclod(src)
+		if(L.put_in_active_hand(I))
+			L.visible_message(span_warning("[L] picks up some dirt from the [name]."))
+			dirtamt--
+			if(dirtamt <= 0)
+				qdel(src)
+			return
+	.=..()
+// Caustic Edit End

code/game/objects/lighting/rogue_fires.dm

@@ -152,6 +152,22 @@
 		return TRUE
 	return ..()
 
+// Caustic Edit
+/obj/machinery/light/rogue/campfire/fireplace/OnCrafted(dirin)
+	pixel_x = 0
+	pixel_y = 0
+	switch(dirin)
+		if(NORTH)
+			pixel_y = 32
+		if(SOUTH)
+			pixel_y = -32
+		if(EAST)
+			pixel_x = 32
+		if(WEST)
+			pixel_x = -32
+	. = ..()
+// Caustic Edit End
+
 /obj/machinery/light/rogue/candle
 	name = "candles"
 	desc = "Tiny flames flicker to the slightest breeze and offer enough light to see."
@@ -163,6 +179,8 @@
 	pixel_y = 32
 	soundloop = null
 
+	var/move_on_craft = TRUE // Caustic Edit
+
 /obj/machinery/light/rogue/candle/off
 	name = "candles"
 	desc = "Cold wax sticks in sad half-melted repose. All they need is a spark."
@@ -184,15 +202,16 @@
 /obj/machinery/light/rogue/candle/OnCrafted(dirin)
 	pixel_x = 0
 	pixel_y = 0
-	switch(dirin)
-		if(NORTH)
-			pixel_y = 32
-		if(SOUTH)
-			pixel_y = -32
-		if(EAST)
-			pixel_x = 32
-		if(WEST)
-			pixel_x = -32
+	if(move_on_craft) // Caustic Edit. Allows floor candles to not shift 1 tile forwards on crafting
+		switch(dirin)
+			if(NORTH)
+				pixel_y = 32
+			if(SOUTH)
+				pixel_y = -32
+			if(EAST)
+				pixel_x = 32
+			if(WEST)
+				pixel_x = -32
 	. = ..()
 
 /obj/machinery/light/rogue/candle/attack_hand(mob/user)
@@ -242,6 +261,8 @@
 	layer = TABLE_LAYER
 	cookonme = FALSE
 
+	move_on_craft = FALSE // Caustic Edit
+
 /obj/machinery/light/rogue/candle/floorcandle/alt
 	icon_state = "floorcandlee1"
 	base_state = "floorcandlee"
@@ -270,6 +291,8 @@
 	plane = GAME_PLANE_UPPER
 	cookonme = FALSE
 
+	var/move_on_craft = TRUE // Caustic Edit
+
 //CC Edit: Optimizing torches to only be in SSobj when off a torch holder
 /obj/machinery/light/rogue/torchholder/Entered(atom/movable/arrived, atom/old_loc)
 	. = ..()
@@ -317,6 +340,13 @@
 
 /obj/machinery/light/rogue/torchholder/OnCrafted(dirin, user)
 	dirin = turn(dirin, 180)
+	// Caustic Edit / Actually offsets crafted sconces
+	if(move_on_craft)
+		switch(dirin)
+			if(SOUTH)
+				pixel_y = 32
+	// Caustic Edit end
+	. = ..()
 	QDEL_NULL(torchy)
 	on = FALSE
 	set_light(0)

code/game/objects/structures/deer_trophy.dm

@@ -5,3 +5,19 @@
 	icon_state = "deer_trophy"
 	dir = SOUTH
 	pixel_y = 32
+
+// Caustic Edit
+/obj/structure/rogue/trophy/deer/OnCrafted(dirin)
+	pixel_x = 0
+	pixel_y = 0
+	switch(dirin)
+		if(NORTH)
+			pixel_y = 32
+		if(SOUTH)
+			pixel_y = -32
+		if(EAST)
+			pixel_x = 32
+		if(WEST)
+			pixel_x = -32
+	. = ..()
+// Caustic Edit End

code/game/objects/structures/fluff.dm

@@ -282,6 +282,13 @@
 	icon_state = "border"
 	pass_crawl = FALSE
 
+// Caustic edit - These were mapped in as var-edited decals before
+/obj/structure/fluff/railing/plat_edge
+	name = "platform edge"
+	icon = 'icons/turf/roguefloor.dmi'
+	icon_state = "borderfall"
+// Caustic Edit end
+
 /obj/structure/fluff/railing/fence
 	name = "palisade"
 	desc = "A rudimentary barrier that might keep the monsters at bay."

code/game/objects/structures/tables_racks.dm

@@ -646,19 +646,42 @@
 	climb_offset = 0
 	pixel_y = 32
 
+	var/move_on_craft = TRUE // Caustic Edit
+
+// Caustic Edit
+/obj/structure/rack/rogue/shelf/OnCrafted(dirin)
+	if(move_on_craft) 
+		pixel_x = 0
+		pixel_y = 0
+		switch(dirin)
+			if(NORTH)
+				pixel_y = 32
+			if(SOUTH)
+				pixel_y = -32
+			if(EAST)
+				pixel_x = 32
+			if(WEST)
+				pixel_x = -32
+	. = ..()
+// Caustic Edit end
+
 /obj/structure/rack/rogue/shelf/big
 	icon = 'icons/roguetown/misc/structure.dmi'
 	icon_state = "shelf_big"
 	dir = SOUTH
 	pixel_y = 16
 
+	move_on_craft = FALSE // Caustic Edit
+
 /obj/structure/rack/rogue/shelf/biggest
 	icon_state = "shelf_biggest"
 	pixel_y = 0
 	// This isn't pixel-shifted, and therefore should be dense.
 	density = TRUE
 	climb_offset = 10
 
+	move_on_craft = FALSE // Caustic Edit
+
 /obj/structure/rack/rogue/shelf/notdense // makes the wall mounted one less weird in a way, got downside of offset when loaded again tho
 	density = FALSE
 	pixel_y = 24

code/game/turfs/open/floor/roguefloor.dm

@@ -174,12 +174,60 @@
 /turf/open/floor/rogue/rooftop/green/west
 	dir = 8
 
+// Caustic Edit start
+// Proper roofg directionals
+
+/turf/open/floor/rogue/rooftop/green/northeast
+	dir = 5
+
+/turf/open/floor/rogue/rooftop/green/northwest
+	dir = 9
+
+/turf/open/floor/rogue/rooftop/green/southeast
+	dir = 6
+
+/turf/open/floor/rogue/rooftop/green/southwest
+	dir = 10
+
+/turf/open/floor/rogue/rooftop/green/alt
+	icon_state = "roofgalt-arw"
+
+/turf/open/floor/rogue/rooftop/green/alt/Initialize()
+	. = ..()
+	icon_state = "roofgalt"
+
+/turf/open/floor/rogue/rooftop/green/alt/north
+	dir = 1
+
+/turf/open/floor/rogue/rooftop/green/alt/east
+	dir = 4
+
+/turf/open/floor/rogue/rooftop/green/alt/west
+	dir = 8
+
+/turf/open/floor/rogue/rooftop/green/alt/northeast
+	dir = 5
+
+/turf/open/floor/rogue/rooftop/green/alt/northwest
+	dir = 9
+
+/turf/open/floor/rogue/rooftop/green/alt/southeast
+	dir = 6
+
+/turf/open/floor/rogue/rooftop/green/alt/southwest
+	dir = 10
+
+// Old directionals to not break mapping
+//TODO: Mapping, change out all the corner turf subtypes for the directional ones above.
+
 /turf/open/floor/rogue/rooftop/green/corner1
-	icon_state = "roofgc1-arw"
+	// icon_state = "roofgc1-arw" // Caustic Edit
 
+/*
 /turf/open/floor/rogue/rooftop/green/corner1/Initialize()
 	. = ..()
 	icon_state = "roofgc1"
+*/
 
 /turf/open/floor/rogue/rooftop/green/corner1/dirone
 	dir = 1
@@ -205,6 +253,7 @@
 /turf/open/floor/rogue/rooftop/green/corner1/dirten
 	dir = 10
 
+// Caustic Edit end - old directionals end
 
 /turf/open/floor/rogue/AzureSand
 	name = "sand"

code/modules/hotspring/hotspring.dm

@@ -201,6 +201,8 @@
 	torch_off_state = "stonelantern"
 	base_state = "stonelantern"
 
+	move_on_craft = FALSE // Caustic Edit
+
 /obj/machinery/light/rogue/torchholder/hotspring/standing
 	name = "standing stone lantern"
 	icon_state = "stonelantern_standing1"

code/modules/roguetown/roguecrafting/items.dm

@@ -357,6 +357,7 @@
 		/obj/item/natural/fur = 1
 		)
 	craftdiff = 1
+	subtype_reqs = TRUE // Caustic Edit. Allows using any furs
 
 /datum/crafting_recipe/roguetown/survival/whetstone
 	name = "whetstone"

code/modules/roguetown/roguecrafting/sewing.dm

@@ -141,18 +141,6 @@
 	craftdiff = 4
 	bypass_dupe_test = TRUE
 
-/datum/crafting_recipe/roguetown/sewing/nurseveil
-	name = "nurse's veil, improvised"
-	category = "Hats"
-	result = list(/obj/item/clothing/head/roguetown/veiled)
-	tools = list(/obj/item/rogueweapon/huntingknife)
-	reqs = list(
-		/obj/item/tablecloth/silk = 1
-	)
-	craftdiff = 1
-	sellprice = 5
-	bypass_dupe_test = TRUE // Uses the tablecloth, a much rarer and valuable article, in lieu of cloth.
-
 /* craftdif of 1 */
 
 /datum/crafting_recipe/roguetown/sewing/clothgloves
@@ -950,7 +938,7 @@
 	craftdiff = 2
 	sellprice = 5
 
-/datum/crafting_recipe/roguetown/sewing/nurseveil
+/datum/crafting_recipe/roguetown/sewing/nurseveil_improv // Caustic Edit
 	name = "nurse's veil, improvised"
 	category = "Hats"
 	result = list(/obj/item/clothing/head/roguetown/veiled)