Ore Processing Framework

code/__DEFINES/materials.dm

@@ -68,3 +68,15 @@
 #define MATERIAL_SLOWDOWN_PLASTEEL (0.05)
 /// The slowdown value of one [SHEET_MATERIAL_AMOUNT] of alien alloy.
 #define MATERIAL_SLOWDOWN_ALIEN_ALLOY (0.1)
+
+// The number of ore vents that will spawn boulders with this material.
+/// Is this material going to spawn often in ore vents? (80% of vents on lavaland)
+#define MATERIAL_RARITY_COMMON 12
+/// Is this material going to spawn often in ore vents? (53% of vents on lavaland)
+#define MATERIAL_RARITY_SEMIPRECIOUS 8
+/// Is this material going to spawn uncommonly in ore vents? (33% of vents on lavaland)
+#define MATERIAL_RARITY_PRECIOUS 5
+/// Is this material going to spawn rarely in ore vents? (20% of vents on lavaland)
+#define MATERIAL_RARITY_RARE 3
+/// Is this material only going to spawn once in ore vents? (6% of vents on lavaland)
+#define MATERIAL_RARITY_UNDISCOVERED 1

code/__DEFINES/mining.dm

@@ -0,0 +1,49 @@
+// Defines related to the mining rework circa June 2023
+/// Durability of a large size boulder from a large size vent.
+#define BOULDER_SIZE_LARGE 15
+/// Durability of a medium size boulder from a medium size vent.
+#define BOULDER_SIZE_MEDIUM 10
+/// Durability of a small size boulder from a small size vent.
+#define BOULDER_SIZE_SMALL 5
+/// How many boulders can a single ore vent have on it's tile before it stops producing more?
+#define MAX_BOULDERS_PER_VENT 10
+/// Time multiplier
+#define INATE_BOULDER_SPEED_MULTIPLIER 3
+// Vent type
+/// Large vents, giving large boulders.
+#define LARGE_VENT_TYPE "large"
+/// Medium vents, giving medium boulders.
+#define MEDIUM_VENT_TYPE "medium"
+/// Small vents, giving small boulders.
+#define SMALL_VENT_TYPE "small"
+
+/// Proximity to a vent that a wall ore needs to be for 5 ore to be mined.
+#define VENT_PROX_VERY_HIGH 3
+/// Proximity to a vent that a wall ore needs to be for 4 ore to be mined.
+#define VENT_PROX_HIGH 6
+/// Proximity to a vent that a wall ore needs to be for 3 ore to be mined.
+#define VENT_PROX_MEDIUM 15
+/// Proximity to a vent that a wall ore needs to be for 2 ore to be mined.
+#define VENT_PROX_LOW 32
+/// Proximity to a vent that a wall ore needs to be for 1 ore to be mined.
+#define VENT_PROX_FAR 64
+
+/// The chance of ore spawning in a wall that is VENT_PROX_VERY_HIGH tiles to a vent.
+#define VENT_CHANCE_VERY_HIGH 75
+/// The chance of ore spawning in a wall that is VENT_PROX_HIGH tiles to a vent.
+#define VENT_CHANCE_HIGH 18
+/// The chance of ore spawning in a wall that is VENT_PROX_MEDIUM tiles to a vent.
+#define VENT_CHANCE_MEDIUM 9
+/// The chance of ore spawning in a wall that is VENT_PROX_LOW tiles to a vent.
+#define VENT_CHANCE_LOW 5
+/// The chance of ore spawning in a wall that is VENT_PROX_FAR tiles to a vent.
+#define VENT_CHANCE_FAR 1
+
+/// The number of points a miner gets for discovering a vent, multiplied by BOULDER_SIZE when completing a wave defense minus the discovery bonus.
+#define MINER_POINT_MULTIPLIER 100
+/// The multiplier that gets applied for automatically generated mining points.
+#define MINING_POINT_MACHINE_MULTIPLIER 0.8
+
+//String defines to use with CaveGenerator presets for what ore breakdown to use.
+#define OREGEN_PRESET_LAVALAND "lavaland"
+#define OREGEN_PRESET_TRIPLE_Z "triple_z"

