Merge remote-tracking branch 'upstream/master' into turbine_crimes

_std/color.dm

@@ -112,6 +112,9 @@
 								0,0,0,1,\
 								0,0,0,0)
 
+#define COLOR_MATRIX_INVERSE_LABEL "inverse"
+#define COLOR_MATRIX_INVERSE list(-1, 0, 0, 0, -1, 0, 0, 0, -1, 1, 1, 1)
+
 /// Takes two 20-length lists, turns them into 5x4 matrices, multiplies them together, and returns a 20-length list
 /proc/mult_color_matrix(var/list/Mat1, var/list/Mat2) // always 5x4 please
 	if (length(Mat1) != 20 || length(Mat2) != 20)

_std/macros/items.dm

@@ -30,3 +30,5 @@
 #define IS_NPC_ILLEGAL_ITEM(x) ( \
 		istype(x, /obj/item/body_bag) && x.w_class >= W_CLASS_BULKY \
 	)
+
+#define cangunpoint(x) (istype(x, /obj/item/gun) || istype(x, /obj/item/bang_gun))

code/WorkInProgress/infernal_contracts.dm

@@ -861,6 +861,6 @@ obj/item/contract/greed
 				SPAWN(10 SECONDS)
 					boutput(user, SPAN_NOTICE("Well, you were right."))
 					var/mob/living/carbon/human/H = user
-					H.become_statue("gold")
+					H.become_statue(getMaterial("gold"))
 
 		return 1

code/WorkInProgress/tarmStuff.dm

@@ -997,7 +997,7 @@ TYPEINFO(/obj/item/device/geiger)
 	cell_type = /obj/item/ammo/power_cell/self_charging/ntso_signifer
 	from_frame_cell_type = /obj/item/ammo/power_cell/self_charging/ntso_signifer/bad
 	can_swap_cell = 0
-	color = list(-1, 0, 0, 0, -1, 0, 0, 0, -1, 1, 1, 1)
+	color = COLOR_MATRIX_INVERSE
 
 	New()
 		set_current_projectile(new/datum/projectile/special/timegun/theBulletThatShootsTheFuture)

code/area.dm

@@ -2963,7 +2963,7 @@ ABSTRACT_TYPE(/area/station/medical)
 	station_map_colour = MAPC_ROBOTICS
 
 /area/station/medical/research
-	name = "Medical Research"
+	name = "Genetic Research"
 	icon_state = "medresearch"
 	sound_environment = 3
 	station_map_colour = MAPC_MEDRESEARCH

code/datums/abilities/brassgauntlet.dm

@@ -275,7 +275,7 @@ proc/goldsnap(var/mob/user)
 	logTheThing(LOG_COMBAT, user, "used the Brass Gauntlet and triggered the goldsnap at [log_loc(user)]")
 	var/turf/T = get_turf(user)
 	user.set_dir(SOUTH)
-	user.become_statue("gold")
+	user.become_statue(getMaterial("gold"))
 	for(var/turf/G in range(10, T))
 		G.setMaterial(getMaterial("gold"))
 	sleep(2 SECONDS)

code/datums/components/equipment_fault.dm

@@ -507,3 +507,50 @@ TYPEINFO(/datum/component/equipment_fault/leaky)
 		var/datum/reagents/temp_fluid_reagents = new /datum/reagents(5)
 		temp_fluid_reagents.add_reagent(pick(src.reagent_list), 5)
 		target_turf.fluid_react(temp_fluid_reagents, temp_fluid_reagents.total_volume)
