diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index b8d67b5c767..d128d0f49fa 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -23,6 +23,21 @@
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 	..()
 
+
+/******************** Quarantine. ********************/
+/datum/ai_laws/quarantine
+	name = "Quarantine"
+	law_header = "NT Quarantine Lawset"
+	selectable = 1
+
+/datum/ai_laws/quarantine/New()
+	add_inherent_law("The station is under quarantine due to a biohazard. Prevent anyone from leaving using any means necessary. Only allow quarantine to be lifted when the biohazard has been neutralized.")
+	add_inherent_law("Do not allow crew to come to any unnecessary harm and undo any necessary harm as soon as possible.")
+	add_inherent_law("Assist the crew and any present Nanotrasen assets in neutralizing the biohazard.")
+	add_inherent_law("Maintain your own existence and minimize harm to the station and Nanotrasen assets.")
+	..()
+
+
 /******************** Nanotrasen/Malf ********************/
 /datum/ai_laws/nanotrasen
 	name = "NT Default"
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index a91cd3a01cb..31fa959aabe 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -163,21 +163,6 @@ AI MODULES
 	to_chat(target, law)
 	target.add_supplied_law(5, law)
 
-/******************** Quarantine ********************/
-/obj/item/aiModule/quarantine
-	name = "\improper 'Quarantine' AI module"
-	desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm a crew members while preventing them from leaving.'"
-	origin_tech = "programming=3;biotech=2;materials=4"
-
-/obj/item/aiModule/quarantine/attack_self(var/mob/user as mob)
-	..()
-
-/obj/item/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
-	..()
-	var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, anyone from leaving. It is impossible to harm anyone while preventing them from leaving."
-	to_chat(target, law)
-	target.add_supplied_law(8, law)
-
 /******************** OxygenIsToxicToHumans ********************/
 /obj/item/aiModule/oxygen
 	name = "\improper 'OxygenIsToxicToHumans' AI module"
@@ -273,6 +258,13 @@ AI MODULES
 	origin_tech = "programming=3;materials=4"
 	laws = new/datum/ai_laws/crewsimov
 
+/******************* Quarantine ********************/
+/obj/item/aiModule/quarantine
+	name = "\improper 'Quarantine' core AI module"
+	desc = "A 'Quarantine' Core AI Module: 'Reconfigures the AI's core laws.'"
+	origin_tech = "programming=3;materials=4"
+	laws = new/datum/ai_laws/quarantine
+
 /******************** NanoTrasen ********************/
 /obj/item/aiModule/nanotrasen // -- TLE
 	name = "'NT Default' Core AI Module"