review changes p1 of 2

_maps/RandomRuins/SandRuins/whitesands_cave_base.dmm

@@ -121,10 +121,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/whitesands/cave_base)
-"dT" = (
-/obj/item/mine/pressure/explosive/rad/live,
-/turf/open/floor/plating/asteroid/whitesands/dried,
-/area/overmap_encounter/planetoid/cave/explored)
 "dU" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
@@ -227,6 +223,10 @@
 /obj/effect/decal/cleanable/oil/streak,
 /turf/open/floor/plating/asteroid/whitesands/dried,
 /area/overmap_encounter/planetoid/cave/explored)
+"fT" = (
+/obj/item/mine/pressure/explosive/rusty/live,
+/turf/open/floor/plating/asteroid/whitesands/dried,
+/area/overmap_encounter/planetoid/cave/explored)
 "gx" = (
 /obj/effect/turf_decal/corner_techfloor_gray/full{
 	dir = 8
@@ -621,10 +621,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/asteroid/whitesands/dried,
 /area/overmap_encounter/planetoid/cave/explored)
-"pE" = (
-/obj/item/mine/pressure/explosive/rad/live,
-/turf/open/floor/plating/asteroid/whitesands/grass,
-/area/overmap_encounter/planetoid/cave/explored)
 "pV" = (
 /obj/machinery/camera/cave_base{
 	dir = 10
@@ -896,6 +892,10 @@
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ruin/whitesands/cave_base)
+"ug" = (
+/obj/item/mine/pressure/explosive/rusty/live,
+/turf/open/floor/plating/asteroid/whitesands,
+/area/overmap_encounter/planetoid/cave/explored)
 "uh" = (
 /obj/structure/railing{
 	dir = 6
@@ -1535,9 +1535,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/asteroid/whitesands/dried,
 /area/overmap_encounter/planetoid/cave/explored)
-"Hs" = (
-/turf/closed/mineral/random/whitesands,
-/area/ruin/whitesands/cave_base)
 "HF" = (
 /obj/machinery/porta_turret/cave_base{
 	mode = 1
@@ -1831,10 +1828,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/whitesands/cave_base/engi)
-"NT" = (
-/obj/item/mine/pressure/explosive/rad/live,
-/turf/open/floor/plating/asteroid/whitesands,
-/area/overmap_encounter/planetoid/cave/explored)
 "Op" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2081,7 +2074,6 @@
 	pixel_x = -11;
 	pixel_y = 4
 	},
-/obj/item/mine/pressure/explosive/heavy/live,
 /obj/effect/decal/cleanable/crayon{
 	icon_state = "!";
 	pixel_x = 12;
@@ -2626,7 +2618,7 @@ mh
 mh
 tX
 tX
-dT
+tX
 tX
 tX
 mh
@@ -2685,7 +2677,7 @@ mh
 mh
 tX
 tX
-tX
+fT
 hN
 tX
 Ev
@@ -2969,7 +2961,7 @@ mh
 mh
 mh
 tX
-tX
+fT
 tX
 mh
 mh
@@ -2989,7 +2981,7 @@ pp
 mh
 zj
 xe
-zj
+ug
 tX
 mh
 mh
@@ -3064,7 +3056,7 @@ Dh
 mh
 mh
 tX
-tX
+fT
 tX
 mh
 mh
@@ -3158,7 +3150,7 @@ mh
 mh
 KG
 tX
-tX
+fT
 WR
 zj
 zj
@@ -3588,7 +3580,7 @@ tX
 tX
 mh
 tX
-dT
+tX
 tX
 mh
 mh
@@ -3769,7 +3761,7 @@ zj
 mh
 tX
 mh
-tX
+fT
 tX
 tX
 tX
@@ -3906,14 +3898,14 @@ zv
 tX
 tX
 tX
-dT
+tX
 tX
 KG
 tX
 tX
 iP
 tX
-tX
+fT
 tX
 tX
 tX
@@ -3946,7 +3938,7 @@ mh
 mh
 zj
 zj
-NT
+ug
 zj
 mh
 mh
@@ -4028,7 +4020,7 @@ tX
 tX
 tX
 tX
-tX
+fT
 tX
 tX
 tX
@@ -4074,7 +4066,7 @@ mh
 mh
 mh
 tX
-dT
+tX
 tX
 tX
 tX
@@ -4091,7 +4083,7 @@ iP
 tX
 tX
 KG
-dT
+tX
 tX
 tX
 KG
@@ -4549,7 +4541,7 @@ pp
 mh
 pp
 tX
-dT
+tX
 tX
 KG
 tX
@@ -4660,7 +4652,7 @@ od
 od
 od
 od
-Hs
+od
 mh
 mh
 mh
@@ -4792,8 +4784,8 @@ mh
 qR
 GH
 tX
+fT
 tX
-dT
 tX
 mh
 tX
@@ -5025,8 +5017,8 @@ tX
 mh
 mh
 tX
+fT
 tX
-dT
 tX
 tX
 hN
@@ -5446,7 +5438,7 @@ mh
 zv
 zv
 qZ
-pE
+zv
 zv
 qZ
 zv

code/datums/wires/explosive.dm

@@ -66,7 +66,7 @@
 
 /datum/wires/explosive/c4/explode()
 	var/obj/item/grenade/c4/P = holder
-	P.prime()
+	P.receive_signal()
 
 /datum/wires/explosive/pizza
 	holder_type = /obj/item/pizzabox

code/game/objects/items/grenades/plastic.dm

@@ -67,7 +67,7 @@
 
 //assembly stuff
 /obj/item/grenade/c4/receive_signal()
-	prime()
+	addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
 
 /obj/item/grenade/c4/attack_self(mob/user)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num|null
@@ -129,7 +129,7 @@
 
 // x-com ufo defense high ex charge 1993
 /obj/item/grenade/c4/satchel_charge
-	name = "Satchel Charge"
+	name = "\improper satchel charge"
 	desc = "Used to put craters into places without too much hassle. An engineer's favorite."
 	w_class = WEIGHT_CLASS_NORMAL
 	icon_state = "satchel_charge0"
@@ -138,3 +138,7 @@
 	lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
 	boom_sizes = list(0, 3, 5)
+
+/obj/item/grenade/c4/satchel_charge/receive_signal()
+	. = ..()
+	balloon_alert_to_viewers("[src] begins ticking!")

code/modules/ruins/sandplanet_ruin_code/cave_base.dm

@@ -1,14 +1,23 @@
 //the satchel charge that'll explode
 
 /obj/item/grenade/c4/satchel_charge/cave_base
+	det_time = 15
 	desc = "With Love - Kerberos-574"
 
 //i am such a bitch
 /obj/item/grenade/c4/satchel_charge/cave_base/Initialize()
 	. = ..()
 	AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_OBSERVER, use_anchor = TRUE)
+	//replace with a signaller//
 	wires.attach_assembly_init(/obj/item/assembly/voice/preset/cave_base)
 
+	//add prox sensor / signaller assembly because fuck me i guess
+
+	//oh my god jc. a bomb
+
+	//main area needs to have the Big Bomb substituted for a C4.
+
+
 /obj/item/assembly/voice/preset/cave_base
 	mode = 1
 	recorded = "Goodbye~"
@@ -23,11 +32,13 @@
 
 //turret
 /obj/machinery/porta_turret/cave_base
+	max_integrity = 100
 	faction = list("turret", "Forward_Ops_Post")
 	stun_projectile = /obj/projectile/beam/laser/heavylaser
 	stun_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
 	lethal_projectile = /obj/projectile/beam/laser/heavylaser
 	lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+	turret_flags = TURRET_FLAG_SHOOT_ALL
 
 //gut wrenching content
 
@@ -188,10 +199,10 @@
 	SAY There is no strategic information.
 	DELAY 10
 	SAY There is no essential equipment.
-	DELAY 5
+	DELAY 10
 	SAY Just you and me~
 	SOUND hiss
-	DELAY 5
+	DELAY 10
 	SAY Maybe one day we'll really meet. For now?
 	DELAY 10
 	SAY Goodbye~