ParadiseSS13 · PollardTheDragon · Jan 31, 2025 · Jan 31, 2025 · Feb 1, 2025 · Feb 1, 2025
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm
@@ -44,6 +44,7 @@
 #define ACCESS_THEATRE					46
 #define ACCESS_RESEARCH					47
 #define ACCESS_MINING					48
+#define ACCESS_SMITH					49
 #define ACCESS_MAILSORTING				50
 #define ACCESS_HEADS_VAULT				53
 #define ACCESS_MINING_STATION			54

diff --git a/code/__DEFINES/construction_defines.dm b/code/__DEFINES/construction_defines.dm
@@ -78,6 +78,10 @@
 #define MAT_TITANIUM		"titanium"
 #define MAT_BIOMASS			"biomass"
 #define MAT_PLASTIC			"plastic"
+#define MAT_BRASS			"brass"
+#define MAT_PALLADIUM		"palladium"
+#define MAT_PLATINUM		"platinum"
+#define MAT_IRIDIUM			"iridium"
 
 /// The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
 #define MINERAL_MATERIAL_AMOUNT 2000

diff --git a/code/__DEFINES/job_defines.dm b/code/__DEFINES/job_defines.dm
@@ -56,3 +56,4 @@
 #define JOB_MIME				(1<<12)
 #define JOB_ASSISTANT			(1<<13)
 #define JOB_EXPLORER			(1<<14)
+#define JOB_SMITH				(1<<15)
diff --git a/code/__DEFINES/tools_defines.dm b/code/__DEFINES/tools_defines.dm
@@ -5,6 +5,7 @@
 #define TOOL_WIRECUTTER 	"wirecutter"
 #define TOOL_WRENCH 		"wrench"
 #define TOOL_WELDER 		"welder"
