Merge branch 'master' into yield-my-flesh

Foundation-19 · Apr 13, 2024 · 73ef8a9 · 73ef8a9
2 parents 6dca855 + deabaf0
commit 73ef8a9
Show file tree

Hide file tree

Showing 57 changed files with 266,902 additions and 263,077 deletions.
diff --git a/_maps/VR/yuma_VR.dmm b/_maps/VR/yuma_VR.dmm
diff --git a/_maps/map_files/Pahrump/Dungeons.dmm b/_maps/map_files/Pahrump/Dungeons.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm
@@ -18,6 +18,10 @@
 	var/atom/A = parent
 	if(!A.has_gravity())
 		return
+
+	if(istype(AM, /obj/vehicle/ridden/space/speedbike) && AM.buckled_mobs.len)
+		var/obj/vehicle/ridden/space/speedbike/unfortunatebike = AM
+		unfortunatebike.crashing()
 
 	if(!prob(probability))
 		return

diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm
@@ -58,12 +58,21 @@
 	desc = "A basic workbench with a full set of tools for simple to intermediate projects."
 	resistance_flags = INDESTRUCTIBLE
 	density = TRUE
+	pass_flags = LETPASSTHROW
+	pass_flags_self = PASSTABLE
 	layer = BELOW_OBJ_LAYER
 	anchored = TRUE
 	machine_tool_behaviour = list(TOOL_WORKBENCH, TOOL_CROWBAR, TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_WRENCH)
 	drag_delay = 0.4 SECONDS // Heavy, slow to drag
 	var/wrenchable = 1
 
+/obj/machinery/workbench/CanPass(atom/movable/mover, border_dir)
+	if(src.density == 0)
+		return 1
+	if(istype(mover) && (mover.pass_flags & pass_flags_self))
+		return 1
+	else
+		return 0
 
 /obj/machinery/workbench/can_be_unfasten_wrench(mob/user, silent)
 	if (!wrenchable)  // case also covered by NODECONSTRUCT checks in default_unfasten_wrench

diff --git a/code/datums/components/crafting/recipes/recipes_tribal.dm b/code/datums/components/crafting/recipes/recipes_tribal.dm
@@ -34,7 +34,7 @@
 	result = /obj/item/gun/syringe/blowgun
 	time = 50
 	reqs = list(/obj/item/stack/sheet/mineral/bamboo = 10)
-	always_available = FALSE
+	always_available = TRUE
 
 /datum/crafting_recipe/tribalwar/bow
 	name = "String Wooden Bow"

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
@@ -161,8 +161,12 @@
 	I.play_tool_sound(src)
 	return TRUE
 
-/obj/machinery/camera/multitool_act(mob/living/user, obj/item/I)
+/obj/machinery/camera/multitool_act(mob/living/user, obj/item/multitool/I)
 	if(!panel_open)
+		if(istype(I))
+			to_chat(user, "<span class='notice'>You log [src] in the multitool's buffer.</span>")
+			I.buffer = src
+			return TRUE
 		return FALSE
 
 	setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range))

diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
@@ -16,6 +16,7 @@
 	var/obj/screen/cam_screen
 	var/obj/screen/plane_master/lighting/cam_plane_master
 	var/obj/screen/background/cam_background
+	var/camera_type = /obj/machinery/camera
 
 /obj/machinery/computer/security/Initialize()
 	. = ..()
@@ -173,6 +174,16 @@
 			D["[C.c_tag]"] = C
 	return D
 
+/obj/machinery/computer/security/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/multitool))
+		var/obj/item/multitool/P = W
+		if(istype(P.buffer, camera_type))
+			to_chat(user, "<font color = #666633>-% Successfully linked [P.buffer] with [src] %-</font color>")
+			var/obj/machinery/camera/connectingcamera = P.buffer
+			network |= connectingcamera.network
+		return
+	else
+		return ..()
 // SECURITY MONITORS
 
 /obj/machinery/computer/security/wooden_tv