[MIRROR] Contractor loadout adjustment + Price tweak (#915)

* Contractor loadout adjustment + Price tweak * Merge conflict fix --------- Co-authored-by: Xander3359 <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]>
Fluffy-Frontier · Feb 11, 2024 · 6e92c20 · 6e92c20
1 parent d93c0dc
commit 6e92c20
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
@@ -773,6 +773,7 @@
 	new /obj/item/modular_computer/pda/contractor(src) // SKYRAT EDIT CHANGE - ORIGINAL : /obj/item/modular_computer/pda/syndicate_contract_uplink(src)
 	new /obj/item/storage/box/syndicate/contractor_loadout(src)
 	new /obj/item/melee/baton/telescopic/contractor_baton(src)
+<<<<<<< HEAD
 
 	// All about 4 TC or less - some nukeops only items, but fit nicely to the theme.
 	var/static/list/item_list = list(
@@ -800,6 +801,8 @@
 		var/selected_item = pick_n_take(item_list + modular_item_list) // NOVA EDIT CHANGE - ORIGINAL : var/selected_item = pick_n_take(item_list)
 		new selected_item(src)
 
+=======
+>>>>>>> e5b7173a2 ([MIRROR] Contractor loadout adjustment + Price tweak (#915))
 	// Paper guide is always last.
 	new /obj/item/paper/contractor_guide(src)
 
@@ -810,14 +813,22 @@
 	illustration = "writing_syndie"
 
 /obj/item/storage/box/syndicate/contractor_loadout/PopulateContents()
+<<<<<<< HEAD
 	/* SKYRAT EDIT REMOVAL BEGIN - Contractors get MODSuits instead, see contractor modular for overrides
+=======
+	/* NOVA EDIT REMOVAL BEGIN - Contractors get MODSuits instead, see contractor modular for overrides
+	new /obj/item/mod/control/pre_equipped/infiltrator(src)
+>>>>>>> e5b7173a2 ([MIRROR] Contractor loadout adjustment + Price tweak (#915))
 	new /obj/item/clothing/head/helmet/space/syndicate/contract(src)
 	new /obj/item/clothing/suit/space/syndicate/contract(src)
 	SKYRAT EDIT REMOVAL END */
 	new /obj/item/clothing/under/chameleon(src)
 	new /obj/item/clothing/mask/chameleon(src)
-	new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
 	new /obj/item/card/id/advanced/chameleon(src)
+	new /obj/item/clothing/glasses/thermal/syndi(src)
+	new /obj/item/storage/toolbox/syndicate(src)
+	new /obj/item/jammer(src)
+	new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
 	new /obj/item/lighter(src)
 
 #undef KIT_RECON

diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
@@ -289,6 +289,7 @@
 
 	starting_programs = list(
 		/datum/computer_file/program/contract_uplink,
+		/datum/computer_file/program/secureye/syndicate,
 	)
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,6 +289,7 @@ @@
     	starting_programs = list(
     		/datum/computer_file/program/contract_uplink,
+    		/datum/computer_file/program/secureye/syndicate,
     	)
     /**
@@ Expand Down @@