[pull] master from goonstation:master

code/WorkInProgress/blueprints.dm

@@ -555,7 +555,7 @@
 )
 
 #define WHITELIST_TURFS list(/turf/simulated)
-#define BLACKLIST_TURFS list(/turf/simulated/floor/specialroom/sea_elevator_shaft)
+#define BLACKLIST_TURFS list(/turf/simulated/floor/specialroom/sea_elevator_shaft, /turf/simulated/shuttle, /turf/simulated/floor/shuttle, /turf/simulated/wall/auto/shuttle)
 
 /datum/abcu_blueprint
 	var/cost_metal = 0

code/mob/living/silicon/ai/holograms.dm

@@ -253,7 +253,7 @@
 					var/sound/sound = pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg', 'sound/machines/siren_police.ogg')
 					playsound(get_turf(src), sound, 50, FALSE)
 					animate_bouncy(src)
-					SPAWN(1 SECOND)
+					SPAWN(2 SECONDS)
 						qdel(src)
 				if ("down_arrow", "up_arrow", "left_arrow", "right_arrow")
 					var/dirs = list("down_arrow" = SOUTH, "up_arrow" = NORTH, "left_arrow" = WEST, "right_arrow" = EAST)
@@ -263,6 +263,7 @@
 							for (var/atom/movable/AM in get_turf(src))
 								if (!AM.anchored)
 									step(AM, dir)
+							step(src, dir)
 							sleep(0.3 SECONDS)
 						qdel(src)
 				if ("happy_face")

code/modules/chemistry/Chemistry-Recipes.dm

@@ -2861,7 +2861,7 @@
 		name = "Cyclopentanol"
 		id = "cyclopentanol"
 		result = "cyclopentanol"
-		min_temperature = T0C + 275
+		min_temperature = T0C + 50
 		required_reagents = list("acetic_acid" = 1, "ether" = 1, "barium" = 1, "hydrogen" = 1, "oxygen" = 1)
 		result_amount = 3
 		mix_phrase = "The mixture fizzles into a colorless liquid."

code/modules/food_and_drink/pies.dm

@@ -21,7 +21,7 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/pie)
 			var/mob/M = hit_atom
 			var/mob/thrower = thr.thrown_by
 			playsound(src, 'sound/impact_sounds/Slimy_Splat_1.ogg', 100, TRUE)
-			if (thrower.mind?.assigned_role == "Clown" && ishuman(M) && (prob(50) || M.mind?.assigned_role == "Captain") && !M.GetOverlayImage("face_pie"))
+			if (thrower?.mind?.assigned_role == "Clown" && ishuman(M) && (prob(50) || M.mind?.assigned_role == "Captain") && !M.GetOverlayImage("face_pie"))
 				var/mob/living/carbon/human/H = M
 				var/image/face_pie = image('icons/obj/foodNdrink/food_dessert.dmi', "face_pie")
 				src.visible_message(SPAN_NOTICE("[src] splats right in [H]'s face and remains stuck there!"))

code/obj/item/mousetrap.dm

@@ -190,8 +190,8 @@
 			C.set_loc(src)
 			src.UpdateOverlays(image(C.icon, C.icon_state), "triggerable")
 			user.show_text("You add [C] to [src].", "blue")
-
-		else if (istype(C, /obj/item/reagent_containers/food/snacks/pie) && !HAS_TRIGGERABLE(src))
+		//this check needs to exclude the arm one
+		else if (istype(C, /obj/item/reagent_containers/food/snacks/pie) && !src.grenade && !src.grenade_old && !src.pipebomb  && !src.signaler && !src.butt && !src.gimmickbomb)
 			if (src.pie)
 				user.show_text("There's already a pie attached to [src]!", "red")
 				return
@@ -401,6 +401,11 @@
 			thr.thing = src.pie
 			src.pie.throw_impact(target, thr)
 			src.pie = null
+			src.arm.set_loc(get_turf(src))
+			src.arm = null
+		else if (src.arm)
+			src.arm.set_loc(get_turf(src))
+			src.arm = null
 
 		else if (src.butt)
 			if (src.butt.sound_fart)

code/obj/machinery/computer.dm

@@ -76,15 +76,15 @@
 		A.set_dir(src.dir)
 		A.circuit = M
 		A.anchored = ANCHORED
-		src.special_deconstruct(A)
+		src.special_deconstruct(A, user)
 		qdel(src)
 
 	///Put the code for finding the stuff your computer needs in this proc
 	proc/connection_scan()
 	//Placeholder so the multitool probing thing can go on this parent
 
 	///Special changes for deconstruction can be added by overriding this
-	proc/special_deconstruct(var/obj/computerframe/frame as obj)
+	proc/special_deconstruct(var/obj/computerframe/frame as obj, mob/user)
 
 
 /*

code/obj/machinery/computer/robotics.dm

@@ -30,7 +30,8 @@
 	..()
 	return
 
-/obj/machinery/computer/robotics/special_deconstruct(obj/computerframe/frame as obj)
+/obj/machinery/computer/robotics/special_deconstruct(obj/computerframe/frame as obj, mob/user)
+	logTheThing(LOG_STATION, src, "is deconstructed by [key_name(user)] at [log_loc(src)]")
 	frame.circuit.id = src.id
 
 /obj/machinery/computer/robotics/process()

maps/cogmap.dmm

@@ -50539,10 +50539,6 @@
 /obj/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 21
-	},
 /obj/machinery/power/apc/autoname_north,
 /obj/item/implantcase/counterrev{
 	pixel_x = 8;
@@ -127546,7 +127542,7 @@ adC
 adC
 adC
 mPp
-apZ
+srq
 arn
 arn
 auc
@@ -127559,7 +127555,7 @@ avj
 xiw
 arn
 arn
-aHw
+srq
 mPp
 adC
 adC
@@ -127848,7 +127844,7 @@ adC
 adC
 adC
 mPp
-apZ
+srq
 arn
 arn
 fnq
@@ -127861,7 +127857,7 @@ nhn
 iTs
 arn
 arn
-aHw
+srq
 mPp
 adC
 adC

strings/changelog.txt

@@ -1,4 +1,9 @@
 
+(t)sat jan 20 24
+(u)Löpz
+(p)17697
+(e)🎨|C-Sprites
+(+)Gave the ThinkTape and master ThinkTape new looks
 (t)fri jan 19 24
 (u)Ikea
 (p)17618