From fcf02c838fcd6d03f552a33ff7ce4c7bd3d5a968 Mon Sep 17 00:00:00 2001
From: AndroBetel <44546836+AndroBetel@users.noreply.github.com>
Date: Wed, 12 Jun 2024 02:33:53 +0300
Subject: [PATCH] conflict

---
 code/defines/procs/records.dm | 48 -----------------------------------
 colonialmarines.dme           |  1 -
 2 files changed, 49 deletions(-)
 delete mode 100644 code/defines/procs/records.dm

diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm
deleted file mode 100644
index b4612f10f4..0000000000
--- a/code/defines/procs/records.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/proc/CreateGeneralRecord()
-	var/datum/data/record/G = new /datum/data/record()
-	G.fields["name"] = "New Record"
-	G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
-	G.fields["rank"] = "Unassigned"
-	G.fields["real_rank"] = "Unassigned"
-	G.fields["sex"] = "Male"
-	G.fields["age"] = "Unknown"
-	G.fields["skin_color"] = "Unknown"
-	G.fields["p_stat"] = "Active"
-	G.fields["m_stat"] = "Stable"
-	G.fields["species"] = "Human"
-	G.fields["origin"] = "Unknown"
-	G.fields["faction"] = "Unknown"
-	G.fields["mob_faction"] = "Unknown"
-	G.fields["religion"] = "Unknown"
-	GLOB.data_core.general += G
-	return G
-
-/proc/CreateSecurityRecord(name as text, id as text)
-	var/datum/data/record/R = new /datum/data/record()
-	R.fields["name"] = name
-	R.fields["id"] = id
-	R.name = text("Security Record #[id]")
-	R.fields["incidents"] = "None"
-	GLOB.data_core.security += R
-	return R
-
-/proc/create_medical_record(mob/living/carbon/human/H)
-	var/datum/data/record/M = new /datum/data/record()
-	M.fields["id"] = null
-	M.fields["name"] = H.real_name
-	M.fields["b_type"] = H.b_type
-	M.fields["mi_dis"] = "None"
-	M.fields["mi_dis_d"] = "No minor disabilities have been declared."
-	M.fields["ma_dis"] = "None"
-	M.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
-	M.fields["alg"] = "None"
-	M.fields["alg_d"] = "No allergies have been detected in this patient."
-	M.fields["cdi"] = "None"
-	M.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
-	M.fields["last_scan_time"] = null
-	M.fields["last_scan_result"] = "No scan data on record"
-	M.fields["autodoc_data"] = list()
-	M.fields["autodoc_manual"] = list()
-	M.fields["ref"] = WEAKREF(H)
-	GLOB.data_core.medical += M
-	return M
diff --git a/colonialmarines.dme b/colonialmarines.dme
index a0d03a425b..a5389988de 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -683,7 +683,6 @@
 #include "code\defines\procs\conflict.dm"
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
-#include "code\defines\procs\records.dm"
 #include "code\game\atoms.dm"
 #include "code\game\atoms_movable.dm"
 #include "code\game\bioscans.dm"