New Sandplanet Ruin: Cave Base

code/datums/ruins/whitesands.dm

@@ -18,6 +18,13 @@
 	suffix = "whitesands_surface_pubbyslopcrash.dmm"
 	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER)
 
+/datum/map_template/ruin/whitesands/cave_base
+	name = "Abandoned Cave Base"
+	id = "cave_base"
+	description = "The former home of a poor sod on observation duty. Now a cunning trap."
+	suffix = "whitesands_cave_base.dmm"
+	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER)
+
 //////////OUTSIDE SETTLEMENTS/RUINS//////////
 /datum/map_template/ruin/whitesands/survivors/saloon
 	name = "Hermit Saloon"

code/datums/wires/_wires.dm

@@ -173,6 +173,15 @@
 		S.connected = src
 		return S
 
+/datum/wires/proc/attach_assembly_init(obj/item/assembly/S)
+	var/obj/item/assembly/I = new S(holder.loc)
+	for(var/color in colors)
+		if(I && istype(I) && I.attachable && !is_attached(color))
+			assemblies[color] = I
+			I.forceMove(holder)
+			I.connected = src
+			return I
+
 /datum/wires/proc/detach_assembly(color)
 	var/obj/item/assembly/S = get_attached(color)
 	if(S && istype(S))

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/area/areas/ruins/sandplanet.dm

@@ -2,10 +2,12 @@
 
 //whitesands surface camp saloon
 
+//saloon ruin
 /area/ruin/whitesands/saloon
 	name = "Hermit Saloon"
 	icon_state = "green"
 
+//the pubby slop crash
 /area/ruin/whitesands/pubbycrash
 	name = "Pubby-Class Wreckage"
 	icon_state = "bluenew"
@@ -17,3 +19,10 @@
 /area/ruin/whitesands/pubbycrash/split
 	name = "Pubby-Class Chunk"
 	icon_state = "red"
+
+//cave base
+/area/ruin/whitesands/cave_base
+	name = "Abandoned Facility"
+	icon_state = "bluenew"
+
+/area/ruin/whitesands/cave_base/engi

code/game/machinery/telecomms/machines/message_server.dm

@@ -16,10 +16,13 @@
 	active_power_usage = ACTIVE_DRAW_MINIMAL
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
 	var/obj/item/stored
+	var/empty = FALSE
 
 /obj/machinery/blackbox_recorder/Initialize()
 	. = ..()
-	stored = new /obj/item/blackbox(src)
+	if(!empty)
+		stored = new /obj/item/blackbox(src)
+	update_appearance()
 
 /obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
 	. = ..()

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

@@ -67,7 +67,12 @@
 
 //assembly stuff
 /obj/item/grenade/c4/receive_signal()
-	prime()
+	if(!active)
+		active = TRUE
+		icon_state = "[item_state]2"
+		balloon_alert_to_viewers("[src] begins ticking!")
+		addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
+	return
 
 /obj/item/grenade/c4/attack_self(mob/user)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num|null
@@ -125,3 +130,16 @@
 	item_state = "plasticx4"
 	directional = TRUE
 	boom_sizes = list(0, 2, 5)
+
+
+// x-com ufo defense high ex charge 1993
+/obj/item/grenade/c4/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"
+	item_state = "satchel_charge"
+	throw_range = 3
+	lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
+	boom_sizes = list(0, 3, 5)

code/game/turfs/open/floor/plating/whitesands.dm

@@ -80,3 +80,15 @@
 /turf/open/floor/plating/asteroid/whitesands/grass/dead/lit
 	light_power = 1
 	light_range = 2
+
+/turf/open/floor/concrete/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/concrete/slab_1/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY
+
+/turf/open/floor/plating/whitesands
+	initial_gas_mix = WHITESANDS_ATMOS
+	light_color = COLOR_VERY_LIGHT_GRAY

code/modules/assembly/holder.dm

@@ -11,6 +11,7 @@
 	throw_speed = 2
 	throw_range = 7
 
+	///set both of these or neither.
 	var/obj/item/assembly/a_left = null
 	var/obj/item/assembly/a_right = null
 
@@ -21,6 +22,18 @@
 	)
 	AddElement(/datum/element/connect_loc, loc_connections)
 
+	//if we want to spawn an holder pre-configured.
+	if(a_left && a_right)
+		var/obj/item/assembly/left = new a_left(src)
+		var/obj/item/assembly/right = new a_right(src)
+		//i love byond
+		a_left = null
+		a_right = null
+		assemble(left, right, null)
+		a_left.secured = TRUE
+		a_right.secured = TRUE
+	update_appearance()
+
 /obj/item/assembly_holder/ComponentInitialize()
 	. = ..()
 	var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS
@@ -29,7 +42,6 @@
 /obj/item/assembly_holder/IsAssemblyHolder()
 	return TRUE
 
-
 /obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user)
 	attach(A,user)
 	attach(A2,user)

code/modules/assembly/proximity.dm

@@ -7,7 +7,9 @@
 	drop_sound = 'sound/items/handling/component_drop.ogg'
 	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 	var/scanning = FALSE
+	///is the assembly arming itself?
 	var/timing = FALSE
+	///seconds until the assembly arms itself
 	var/time = 10
 	var/sensitivity = 1
 	var/hearing_range = 3
@@ -16,11 +18,12 @@
 
 /obj/item/assembly/prox_sensor/Initialize()
 	. = ..()
-	proximity_monitor = new(src, 0)
+	proximity_monitor = new(src, 0, FALSE)
 	START_PROCESSING(SSobj, src)
 
 /obj/item/assembly/prox_sensor/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(proximity_monitor)
 	. = ..()
 
 /obj/item/assembly/prox_sensor/examine(mob/user)
@@ -37,6 +40,15 @@
 	update_appearance()
 	return TRUE
 
+/obj/item/assembly/prox_sensor/on_attach()
+	.  = ..()
+	// Pick the first valid object in this list:
+	// Wiring datum's owner
+	// assembly holder's attached object
+	// assembly holder itself
+	// us
+	proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src)
+
 /obj/item/assembly/prox_sensor/on_detach()
 	. = ..()
 	if(!.)
@@ -153,3 +165,11 @@
 				value = round(time + value)
 				time = clamp(value, 0, 600)
 				. = TRUE
+
+/obj/item/assembly/prox_sensor/preset
+	sensitivity = 2
+	hearing_range = 3
+
+/obj/item/assembly/prox_sensor/preset/Initialize()
+	. = ..()
+	toggle_scan(!scanning)

code/modules/assembly/voice.dm

@@ -103,6 +103,10 @@
 	. = ..()
 	listening = FALSE
 
+/obj/item/assembly/voice/preset
+	mode = 1
+	recorded = "example phrase"
+
 #undef INCLUSIVE_MODE
 #undef EXCLUSIVE_MODE
 #undef RECOGNIZER_MODE

code/modules/projectiles/projectile.dm

@@ -141,6 +141,7 @@
 	var/decayedRange			//stores original range
 	var/reflect_range_decrease = 5			//amount of original range that falls off when reflecting, so it doesn't go forever
 	var/reflectable = NONE // Can it be reflected or not?
+
 		//Effects
 	var/stun = 0
 	var/knockdown = 0