+
+TYPEINFO(/datum/component/equipment_fault/messy)
+	initialization_args = list(
+		ARG_INFO("tool_flags", DATA_INPUT_BITFIELD, "Tools Required", TOOL_PULSING | TOOL_SCREWING),
+		ARG_INFO("cleanables", DATA_INPUT_LIST_PROVIDED, "Cleanable List", list(\
+			/obj/decal/cleanable/machine_debris=40,\
+			/obj/decal/cleanable/oil=10,\
+			/obj/decal/cleanable/oil/streak=20,\
+			/obj/decal/cleanable/generic=10,\
+			/obj/decal/cleanable/glitter/harmless=5,\
+		)),
+	)
+
+///streaks one of a list of weighted cleanables near the machine
+/datum/component/equipment_fault/messy
+	///list of cleanables picked to spawn when a fault is triggered
+	var/list/obj/decal/cleanable/cleanable_types = list(
+		/obj/decal/cleanable/machine_debris=40,
+		/obj/decal/cleanable/oil=10,
+		/obj/decal/cleanable/oil/streak=20,
+		/obj/decal/cleanable/generic=10,
+		/obj/decal/cleanable/glitter/harmless=5,
+	)
+	var/static/list/sounds = list(
+		'sound/machines/windup.ogg',
+		'sound/machines/hydraulic.ogg',
+		'sound/machines/seed_destroyed.ogg',
+		'sound/machines/ArtifactBee1.ogg',
+		'sound/machines/constructor_work.ogg',
+	)
+
+/datum/component/equipment_fault/messy/Initialize(tool_flags, cleanables)
+	. = ..()
+	if (!islist(cleanables))
+		return COMPONENT_INCOMPATIBLE
+	src.cleanable_types = cleanables
+
+/datum/component/equipment_fault/messy/ef_process(obj/machinery/M, mult)
+	src.ef_perform_fault(M)
+
+/datum/component/equipment_fault/messy/ef_perform_fault(obj/O)
+	if(..())
+		playsound(O, pick(sounds), 30, 2)
+		var/obj/decal/cleanable/junk = make_cleanable(pick(src.cleanable_types), O.loc)
+		junk.streak_cleanable(cardinal, dist_upper=1)
+		hit_twitch(O)
+		O.visible_message(SPAN_NOTICE("[O] spews out some of its internals."))

code/datums/controllers/artifact_controls.dm

@@ -224,6 +224,7 @@ var/datum/artifact_controller/artifact_controls
 	var/scramblechance = 10 //probability to have "fake" artifact with altered appearance
 	var/list/activation_sounds = list()
 	var/list/instrument_sounds = list()
+	var/list/lightswitch_sounds = list('sound/misc/lightswitch.ogg')
 	var/list/fault_types = list("all")
 	var/list/adjectives = list("strange","unusual","odd","curious","bizarre","weird","abnormal","peculiar")
 	var/list/nouns_large = list("object","machine","artifact","contraption","structure","edifice")
@@ -319,6 +320,7 @@ var/datum/artifact_controller/artifact_controls
 		'sound/musical_instruments/artifact/Artifact_Martian_2.ogg',
 		'sound/musical_instruments/artifact/Artifact_Martian_3.ogg',
 		'sound/musical_instruments/artifact/Artifact_Martian_4.ogg')
+	lightswitch_sounds = list('sound/impact_sounds/Slimy_Splat_1.ogg', 'sound/impact_sounds/Slimy_Hit_4.ogg', 'sound/impact_sounds/Slimy_Hit_3.ogg')
 	impact_reaction_one = 1
 	impact_reaction_two = 0
 	heat_reaction_one = 0.99
@@ -402,6 +404,7 @@ var/datum/artifact_controller/artifact_controls
 		'sound/musical_instruments/artifact/Artifact_Wizard_2.ogg',
 		'sound/musical_instruments/artifact/Artifact_Wizard_3.ogg',
 		'sound/musical_instruments/artifact/Artifact_Wizard_4.ogg')
+	lightswitch_sounds = list('sound/effects/mag_forcewall.ogg', 'sound/effects/MagShieldUp.ogg', 'sound/effects/MagShieldDown.ogg')
 	impact_reaction_one = 8
 	impact_reaction_two = 6
 	heat_reaction_one = 0.75