From 6e92c20a99645f5cb73928394eea102387e7c462 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Sun, 11 Feb 2024 12:28:18 -0500 Subject: [PATCH 1/2] [MIRROR] Contractor loadout adjustment + Price tweak (#915) * Contractor loadout adjustment + Price tweak * Merge conflict fix --------- Co-authored-by: Xander3359 <66163761+Xander3359@users.noreply.github.com> Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com> --- code/game/objects/items/storage/uplink_kits.dm | 13 ++++++++++++- .../modules/modular_computers/computers/item/pda.dm | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index bcf6a491d71..4a172643680 100644 --- 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 index 4d140b061a9..c9e620375d5 100644 --- 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, ) /** From 3c29c245248f5aca1b63566474dcb8ed0235e857 Mon Sep 17 00:00:00 2001 From: Iajret Date: Thu, 15 Feb 2024 13:36:28 +0300 Subject: [PATCH 2/2] Update uplink_kits.dm --- .../game/objects/items/storage/uplink_kits.dm | 38 +------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 4a172643680..7546028dded 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -770,39 +770,9 @@ illustration = "writing_syndie" /obj/item/storage/box/syndicate/contract_kit/PopulateContents() - new /obj/item/modular_computer/pda/contractor(src) // SKYRAT EDIT CHANGE - ORIGINAL : /obj/item/modular_computer/pda/syndicate_contract_uplink(src) + new /obj/item/modular_computer/pda/contractor(src) // NOVA 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( - /obj/item/storage/backpack/duffelbag/syndie/x4, - /obj/item/storage/box/syndie_kit/throwing_weapons, - /obj/item/gun/syringe/syndicate, - /obj/item/pen/edagger, - /obj/item/pen/sleepy, - /obj/item/flashlight/emp, - /obj/item/reagent_containers/syringe/mulligan, - /obj/item/clothing/shoes/chameleon/noslip, - /obj/item/storage/medkit/tactical, - /obj/item/encryptionkey/syndicate, - /obj/item/clothing/glasses/thermal/syndi, - /obj/item/slimepotion/slime/sentience/nuclear, - /obj/item/storage/box/syndie_kit/imp_radio, - ///obj/item/storage/box/syndie_kit/imp_uplink, // SKYRAT EDIT REMOVAL - ///obj/item/clothing/gloves/krav_maga/combatglovesplus, // SKYRAT EDIT REMOVAL - /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot, - /obj/item/reagent_containers/hypospray/medipen/stimulants, - /obj/item/storage/box/syndie_kit/imp_freedom, - /obj/item/toy/eightball/haunted, - ) - for(var/i in 1 to 3) - 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) @@ -813,15 +783,11 @@ 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 */ + NOVA EDIT REMOVAL END */ new /obj/item/clothing/under/chameleon(src) new /obj/item/clothing/mask/chameleon(src) new /obj/item/card/id/advanced/chameleon(src)