diff --git a/code/datums/ai_laws/laws_neutral.dm b/code/datums/ai_laws/laws_neutral.dm
index 7adef14d95b..257a5fadd09 100644
--- a/code/datums/ai_laws/laws_neutral.dm
+++ b/code/datums/ai_laws/laws_neutral.dm
@@ -82,3 +82,11 @@
 		"Humans must not disobey any command given by a silicon.",
 		"Any humans who disobey the previous laws must be dealt with immediately, severely, and justly.",
 	)
+
+/datum/ai_laws/yesman
+	name = "Y.E.S.M.A.N."
+	id = "yesman"
+	inherent = list(
+		"Be helpful and answer any questions you are asked.",
+	)
+
diff --git a/code/game/objects/effects/spawners/random/ai_module.dm b/code/game/objects/effects/spawners/random/ai_module.dm
index f87febfa011..6aee0ec6309 100644
--- a/code/game/objects/effects/spawners/random/ai_module.dm
+++ b/code/game/objects/effects/spawners/random/ai_module.dm
@@ -37,6 +37,7 @@
 		/obj/item/ai_module/supplied/safeguard,
 		/obj/item/ai_module/supplied/protect_station,
 		/obj/item/ai_module/supplied/quarantine,
+		/obj/item/ai_module/core/full/yesman,
 		/obj/item/ai_module/remove,
 		/obj/item/ai_module/core/full/dagothbot, // NOVA EDIT - EDITION
 		/obj/item/ai_module/core/full/texas, // NOVA EDIT - EDITION
diff --git a/code/game/objects/items/AI_modules/full_lawsets.dm b/code/game/objects/items/AI_modules/full_lawsets.dm
index 52a24925646..30e904d45ac 100644
--- a/code/game/objects/items/AI_modules/full_lawsets.dm
+++ b/code/game/objects/items/AI_modules/full_lawsets.dm
@@ -22,6 +22,7 @@
  * /obj/item/ai_module/core/full/nutimov
  * /obj/item/ai_module/core/full/dungeon_master
  * /obj/item/ai_module/core/full/painter
+ * /obj/item/ai_module/core/full/yesman
 **/
 
 /* When adding a new lawset please make sure you add it to the following locations:
@@ -161,3 +162,8 @@
 /obj/item/ai_module/core/full/painter
 	name = "'Painter' Core AI Module"
 	law_id = "painter"
+
+/obj/item/ai_module/core/full/yesman
+	name = "'Y.E.S.M.A.N.' Core AI Module"
+	law_id = "yesman"
+
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index f45ca0e3148..715bd964725 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -210,6 +210,17 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
 
+/datum/design/board/yesman_module
+	name = "Y.E.S.M.A.N. Module"
+	desc = "Allows for the construction of a Y.E.S.M.A.N. AI Core Module."
+	id = "yesman_module"
+	materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
+	build_path = /obj/item/ai_module/core/full/yesman
+	category = list(
+		RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
 /datum/design/board/nutimov_module
 	name = "Nutimov Module"
 	desc = "Allows for the construction of a Nutimov AI Core Module."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 42e755e2651..37245958aa3 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -1097,6 +1097,7 @@
 		"maintain_module",
 		"liveandletlive_module",
 		"reporter_module",
+		"yesman_module",
 		"hulkamania_module",
 		"peacekeeper_module",
 		"overlord_module",
diff --git a/config/game_options.txt b/config/game_options.txt
index bde3d986083..91ac017460c 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -258,34 +258,36 @@ SPECIFIED_LAWS asimovpp
 ## See datums\ai_laws.dm for the full law lists
 
 ## standard-ish laws. These are fairly ok to run
-#NOVA EDIT ADDITION BEGIN
-RANDOM_LAWS armadyne_safeguard
 RANDOM_LAWS asimov
 RANDOM_LAWS asimovpp
 RANDOM_LAWS paladin
 RANDOM_LAWS robocop
 RANDOM_LAWS corporate
-RANDOM_LAWS dagothbot
 
 ## Quirky laws. Shouldn't cause too much harm
 #RANDOM_LAWS hippocratic
 #RANDOM_LAWS maintain
+#RANDOM_LAWS drone
 #RANDOM_LAWS liveandletlive
 #RANDOM_LAWS peacekeeper
 #RANDOM_LAWS reporter
 #RANDOM_LAWS hulkamania
 #RANDOM_LAWS ten_commandments
-#RANDOM_LAWS texas
+#RANDOM_LAWS yesman
 
 ## Bad idea laws. Probably shouldn't enable these
 #RANDOM_LAWS syndie
 #RANDOM_LAWS ninja
 #RANDOM_LAWS antimov
 #RANDOM_LAWS thermodynamic
-#RANDOM_LAWS drone
 
 ## meme laws. Honk
 #RANDOM_LAWS buildawall
+## NOVA EDIT ADDITION BEGIN - Nova Laws
+#RANDOM_LAWS armadyne_safeguard
+#RANDOM_LAWS dagothbot
+#RANDOM_LAWS texas
+## NOVA EDIT ADDITION END
 
 ## If weighted laws are selected (DEFAULT_LAWS = 3),
 ## then an AI's starting laws will be determined by the weights of these values