Under the Twin Suns: the S'rand'marr Sector (#15295)

code/game/objects/items/devices/lighting/flare.dm

@@ -151,3 +151,22 @@
 		qdel(I)
 		user.put_in_hands(T)
 		qdel(src)
+
+/obj/item/device/flashlight/flare/torch/stick
+	name = "flaming stick"
+	desc = "How exciting!"
+	brightness_on = 1.5
+	light_power = 1
+	produce_heat = 400
+
+/obj/item/device/flashlight/flare/torch/stick/Initialize()
+	. = ..()
+	fuel = rand(30, 45)
+	on = TRUE
+	START_PROCESSING(SSprocessing, src)
+	update_icon()
+
+/obj/item/device/flashlight/flare/torch/stick/turn_off()
+	visible_message("\The [src] burns out.")
+	new /obj/effect/decal/cleanable/ash(get_turf(src))
+	qdel(src)

code/game/objects/items/weapons/candle.dm

@@ -9,10 +9,13 @@
 	w_class = ITEMSIZE_TINY
 	light_color = "#E09D37"
 	var/wax = 2000
+	var/start_lit = FALSE
 
 /obj/item/flame/candle/Initialize()
 	. = ..()
 	wax = rand(1600, 2000)
+	if(start_lit)
+		light()
 
 /obj/item/flame/candle/update_icon()
 	var/i

code/game/objects/items/weapons/landmines.dm

@@ -55,8 +55,8 @@
 	explosion(loc, 0, 2, 2, 3)
 	qdel(src)
 
-/obj/item/landmine/Crossed(AM as mob|obj)
-	if(deployed)
+/obj/item/landmine/Crossed(AM as mob|obj, var/ignore_deployment = FALSE)
+	if(deployed || ignore_deployment)
 		if(ishuman(AM))
 			var/mob/living/carbon/human/H = AM
 			if(H.shoes?.item_flags & LIGHTSTEP)

code/game/objects/items/weapons/material/knives.dm

@@ -89,6 +89,9 @@
 	can_embed = 0
 	w_class = ITEMSIZE_NORMAL
 
+/obj/item/material/knife/bayonet/silver/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_SILVER)
+
 /obj/item/material/knife/tacknife
 	name = "tactical knife"
 	desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Tau Ceti."
@@ -110,6 +113,9 @@
 	applies_material_colour = 0
 	slot_flags = SLOT_BELT
 
+/obj/item/material/knife/trench/silver/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_SILVER)
+
 //Butterfly knives stab your eyes out too!
 
 /obj/item/material/knife/butterfly

code/game/objects/items/weapons/material/swords.dm

@@ -99,6 +99,9 @@
 	item_state = "sabre"
 	slot_flags = SLOT_BELT
 
+/obj/item/material/sword/sabre/silver/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_SILVER)
+
 /obj/item/material/sword/axe
 	name = "battle axe"
 	desc = "A one handed battle axe, still a deadly weapon."

code/game/objects/items/weapons/material/twohanded.dm

@@ -318,6 +318,9 @@
 /obj/item/material/twohanded/spear/diamond/Initialize(newloc, material_key)
 	. = ..(newloc, MATERIAL_DIAMOND)
 
+/obj/item/material/twohanded/spear/silver/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_SILVER)
+
 /obj/structure/headspear
 	name = "head on a spear"
 	desc = "How barbaric."
@@ -604,6 +607,9 @@
 	contained_sprite = TRUE
 	damtype = BURN
 
+/obj/item/material/twohanded/pike/silver/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_SILVER)
+
 /obj/item/material/twohanded/zweihander
 	icon_state = "zweihander0"
 	base_icon = "zweihander"

code/game/objects/items/weapons/storage/boxes.dm

@@ -1006,6 +1006,7 @@
 	desc = "An ordinary wooden crate."
 	icon_state = "dynamite"
 	foldable = null
+	illustration = null
 	use_sound = 'sound/effects/doorcreaky.ogg'
 	drop_sound = 'sound/items/drop/wooden.ogg'
 	pickup_sound = 'sound/items/pickup/wooden.ogg'