Merge pull request #15275 from keronshb/halloweenball2021

Spookystation (Ball Map) and Vector Cars

code/game/objects/structures/fireplace.dm

@@ -1,4 +1,4 @@
-#define LOG_BURN_TIMER 150
+#define LOG_BURN_TIMER 400
 #define PAPER_BURN_TIMER 5
 #define MAXIMUM_BURN_TIMER 3000
 
@@ -12,6 +12,7 @@
 	pixel_x = -16
 	resistance_flags = FIRE_PROOF
 	var/lit = FALSE
+	light_color = "#E38C2D"
 
 	var/fuel_added = 0
 	var/flame_expiry_timer
@@ -64,6 +65,12 @@
 			</span>")
 		adjust_fuel_timer(PAPER_BURN_TIMER)
 		qdel(T)
+	else if(istype(T,/obj/item/grown/log))
+		user.visible_message("<span class='notice'>[user] tosses some \
+			wood into [src].</span>", "<span class='notice'>You add \
+			some fuel to [src].</span>")
+		adjust_fuel_timer(LOG_BURN_TIMER)
+		qdel(T)
 	else if(try_light(T,user))
 		return
 	else

code/game/objects/structures/flora.dm

@@ -40,6 +40,16 @@
 	density = FALSE
 	pixel_x = -16
 
+/obj/structure/flora/stump/attackby(obj/item/W, mob/user, params)
+	if((W.tool_behaviour == TOOL_SHOVEL) && params)
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+		if(do_after(user, 20))
+			new /obj/item/grown/log/tree(get_turf(src))
+			user.visible_message("[user] digs up [src].", "<span class='notice'>You dig up [src].</span>")
+			qdel(src)
+	else
+		return ..()
+
 /obj/structure/flora/tree/pine
 	name = "pine tree"
 	desc = "A coniferous pine tree."