code/__DEFINES/skills.dm

@@ -42,6 +42,9 @@
 ///The multiplier of the extra experience given by the fishing minigame based on difficulty. At the default difficulty of 15, the bonus will be of 21%.
 #define FISHING_SKILL_DIFFIULTY_EXP_MULT 0.015
 ///How much exp one would gain per spent playing the fishing minigame at minimum difficulty.
-#define FISHING_SKILL_EXP_PER_SECOND (SKILL_EXP_LEGENDARY / (22 MINUTES))
+#define FISHING_SKILL_EXP_PER_SECOND (SKILL_EXP_LEGENDARY / (15 MINUTES * 0.1))
 ///The maximum amount of experience one can get per fishing minigame. I appreciate the effort though.
 #define FISHING_SKILL_EXP_CAP_PER_GAME (SKILL_EXP_LEGENDARY / 5)
+
+///The base modifier a boulder's size grants to the mining skill.
+#define MINING_SKILL_BOULDER_SIZE_XP 10

code/__DEFINES/traits.dm

@@ -1350,4 +1350,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///Trait given when a mob has been tipped
 #define TRAIT_MOB_TIPPED "mob_tipped"
 
+/// That which allows mobs to instantly break down boulders.
+#define TRAIT_INSTANTLY_PROCESSES_BOULDERS "instantly_processes_boulders"
+
+/// Trait applied to objects and mobs that can attack a boulder and break it down. (See /obj/item/boulder/manual_process())
+#define TRAIT_BOULDER_BREAKER "boulder_breaker"
+
 // END TRAIT DEFINES

code/_globalvars/lists/ores_spawned.dm

@@ -0,0 +1,35 @@
+/**
+ * Sets of global lists breaking down the base spawning distributions for various maps and stations.
+ *
+ * Currently used for ore vents on roundstart when the map is generated. (See ore_vent.dm, seedRuins() and ore_generation.dm)
+ * Ore vent lists here are copied to ore_vent_minerals on ruin seeding,
+ * in order to dynamically adjust the spawn rates as materials are picked and set a global ore distribution from vents.
+ *
+ * By default vents pull 4 unique materials each, but this can vary with subtypes.
+ */
+
+GLOBAL_LIST_INIT(ore_vent_minerals_lavaland, list(
+		/datum/material/iron = 13,
+		/datum/material/glass = 12,
+		/datum/material/plasma = 9,
+		/datum/material/titanium = 6,
+		/datum/material/silver = 5,
+		/datum/material/gold = 5,
+		/datum/material/diamond = 3,
+		/datum/material/uranium = 3,
+		/datum/material/bluespace = 3,
+		/datum/material/plastic = 1,
+	))
+
+GLOBAL_LIST_INIT(ore_vent_minerals_triple_z, list(
+		/datum/material/iron = 24,
+		/datum/material/glass = 23,
+		/datum/material/plasma = 16,
+		/datum/material/titanium = 10,
+		/datum/material/silver = 8,
+		/datum/material/gold = 7,
+		/datum/material/diamond = 4,
+		/datum/material/uranium = 4,
+		/datum/material/bluespace = 3,
+		/datum/material/plastic = 1,
+	))

code/_globalvars/traits.dm

@@ -234,6 +234,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNCATCHABLE" = TRAIT_UNCATCHABLE,
 		"TRAIT_DANGEROUS_OBJECT" = TRAIT_DANGEROUS_OBJECT,
 		"TRAIT_HAUNTED" = TRAIT_HAUNTED,
