Merge branch 'master' into safe-alcohol

AEV-Oxyd · Nov 25, 2023 · 39666e0 · 39666e0
2 parents 7df5a48 + 81ab44a
commit 39666e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/game/machinery/excelsior/ex_teleporter.dm b/code/game/machinery/excelsior/ex_teleporter.dm
@@ -65,7 +65,7 @@ var/global/excelsior_last_draft = 0
 		/obj/item/electronics/circuitboard/excelsior_boombox = 150,
 		/obj/item/electronics/circuitboard/excelsior_autodoc = 150,
 		/// its expensive so they need to do a few mandates before they manage to get it
-		/obj/item/electronics/circuitboard/excelsior_navigation_cracker = 10000,
+		/obj/item/electronics/circuitboard/excelsior_navigation_cracker = 3000,
 		/obj/item/electronics/circuitboard/diesel = 150
 		)
 

diff --git a/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm b/code/game/objects/items/weapons/circuitboards/machinery/excelsior.dm
@@ -78,9 +78,9 @@
 	// Highly advanced and classified mechanism for the safe redirection to excelsior-controled space..
 	origin_tech = list(TECH_ENGINEERING = 12, TECH_COVERT = 6, TECH_COMBAT = 6, TECH_BLUESPACE = 10, TECH_DATA = 6, TECH_MAGNET = 4)
 	req_components = list(
-		/obj/item/stock_parts/manipulator/excelsior = 3,
-		/obj/item/stock_parts/micro_laser/excelsior = 6,
-		/obj/item/stock_parts/scanning_module/excelsior = 3,
+		/obj/item/stock_parts/manipulator/excelsior = 1,
+		/obj/item/stock_parts/micro_laser/excelsior = 2,
+		/obj/item/stock_parts/scanning_module/excelsior = 1,
 		/obj/item/computer_hardware/processor_unit/adv = 2,
 		/obj/item/computer_hardware/hard_drive/advanced = 1,
 		// bluespace bullshit