From aac40a843707cc8a8231628effc4eae58b5437f8 Mon Sep 17 00:00:00 2001
From: MistakeNot4892 <AGMogett@gmail.com>
Date: Thu, 10 Aug 2023 19:13:38 +1000
Subject: [PATCH] Graves can now be dug on outdoors turfs.

---
 .../game/turfs/simulated/outdoors/outdoors.dm |  5 +++
 .../simulated/outdoors/outdoors_attackby.dm   | 41 ++++++++++++++-----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm
index 06dbf9bd7c..d7f7ce5707 100644
--- a/code/game/turfs/simulated/outdoors/outdoors.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors.dm
@@ -27,6 +27,11 @@ var/global/list/turf_edge_cache = list()
 	var/can_dig = FALSE
 	var/loot_count
 
+/turf/simulated/floor/outdoors/examine(var/mob/user)
+	. = ..()
+	if(!has_snow())
+		. += "A shovel could be used on help intent to dig up worms or rocks, harm intent to dig a grave, or any other intent to dig a plot for planting."
+
 /turf/simulated/floor/outdoors/proc/get_loot_type()
 	if(loot_count)
 		return pickweight(list(
diff --git a/code/game/turfs/simulated/outdoors/outdoors_attackby.dm b/code/game/turfs/simulated/outdoors/outdoors_attackby.dm
index a6c55ff99e..91901c3119 100644
--- a/code/game/turfs/simulated/outdoors/outdoors_attackby.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors_attackby.dm
@@ -27,24 +27,45 @@
 	. = ..()
 
 /turf/simulated/floor/outdoors/attackby(obj/item/C, mob/user)
+
 	if (has_snow())
 		return ..()
+
 	if(can_dig && istype(C, /obj/item/shovel))
 		to_chat(user, SPAN_NOTICE("\The [user] begins digging into \the [src] with \the [C]."))
 		var/delay = (3 SECONDS * C.toolspeed)
 		user.setClickCooldown(delay)
-		if(do_after(user, delay, src))
-			if(!(locate(/obj/machinery/portable_atmospherics/hydroponics/soil) in contents))
-				var/obj/machinery/portable_atmospherics/hydroponics/soil/soil = new(src)
-				user.visible_message(SPAN_NOTICE("\The [user] digs \a [soil] into \the [src]."))
+		if(!do_after(user, delay, src))
+			return TRUE
+
+		var/dig_loot = user.a_intent == I_HELP
+		if(!dig_loot)
+			var/static/list/check_types = list(
+				/obj/machinery/portable_atmospherics/hydroponics/soil,
+				/obj/structure/animal_den,
+				/obj/structure/closet/grave
+			)
+			for(var/check_type in check_types)
+				if(locate(check_type) in contents)
+					dig_loot = TRUE
+					break
+		if(dig_loot)
+			var/loot_type = get_loot_type()
+			if(loot_type)
+				loot_count--
+				var/obj/item/loot = new loot_type(src)
+				to_chat(user, SPAN_NOTICE("You dug up \a [loot]!"))
 			else
-				var/loot_type = get_loot_type()
-				if(loot_type)
-					loot_count--
-					var/obj/item/loot = new loot_type(src)
-					to_chat(user, SPAN_NOTICE("You dug up \a [loot]!"))
+				to_chat(user, SPAN_NOTICE("You didn't find anything of note in \the [src]."))
+		else
+			var/soil
+			switch(user.a_intent)
+				if(I_HURT)
+					soil = new /obj/structure/closet/grave(src)
 				else
-					to_chat(user, SPAN_NOTICE("You didn't find anything of note in \the [src]."))
+					soil = new /obj/machinery/portable_atmospherics/hydroponics/soil(src)
+			if(soil)
+				user.visible_message(SPAN_NOTICE("\The [user] digs \a [soil] into \the [src]."))
 		return TRUE
 
 	if(istype(C, /obj/item/stack/tile/floor))