+#define TOOL_HAMMER			"hammer"
 
 GLOBAL_LIST_INIT(construction_tool_behaviors, list(
 	TOOL_CROWBAR,

diff --git a/code/datums/ores.dm b/code/datums/ores.dm
@@ -43,6 +43,18 @@
 	drop_type = /obj/item/stack/ore/diamond
 	scan_icon_state = "rock_Diamond"
 
+/datum/ore/platinum
+	drop_type = /obj/item/stack/ore/platinum
+	scan_icon_state = "rock_Platinum"
+
+/datum/ore/palladium
+	drop_type = /obj/item/stack/ore/palladium
+	scan_icon_state = "rock_Palladium"
+
+/datum/ore/iridium
+	drop_type = /obj/item/stack/ore/iridium
+	scan_icon_state = "rock_Iridium"
+
 /datum/ore/gold
 	drop_type = /obj/item/stack/ore/gold
 	spread_chance = 5

diff --git a/code/datums/smith_datums.dm b/code/datums/smith_datums.dm
@@ -0,0 +1,273 @@
+// Quality
+
+/datum/smith_quality
+	var/name = "Boring Debug"
+	/// How much does this quality improve stats?
+	var/stat_mult = 1.0
+	/// How many more materials does this quality require?
+	var/material_mult = 1.0
+	/// How much extra work is needed to produce this quality?
+	var/work_mult = 1.0
+
+/datum/smith_quality/standard
+	name = "Standard"
+	stat_mult = 1.0
+	material_mult = 1.0
+	work_mult = 1.0
+
+/datum/smith_quality/improved
+	name = "Improved"
+	stat_mult = 1.25
+	material_mult = 1.5
+	work_mult = 2.0
+
+/datum/smith_quality/enhanced
+	name = "Enhanced"
+	stat_mult = 1.5
+	material_mult = 2.0
+	work_mult = 3.0
+
+/datum/smith_quality/superior
+	name = "Superior"
+	stat_mult = 1.75
+	material_mult = 3.0
+	work_mult = 4.5
+
+/datum/smith_quality/masterwork
+	name = "Masterwork"
+	stat_mult = 2.0
+	material_mult = 4.0
+	work_mult = 6.0
+
+// Materials
+
+#define MAJOR_MATERIAL_BUFF 1.2
+#define MINOR_MATERIAL_BUFF 1.1
+#define MINOR_MATERIAL_DEBUFF 0.9
+#define MAJOR_MATERIAL_DEBUFF 0.8
+
+/datum/smith_material
+	var/name = "Boring Debug"
+	/// Brute armor multiplier
+	var/brute_armor_mult = 1.0
+	/// Burn armor multiplier
+	var/burn_armor_mult = 1.0
+	/// Laser armor multiplier
+	var/laser_armor_mult = 1.0
+	/// Explosive armor multiplier
+	var/explosive_armor_mult = 1.0
+	/// Movement speed modifier
+	var/movement_speed_mod = 0
+	/// Heat insulation multiplier
+	var/heat_insulation_mult = 1.0
+	/// Electrical insulation multiplier
+	var/siemens_coeff_mult = 1.0
+	/// Radiation insulation multiplier
+	var/radiation_armor_mult = 1.0
+	/// Tool speed multiplier
+	var/tool_speed_mult = 1.0
+	/// Tool precision multiplier
+	var/tool_precision_mult = 1.0
+	/// How much larger does a bit with this material make it?
+	var/size_mod = 0
+	/// Projectile speed multiplier
+	var/projectile_speed_mult = 1.0
+	/// Power draw multiplier
+	var/power_draw_mult = 1.0
+	/// Projectile damage multiplier
+	var/projectile_damage_multiplier = 1.0
+	/// Fire rate multiplier
+	var/fire_rate_multiplier = 1.0
+	/// Multiplier for tool uses and lense uses.
+	var/durability_mult = 1.0
+
+/datum/smith_material/metal
+	name = "metal"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_DEBUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -0.5
+	radiation_armor_mult = MINOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_DEBUFF
+	fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+	durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/silver
+	name = "silver"
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	heat_insulation_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	power_draw_mult = MINOR_MATERIAL_DEBUFF
+	projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/gold
+	name = "gold"
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -0.5
+	heat_insulation_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+	radiation_armor_mult = MAJOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	size_mod = 1
+	fire_rate_multiplier = MINOR_MATERIAL_BUFF
+	durability_mult = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/plasma
+	name = "plasma"
+	burn_armor_mult = MAJOR_MATERIAL_DEBUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+	durability_mult = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/titanium
+	name = "titanium"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_DEBUFF
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	heat_insulation_mult = MINOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	projectile_speed_mult = MINOR_MATERIAL_BUFF
+	power_draw_mult = MINOR_MATERIAL_DEBUFF
+	fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/uranium
+	name = "uranium"
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -0.5
+	siemens_coeff_mult = MINOR_MATERIAL_BUFF
+	radiation_armor_mult = MAJOR_MATERIAL_DEBUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	size_mod = 1
+	projectile_speed_mult = MINOR_MATERIAL_BUFF
+	power_draw_mult = MINOR_MATERIAL_DEBUFF
+	fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+	durability_mult = MINOR_MATERIAL_BUFF
+	/// Radioactive, woah
+	var/radiation_amount = 15
+
+/datum/smith_material/diamond
+	name = "diamond"
+	brute_armor_mult = MAJOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MAJOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/bluespace
+	name = "bluespace"
+	laser_armor_mult = MAJOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = 0.5
+	heat_insulation_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MINOR_MATERIAL_BUFF
+	radiation_armor_mult = MINOR_MATERIAL_DEBUFF
+	tool_speed_mult = MAJOR_MATERIAL_BUFF
+	power_draw_mult = MAJOR_MATERIAL_BUFF
+	projectile_damage_multiplier = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/plasteel
+	name = "plasteel"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -1.0
+	heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	size_mod = 2
+	power_draw_mult = MAJOR_MATERIAL_BUFF
+	projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+	fire_rate_multiplier = MINOR_MATERIAL_BUFF
+	durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/plastitanium
+	name = "plastitanium"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MAJOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -0.5
+	heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+	radiation_armor_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	size_mod = 1
+	projectile_speed_mult = MINOR_MATERIAL_BUFF
+	power_draw_mult = MAJOR_MATERIAL_BUFF
+	fire_rate_multiplier = MINOR_MATERIAL_BUFF
+	durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/iridium
+	name = "iridium"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	movement_speed_mod = -0.5
+	heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+	radiation_armor_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	size_mod = -1
+	projectile_speed_mult = MINOR_MATERIAL_BUFF
+	power_draw_mult = MINOR_MATERIAL_BUFF
+	projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+	durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/palladium
+	name = "palladium"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MINOR_MATERIAL_DEBUFF
+	explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+	heat_insulation_mult = MINOR_MATERIAL_BUFF
+	siemens_coeff_mult = MINOR_MATERIAL_BUFF
+	radiation_armor_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	size_mod = -1
+	power_draw_mult = MINOR_MATERIAL_DEBUFF
+	projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
+	durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/platinum
+	name = "platinum"
+	brute_armor_mult = MINOR_MATERIAL_BUFF
+	burn_armor_mult = MINOR_MATERIAL_BUFF
+	laser_armor_mult = MINOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+	movement_speed_mod = 0.5
+	heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+	siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	size_mod = -1
+	projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+	power_draw_mult = MINOR_MATERIAL_BUFF
+	durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/brass
+	name = "brass"
+	brute_armor_mult = MINOR_MATERIAL_DEBUFF
+	burn_armor_mult = MINOR_MATERIAL_DEBUFF
+	laser_armor_mult = MAJOR_MATERIAL_BUFF
+	explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+	movement_speed_mod = 0.5
+	heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+	siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+	radiation_armor_mult = MINOR_MATERIAL_BUFF
+	tool_speed_mult = MINOR_MATERIAL_BUFF
+	tool_precision_mult = MINOR_MATERIAL_BUFF
+	projectile_speed_mult = MINOR_MATERIAL_DEBUFF
+	power_draw_mult = MAJOR_MATERIAL_DEBUFF
+	fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+	durability_mult = MINOR_MATERIAL_DEBUFF
+
+#undef MAJOR_MATERIAL_BUFF
+#undef MINOR_MATERIAL_BUFF
+#undef MINOR_MATERIAL_DEBUFF
+#undef MAJOR_MATERIAL_DEBUFF
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
@@ -170,6 +170,7 @@
 		/datum/job/hydro = /obj/item/organ/internal/cyberimp/arm/botanical,
 		/datum/job/captain = /obj/item/organ/internal/heart/cybernetic/upgraded,
 		/datum/job/cargo_tech = /obj/item/organ/internal/cyberimp/brain/anti_sleep,
+		/datum/job/smith = /obj/item/organ/internal/cyberimp/arm/toolset,
 		/datum/job/chaplain = /obj/item/organ/internal/cyberimp/brain/anti_drop,
 		/datum/job/chemist = /obj/item/organ/internal/liver/cybernetic,
 		/datum/job/chief_engineer = /obj/item/organ/internal/cyberimp/brain/wire_interface,

diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm
@@ -97,6 +97,10 @@
 	name = "Mining Station Storage"
 	icon_state = "storage"
 
+/area/mine/outpost/smith_workshop
+	name = "Smith's Workshop"
+	icon_state = "smith"
+
 /area/mine/outpost/maintenance
 	name = "Mining Station Maintenance"
 	icon_state = "maintcentral"

diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm
@@ -35,6 +35,10 @@
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 	request_console_flags = RC_SUPPLY
 
+/area/station/supply/smith_office
+	name = "\improper Smith's Office"
+	icon_state = "smith"
+
 /area/station/supply/qm
 	name = "\improper Quartermaster's Office"
 	icon_state = "qm"

diff --git a/code/game/atom/atom_tool_acts.dm b/code/game/atom/atom_tool_acts.dm
@@ -84,6 +84,8 @@
 			act_result = wirecutter_act(user, tool)
 		if(TOOL_WELDER)
 			act_result = welder_act(user, tool)
+		if(TOOL_HAMMER)
+			act_result = hammer_act(user, tool)
 
 	if(!act_result)
 		return NONE

diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -581,6 +581,9 @@
 /atom/proc/welder_act(mob/living/user, obj/item/I)
 	return
 
+/atom/proc/hammer_act(mob/living/user, obj/item/I)
+	return
+
 /// This is when an atom is emagged. Should return false if it fails, or it has no emag_act defined.
 /atom/proc/emag_act(mob/user)
 	SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT, user)

diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm
@@ -143,6 +143,7 @@
 	department_roles = list(
 		"Quartermaster",
 		"Cargo Technician",
+		"Smith",
 		"Shaft Miner",
 		"Spelunker"
 	)