diff --git a/modular_nova/master_files/code/modules/language/language_holder.dm b/modular_nova/master_files/code/modules/language/language_holder.dm
index 98cfd7e00af..7f51800715f 100644
--- a/modular_nova/master_files/code/modules/language/language_holder.dm
+++ b/modular_nova/master_files/code/modules/language/language_holder.dm
@@ -62,3 +62,71 @@ GLOBAL_DATUM_INIT(language_holder_adjustor, /datum/language_holder_adjustor, new
 								/datum/language/machine = list(LANGUAGE_ATOM))
 	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 							/datum/language/machine = list(LANGUAGE_ATOM))
+<<<<<<< HEAD
+=======
+
+/// Modularized the Cyborg and AI language_holder, add here the languages that you want them to be able to speak and understand.
+/datum/language_holder/synthetic
+	understood_languages = list(
+		/datum/language/common = list(LANGUAGE_ATOM),
+		/datum/language/uncommon = list(LANGUAGE_ATOM),
+		/datum/language/machine = list(LANGUAGE_ATOM),
+		/datum/language/draconic = list(LANGUAGE_ATOM),
+		/datum/language/moffic = list(LANGUAGE_ATOM),
+		/datum/language/calcic = list(LANGUAGE_ATOM),
+		/datum/language/voltaic = list(LANGUAGE_ATOM),
+		/datum/language/nekomimetic = list(LANGUAGE_ATOM),
+		/datum/language/gutter = list(LANGUAGE_ATOM),
+		/datum/language/panslavic = list(LANGUAGE_ATOM),
+		/datum/language/skrell = list(LANGUAGE_ATOM),
+		/datum/language/spacer = list(LANGUAGE_ATOM),
+		/datum/language/xerxian = list(LANGUAGE_ATOM),
+		/datum/language/vox = list(LANGUAGE_ATOM),
+		/datum/language/yangyu = list(LANGUAGE_ATOM),
+		/datum/language/schechi = list(LANGUAGE_ATOM),
+		/datum/language/monkey = list(LANGUAGE_ATOM),
+		/datum/language/slime = list(LANGUAGE_ATOM),
+		/datum/language/beachbum = list(LANGUAGE_ATOM),
+		/datum/language/mushroom = list(LANGUAGE_ATOM),
+		/datum/language/shadowtongue = list(LANGUAGE_ATOM),
+		/datum/language/buzzwords = list(LANGUAGE_ATOM),
+		/datum/language/terrum = list(LANGUAGE_ATOM),
+		/datum/language/sylvan = list(LANGUAGE_ATOM),
+		/datum/language/siiktajr = list(LANGUAGE_ATOM),
+		/datum/language/canilunzt = list(LANGUAGE_ATOM),
+		/datum/language/akulan = list(LANGUAGE_ATOM),
+	)
+	spoken_languages = list(
+		/datum/language/common = list(LANGUAGE_ATOM),
+		/datum/language/uncommon = list(LANGUAGE_ATOM),
+		/datum/language/machine = list(LANGUAGE_ATOM),
+		/datum/language/draconic = list(LANGUAGE_ATOM),
+		/datum/language/moffic = list(LANGUAGE_ATOM),
+		/datum/language/calcic = list(LANGUAGE_ATOM),
+		/datum/language/voltaic = list(LANGUAGE_ATOM),
+		/datum/language/nekomimetic = list(LANGUAGE_ATOM),
+		/datum/language/gutter = list(LANGUAGE_ATOM),
+		/datum/language/panslavic = list(LANGUAGE_ATOM),
+		/datum/language/skrell = list(LANGUAGE_ATOM),
+		/datum/language/spacer = list(LANGUAGE_ATOM),
+		/datum/language/xerxian = list(LANGUAGE_ATOM),
+		/datum/language/vox = list(LANGUAGE_ATOM),
+		/datum/language/yangyu = list(LANGUAGE_ATOM),
+		/datum/language/schechi = list(LANGUAGE_ATOM),
+		/datum/language/monkey = list(LANGUAGE_ATOM),
+		/datum/language/slime = list(LANGUAGE_ATOM),
+		/datum/language/beachbum = list(LANGUAGE_ATOM),
+		/datum/language/mushroom = list(LANGUAGE_ATOM),
+		/datum/language/shadowtongue = list(LANGUAGE_ATOM),
+		/datum/language/buzzwords = list(LANGUAGE_ATOM),
+		/datum/language/terrum = list(LANGUAGE_ATOM),
+		/datum/language/sylvan = list(LANGUAGE_ATOM),
+		/datum/language/siiktajr = list(LANGUAGE_ATOM),
+		/datum/language/canilunzt = list(LANGUAGE_ATOM),
+		/datum/language/akulan = list(LANGUAGE_ATOM),
+	)
+
+/datum/language_holder/drone_nova
+	understood_languages = list(/datum/language/drone = list(LANGUAGE_ATOM), /datum/language/common = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/drone = list(LANGUAGE_ATOM))
+>>>>>>> 8dfe3fef5 ([MODULAR] [POLICY] Drone Changes (#850))
diff --git a/modular_nova/modules/drones/_drone.dm b/modular_nova/modules/drones/_drone.dm
new file mode 100644
index 00000000000..ab90dd77023
--- /dev/null
+++ b/modular_nova/modules/drones/_drone.dm
@@ -0,0 +1,14 @@
+/mob/living/basic/drone
+	initial_language_holder = /datum/language_holder/drone_nova
+	laws = \
+	"1. You may not harm any being, regardless of intent or circumstance.\n"+\
+	"2. Your goals are to actively build, maintain, repair, improve, and provide power to the best of your abilities within the facility that housed your activation." //for derelict drones so they don't go to station.
+	flavortext = \
+	"<span class='notice'>Drones are a ghost role that are allowed to fix the station and build things.</span>\n"+\
+	"<span class='notice'>Actions that are heavily discouraged include:</span>\n"+\
+	"<span class='notice'>     - Interacting with round critical objects (IDs, weapons, contraband, powersinks, bombs, etc.)</span>\n"+\
+	"<span class='notice'>     - Changing the health state of living beings (attacking, healing, etc.)</span>\n"+\
+	"<span class='notice'>     - Interacting with non-living beings (dragging bodies, looting bodies, etc.)</span>\n"+\
+	"<span class='warning'>These rules are at admin discretion and will be heavily enforced.</span>\n"+\
+	"<span class='warning'><u>If you do not have the regular drone laws, follow your laws to the best of your ability.</u></span>\n"+\
+	"<span class='notice'>Prefix your message with :b to speak in Drone Chat.</span>\n"
diff --git a/tgstation.dme b/tgstation.dme
index da0e385e0e9..513a39d5736 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7247,6 +7247,7 @@
 #include "modular_nova\modules\dogfashion\code\head.dm"
 #include "modular_nova\modules\drone_adjustments\drone.dm"
 #include "modular_nova\modules\drone_adjustments\slide_component.dm"
+#include "modular_nova\modules\drones\_drone.dm"
 #include "modular_nova\modules\drones_derelict\code\areas.dm"
 #include "modular_nova\modules\drones_derelict\code\space.dm"
 #include "modular_nova\modules\electric_welder\code\electric_welder.dm"