+		"TRAIT_INSTANTLY_PROCESSES_BOULDERS" = TRAIT_INSTANTLY_PROCESSES_BOULDERS,
 		),
 	/atom = list(
 		"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
@@ -250,6 +251,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_VOIDSTORM_IMMUNE" = TRAIT_VOIDSTORM_IMMUNE,
 		"TRAIT_WEATHER_IMMUNE" = TRAIT_WEATHER_IMMUNE,
 		"TRAIT_RUNECHAT_HIDDEN" = TRAIT_RUNECHAT_HIDDEN,
+		"TRAIT_BOULDER_BREAKER" = TRAIT_BOULDER_BREAKER,
 		),
 	/obj/item/card/id = list(
 		"TRAIT_MAGNETIC_ID_CARD" = TRAIT_MAGNETIC_ID_CARD,

code/_onclick/hud/new_player.dm

@@ -190,6 +190,11 @@
 		to_chat(hud.mymob, span_boldwarning("The round is either not ready, or has already finished..."))
 		return
 
+	if(hud.mymob.client?.check_overwatch())
+		to_chat(hud.mymob, span_warning("Kindly wait until your connection has been authenticated before joining"))
+		message_admins("[hud.mymob.key] tried to use the Join button but failed the overwatch check.")
+		return
+
 	//Determines Relevent Population Cap
 	var/relevant_cap
 	var/hard_popcap = CONFIG_GET(number/hard_popcap)

code/datums/brain_damage/magic.dm

@@ -124,3 +124,9 @@
 	desc = "It's coming closer..."
 	image_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi'
 	image_state = "curseblob"
+	var/datum/brain_trauma/magic/stalker_multiple/host
+
+/obj/effect/client_image_holder/stalker_phantom/Destroy(force)
+	. = ..()
+	host.stalkers -= src
+	host = null

code/datums/greyscale/config_types/greyscale_configs.dm

@@ -1277,3 +1277,13 @@
 	name = "Worn Playbunny Ears"
 	icon_file = 'monkestation/icons/mob/clothing/head_32x48.dmi'
 	json_config = 'code/datums/greyscale/json_configs/playbunny_ears_worn.json'
+
+/datum/greyscale_config/big_manipulator
+	name = "Big Manipulator"
+	icon_file = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_core.dmi'
+	json_config = 'code/datums/greyscale/json_configs/big_manipulator.json'
+
+/datum/greyscale_config/manipulator_hand
+	name = "Manipulator Hand"
+	icon_file = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi'
+	json_config = 'code/datums/greyscale/json_configs/manipulator_hand.json'

code/datums/greyscale/json_configs/big_manipulator.json

@@ -0,0 +1,15 @@
+{
+	"core": [
+		{
+			"type": "icon_state",
+			"icon_state": "core",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "core_colour",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/manipulator_hand.json

@@ -0,0 +1,15 @@
+{
+	"hand": [
+		{
+			"type": "icon_state",
+			"icon_state": "hand",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "hand_colour",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/materials/_material.dm

@@ -29,6 +29,8 @@ Simple datum which is instanced once per type and is used for every object of sa
 	var/list/categories = list()
 	///The type of sheet this material creates. This should be replaced as soon as possible by greyscale sheets
 	var/sheet_type
+	/// What type of ore is this material associated with? Used for mining, and not every material has one.
+	var/obj/item/ore_type
 	///This is a modifier for force, and resembles the strength of the material
 	var/strength_modifier = 1
 	///This is a modifier for integrity, and resembles the strength of the material
@@ -51,6 +53,10 @@ Simple datum which is instanced once per type and is used for every object of sa
 	var/obj/item/shard_type
 	///What type of debris the tile will leave behind when shattered.
 	var/obj/effect/decal/debris_type
+	/// How likely this mineral is to be found in a boulder during mining.
+	var/mineral_rarity = MATERIAL_RARITY_COMMON
+	/// How many points per units of ore does this grant?
+	var/points_per_unit = 1
 
 /** Handles initializing the material.
  *

code/datums/materials/basemats.dm

@@ -7,6 +7,9 @@
 	categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
 	sheet_type = /obj/item/stack/sheet/iron
 	value_per_unit = 0.0025
+	ore_type = /obj/item/stack/ore/iron
+	mineral_rarity = MATERIAL_RARITY_COMMON
+	points_per_unit = 1 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/iron/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
@@ -28,6 +31,9 @@
 	value_per_unit = 0.0025
 	beauty_modifier = 0.05
 	armor_modifiers = list(MELEE = 0.2, BULLET = 0.2, ENERGY = 1, BIO = 0.2, FIRE = 1, ACID = 0.2)
+	ore_type = /obj/item/stack/ore/glass
+	mineral_rarity = MATERIAL_RARITY_COMMON
+	points_per_unit = 1 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/glass/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5, sharpness = TRUE) //cronch
@@ -48,6 +54,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	sheet_type = /obj/item/stack/sheet/mineral/silver
 	value_per_unit = 0.025
 	beauty_modifier = 0.075
+	ore_type = /obj/item/stack/ore/silver
+	mineral_rarity = MATERIAL_RARITY_SEMIPRECIOUS
+	points_per_unit = 16 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/silver/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
@@ -65,6 +74,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.0625
 	beauty_modifier = 0.15
 	armor_modifiers = list(MELEE = 1.1, BULLET = 1.1, LASER = 1.15, ENERGY = 1.15, BOMB = 1, BIO = 1, FIRE = 0.7, ACID = 1.1)
+	ore_type = /obj/item/stack/ore/gold
+	mineral_rarity = MATERIAL_RARITY_PRECIOUS
+	points_per_unit = 18 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/gold/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
@@ -83,6 +95,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.25
 	beauty_modifier = 0.3
 	armor_modifiers = list(MELEE = 1.3, BULLET = 1.3, LASER = 0.6, ENERGY = 1, BOMB = 1.2, BIO = 1, FIRE = 1, ACID = 1)
+	ore_type = /obj/item/stack/ore/diamond
+	mineral_rarity = MATERIAL_RARITY_RARE
+	points_per_unit = 50 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/diamond/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
@@ -99,6 +114,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.05
 	beauty_modifier = 0.3 //It shines so beautiful
 	armor_modifiers = list(MELEE = 1.5, BULLET = 1.4, LASER = 0.5, ENERGY = 0.5, FIRE = 1, ACID = 1)
+	ore_type = /obj/item/stack/ore/uranium
+	mineral_rarity = MATERIAL_RARITY_SEMIPRECIOUS
+	points_per_unit = 30 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/uranium/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -134,6 +152,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.1
 	beauty_modifier = 0.15
 	armor_modifiers = list(MELEE = 1.4, BULLET = 0.7, ENERGY = 1.2, BIO = 1.2, ACID = 0.5)
+	ore_type = /obj/item/stack/ore/plasma
+	mineral_rarity = MATERIAL_RARITY_PRECIOUS
+	points_per_unit = 15 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/plasma/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -166,6 +187,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	beauty_modifier = 0.5
 	sheet_type = /obj/item/stack/sheet/bluespace_crystal
 	value_per_unit = 0.15
+	ore_type = /obj/item/stack/ore/bluespace_crystal
+	mineral_rarity = MATERIAL_RARITY_RARE
+	points_per_unit = 50 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/bluespace/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.reagents.add_reagent(/datum/reagent/bluespace, rand(5, 8))
@@ -183,6 +207,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.5
 	beauty_modifier = 0.5
 	armor_modifiers = list(BOMB = 100, FIRE = 10) //Clowns cant be blown away.
+	ore_type = /obj/item/stack/ore/bananium
+	mineral_rarity = MATERIAL_RARITY_UNDISCOVERED
+	points_per_unit = 60 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/bananium/on_applied(atom/source, amount, material_flags)
 	. = ..()
@@ -211,6 +238,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.0625
 	beauty_modifier = 0.05
 	armor_modifiers = list(MELEE = 1.35, BULLET = 1.3, LASER = 1.3, ENERGY = 1.25, BOMB = 1.25, BIO = 1, FIRE = 0.7, ACID = 1)
+	ore_type = /obj/item/stack/ore/titanium
+	mineral_rarity = MATERIAL_RARITY_SEMIPRECIOUS
 
 /datum/material/titanium/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
@@ -227,6 +256,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.3
 	beauty_modifier = 0.5
 	armor_modifiers = list(MELEE = 1.35, BULLET = 2, LASER = 0.5, ENERGY = 1.25, BOMB = 1.25, BIO = 1, FIRE = 1.4, ACID = 1) //rune is weak against magic lasers but strong against bullets. This is the combat triangle.
+	mineral_rarity = MATERIAL_RARITY_UNDISCOVERED
+	points_per_unit = 100 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/runite/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
@@ -244,6 +275,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.0125
 	beauty_modifier = -0.01
 	armor_modifiers = list(MELEE = 1.5, BULLET = 1.1, LASER = 0.3, ENERGY = 0.5, BOMB = 1, BIO = 1, FIRE = 1.1, ACID = 1)
+	ore_type = /obj/item/stack/ore/slag
+	mineral_rarity = MATERIAL_RARITY_UNDISCOVERED //Nobody's found oil on lavaland yet.
+	points_per_unit = 4 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/plastic/on_accidental_mat_consumption(mob/living/carbon/eater, obj/item/food)
 	eater.reagents.add_reagent(/datum/reagent/plastic_polymers, rand(6, 8))
@@ -303,6 +337,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	value_per_unit = 0.25
 	beauty_modifier = 0.4
 	armor_modifiers = list(MELEE = 1.5, BULLET = 1.5, LASER = 1.3, ENERGY = 1.3, BOMB = 1, BIO = 1, FIRE = 2.5, ACID = 1)
+	mineral_rarity = MATERIAL_RARITY_UNDISCOVERED //Doesn't naturally spawn on lavaland.
+	points_per_unit = 100 / SHEET_MATERIAL_AMOUNT
 
 /datum/material/adamantine/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
 	victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
@@ -320,6 +356,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	strength_modifier = 1.2
 	armor_modifiers = list(MELEE = 1.5, BULLET = 1.5, LASER = 1.5, ENERGY = 1.5, BOMB = 1.5, BIO = 1.5, FIRE = 1.5, ACID = 1.5)
 	beauty_modifier = 0.5
+	mineral_rarity = MATERIAL_RARITY_UNDISCOVERED //Doesn't naturally spawn on lavaland.
+	points_per_unit = 100 / SHEET_MATERIAL_AMOUNT
 
 /* monkestation edit: this is given anyways by [/datum/material_trait/magical]
 /datum/material/mythril/on_applied_obj(atom/source, amount, material_flags)

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -372,7 +372,7 @@
 	)
 	required_enemies = list(3,3,3,3,3,2,1,1,0,0)
 	required_candidates = 5
-	weight = 5
+	weight = 0
 	cost = 7
 	minimum_round_time = 70 MINUTES
 	requirements = REQUIREMENTS_VERY_HIGH_THREAT_NEEDED

code/game/sound.dm

@@ -256,13 +256,13 @@ GLOBAL_LIST_EMPTY(cached_mixer_channels)
 	S.status = SOUND_UPDATE
 	SEND_SOUND(src, S)
 
-/client/proc/playtitlemusic(vol = 0.85)
+/client/proc/playtitlemusic(vol = 85)
 	set waitfor = FALSE
 	UNTIL(SSticker.login_music_done) //wait for SSticker init to set the login music // monkestation edit: fix-lobby-music
 	UNTIL(fully_created)
 	if("[CHANNEL_LOBBYMUSIC]" in prefs.channel_volume)
 		if(prefs.channel_volume["[CHANNEL_LOBBYMUSIC]"] != 0)
-			vol *= prefs.channel_volume["[CHANNEL_LOBBYMUSIC]"] * 0.01
+			vol = prefs.channel_volume["[CHANNEL_LOBBYMUSIC]"]
 			vol *= prefs.channel_volume["[CHANNEL_MASTER_VOLUME]"] * 0.01
 
 	if((prefs && (!prefs.read_preference(/datum/preference/toggle/sound_lobby))) || CONFIG_GET(flag/disallow_title_music))

code/modules/client/client_procs.dm

@@ -966,6 +966,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	if(failed && !(ckey in GLOB.interviews.approved_ckeys))
 		message_admins(span_adminnotice("Proxy Detection: [key_name_admin(src)] Overwatch detected this is a [string]"))
 		interviewee = TRUE
+
+	if(ckey in GLOB.interviews.approved_ckeys)
+		return FALSE
+
 	return failed
 
 /client/Click(atom/object, atom/location, control, params)