From 22d84f458fa41e49396030a505e743cfc1da6e22 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 28 Nov 2024 22:38:06 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BB?= =?UTF-8?q?=D1=83=D1=82=20=D0=B2=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=BE=D1=80=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=80=D0=BE=D0=B2=20=D0=B7=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/loadout.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 7bc87cc508f..49f8e1ae08d 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -76,10 +76,16 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = list(CAT_MARINE, "Lemoline bottle", 23, "cyan"), /obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"), /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), - /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), - /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"), + /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "orange2"), + /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "red"), + /obj/item/storage/backpack/marine/satchel/scout_cloak = list(CAT_MARINE, "M68 Thermal cloak", 20, "blue"), + /obj/item/armor_module/module/night_vision = list(CAT_MARINE, "BE-35 night vision kit", 20, "blue"), + /obj/item/clothing/glasses/night_vision = list(CAT_MARINE, "BE-47 night vision goggles", 30, "blue"), + /obj/item/cell/night_vision_battery = list(CAT_MARINE, "night vision battery", 5, "blue"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( From b2a4c9219757e7d1e301af0daa5193b4f97053ab Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 28 Nov 2024 22:39:18 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D1=8E=D1=8E=20=D1=81=D1=82=D1=80=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D1=83=20=D1=81=D0=B8=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/loadout.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 49f8e1ae08d..660635456cf 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -76,7 +76,6 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), - /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), /obj/item/reagent_containers/glass/bottle/lemoline/doctor = list(CAT_MARINE, "Lemoline bottle", 23, "cyan"), /obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"), /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"),