Update: Cargo Cataloge Faction (#1186)

* Update: Cargo Cataloge Faction

* Циферку поправил

_maps/_mod_celadon/outpost/elysium_ice.dmm

@@ -6332,7 +6332,8 @@
 	},
 /obj/machinery/door/airlock{
 	dir = 8;
-	name = "Donk Co Shop"
+	name = "Donk Co Shop";
+	max_integrity = 3000000000000
 	},
 /turf/open/floor/wood/walnut,
 /area/outpost/fraction/syndi/donkco_shop)
@@ -8604,7 +8605,8 @@
 /area/outpost/medical/reseption)
 "gXl" = (
 /obj/machinery/door/airlock/multi_tile/base/glass{
-	req_access_txt = "8133"
+	req_access_txt = "8133";
+	max_integrity = 3000000000000
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -9505,7 +9507,8 @@
 /obj/machinery/door/airlock/solgov/glass{
 	dir = 4;
 	name = "SolFed Cargo";
-	req_access_txt = "8132"
+	req_access_txt = "8132";
+	max_integrity = 3000000000000
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4;
@@ -10615,7 +10618,8 @@
 	dir = 4
 	},
 /obj/structure/falsewall/reinforced{
-	req_one_access_txt = "8131"
+	req_one_access_txt = "8131";
+	max_integrity = 3000000000000
 	},
 /turf/open/floor/plating{
 	light_color = "#1B1D2E";
@@ -11570,7 +11574,8 @@
 /obj/machinery/door/airlock{
 	dir = 4;
 	name = "Storage";
-	req_one_access_txt = "8126"
+	req_one_access_txt = "8126";
+	max_integrity = 3000000000000
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -12331,7 +12336,8 @@
 /area/outpost/fraction/syndi)
 "kfc" = (
 /obj/machinery/door/airlock/multi_tile/base{
-	req_access_txt = "8133"
+	req_access_txt = "8133";
+	max_integrity = 3000000000000
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -15656,7 +15662,8 @@
 /area/outpost/cargo)
 "nbd" = (
 /obj/structure/falsewall/reinforced{
-	req_one_access_txt = "8131"
+	req_one_access_txt = "8131";
+	max_integrity = 3000000000000
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
@@ -18190,7 +18197,9 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/grunge,
+/obj/machinery/door/airlock/grunge{
+	max_integrity = 3000000000000
+	},
 /turf/open/floor/plasteel/mono,
 /area/outpost/fraction/inteq)
 "paj" = (
@@ -18711,7 +18720,8 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/corner,
 /obj/machinery/door/airlock/grunge{
 	dir = 4;
-	req_access_txt = "8133"
+	req_access_txt = "8133";
+	max_integrity = 3000000000000
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -22207,6 +22217,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/dark,
 /area/outpost/crew/cryo)
+"shU" = (
+/obj/machinery/door/airlock/outpost{
+	dir = 8;
+	req_one_access_txt = "8100";
+	max_integrity = 3000000000000
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/tech,
+/area/outpost/external)
 "sih" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced/spawner{
@@ -24516,7 +24536,8 @@
 /obj/machinery/door/airlock/solgov/glass{
 	dir = 4;
 	name = "SolFed Cargo";
-	req_access_txt = "8132"
+	req_access_txt = "8132";
+	max_integrity = 3000000000000
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4;
@@ -39702,7 +39723,7 @@ dmO
 wUa
 fIy
 fIy
-eto
+shU
 fIy
 fIy
 rgY

mod_celadon/cargo_items/_cargo_items.dme

@@ -12,6 +12,7 @@
 #include "code/vendor_refill.dm"
 #include "code/import.dm"
 #include "code/ammunition.dm"
+#include "code/guncase.dm"
 
 #include "code/packs/mechs.dm"
 #include "code/packs/costumes_toys.dm"

mod_celadon/cargo_items/code/guncase.dm

@@ -0,0 +1,71 @@
+// Дефайн отвечающий за создание датума с балистическим оружием без магазина
+EMPTY_GUN_HELPER(automatic/powered/gauss/gar)
+EMPTY_GUN_HELPER(automatic/powered/gauss/gar/suns)
+EMPTY_GUN_HELPER(automatic/smg/skm_carbine/inteq)
+EMPTY_GUN_HELPER(automatic/pistol/deagle)
+
+// Создаём кучу ганкейсов, чтобы заполнить ими карго
+/obj/item/storage/guncase/gauss
+/obj/item/storage/guncase/gauss/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/powered/gauss/gar/no_mag(src)
+	new /obj/item/ammo_box/magazine/gar/empty(src)
+	new /obj/item/ammo_box/magazine/gar/empty(src)
+
+/obj/item/ammo_box/magazine/gar/empty
+	start_empty = TRUE
+
+/obj/item/storage/guncase/gauss/suns
+/obj/item/storage/guncase/gauss/suns/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/powered/gauss/gar/suns/no_mag(src)
+	new /obj/item/ammo_box/magazine/gar/empty(src)
+	new /obj/item/ammo_box/magazine/gar/empty(src)
+
+/obj/item/storage/guncase/bulldog
+/obj/item/storage/guncase/bulldog/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/automatic/bulldog/no_mag(src)
+	new /obj/item/ammo_box/magazine/m12g_bulldog/empty(src)
+	new /obj/item/ammo_box/magazine/m12g_bulldog/empty(src)
+
+/obj/item/ammo_box/magazine/m12g_bulldog/empty
+	start_empty = TRUE
+
+/obj/item/storage/guncase/bulldog/inteq
+/obj/item/storage/guncase/bulldog/inteq/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag(src)
+	new /obj/item/ammo_box/magazine/m12g_bulldog/empty(src)
+	new /obj/item/ammo_box/magazine/m12g_bulldog/empty(src)
+
+/obj/item/storage/guncase/skm_carabine
+/obj/item/storage/guncase/skm_carabine/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/no_mag(src)
+	new /obj/item/ammo_box/magazine/smgm10mm/empty(src)
+	new /obj/item/ammo_box/magazine/smgm10mm/empty(src)
+
+/obj/item/ammo_box/magazine/smgm10mm/empty
+	start_empty = TRUE
+
+/obj/item/storage/pistolcase/commander/inteq
+/obj/item/storage/pistolcase/commander/inteq/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag(src)
+	new /obj/item/ammo_box/magazine/co9mm/empty(src)
+	new /obj/item/ammo_box/magazine/co9mm/empty(src)
+
+/obj/item/storage/pistolcase/deagle
+/obj/item/storage/pistolcase/deagle/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/deagle/no_mag(src)
+	new /obj/item/ammo_box/magazine/m50/empty(src)
+	new /obj/item/ammo_box/magazine/m50/empty(src)
+
+/obj/item/ammo_box/magazine/m50/empty
+	start_empty = TRUE
+
+/obj/item/storage/guncase/hydra
+/obj/item/storage/guncase/hydra/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/assault/hydra/no_mag(src)
+	new /obj/item/ammo_box/magazine/m556_42_hydra/empty(src)
+	new /obj/item/ammo_box/magazine/m556_42_hydra/empty(src)
+
+/obj/item/ammo_box/magazine/m556_42_hydra/empty
+	start_empty = TRUE
+
+

mod_celadon/outpost_console/code/supply_pack.dm

@@ -3,3 +3,31 @@
 	group = "Faction products"
 	faction = ""
 	hidden = TRUE
+
+// Делаем красиво? Наверное? По крайней мере экономим буквы, чтобы не писать в каждом датуме эти вещи!
+
+/datum/supply_pack/faction/syndicate
+	hidden = FALSE
+	faction = "syndicate"
+	crate_type = /obj/structure/closet/crate/secure/gear/syndicate
+
+/datum/supply_pack/faction/solfed
+	hidden = FALSE
+	faction = "solfed"
+	crate_type = /obj/structure/closet/crate/secure/gear/solFed
+
+/datum/supply_pack/faction/inteq
+	hidden = FALSE
+	faction = "inteq"
+	crate_type = /obj/structure/closet/crate/secure/gear/inteq
+
+// Создаём ещё одну степень защиты от нежелательного доступа в карго
+
+/obj/structure/closet/crate/secure/gear/syndicate
+	req_access = list(ACCESS_OUTPOST_FACTION_SYNDICATE)
+
+/obj/structure/closet/crate/secure/gear/solFed
+	req_access = list(ACCESS_OUTPOST_FACTION_SOLFED)
+
+/obj/structure/closet/crate/secure/gear/inteq
+	req_access = list(ACCESS_OUTPOST_FACTION_INTEQ)

mod_celadon/outpost_console/code/supply_pack/inteq.dm

@@ -1,27 +1,37 @@
-/datum/supply_pack/faction/inteq/skm_carbine
-	hidden = FALSE
+/datum/supply_pack/faction/inteq/gun // Пушки
+	group = "Faction gun"
+
+/datum/supply_pack/faction/inteq/gun/skm_carbine
 	name = "SKM-44v Mongrel"
 	desc = "Inteq SMG"
-	contains = list(/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq)
+	contains = list(/obj/item/storage/guncase/skm_carabine)
 	cost = 1200
-	faction = "inteq"
 	crate_type = /obj/structure/closet/crate/secure/gear
 
-/datum/supply_pack/faction/inteq/hardsuit
-	hidden = FALSE
+/datum/supply_pack/faction/inteq/gun/bulldog
+	name = "Bulldog Shotgun"
+	desc = "Automatic Shotgun"
+	contains = list(/obj/item/storage/guncase/bulldog/inteq)
+	cost = 3000
+
+/datum/supply_pack/faction/inteq/gun/commanders
+	name = "Commander Pistol Crate"
+	desc = "Contains a modified Candor 'Commander' pistol, produced by InteQ and chambered in 9mm."
+	cost = 750
+	contains = list(/obj/item/storage/pistolcase/commander/inteq)
+
+/datum/supply_pack/faction/inteq/clothing // Одежда
+	group = "Faction clothing"
+
+/datum/supply_pack/faction/inteq/clothing/hardsuit
 	name = "InteQ hardsuit"
 	desc = "Made by InteQ"
 	contains = list(/obj/item/clothing/suit/space/hardsuit/syndi)
 	cost = 2000
-	faction = "inteq"
-	crate_type = /obj/structure/closet/crate/secure/gear
 
-/datum/supply_pack/faction/inteq/spacesuit
-	hidden = FALSE
+/datum/supply_pack/faction/inteq/clothing/spacesuit
 	name = "InteQ spacesuit"
 	desc = "Made by InteQ"
 	contains = list(/obj/item/clothing/suit/space/inteq,
 					/obj/item/clothing/suit/space/hardsuit/security/independent/inteq)
 	cost = 2000
-	faction = "inteq"
-	crate_type = /obj/structure/closet/crate/secure/gear

mod_celadon/outpost_console/code/supply_pack/solfed.dm

@@ -1,17 +1,30 @@
-/datum/supply_pack/faction/solfed/gar
-	hidden = FALSE
+/datum/supply_pack/faction/solfed/gun // Пушки
+	group = "Faction gun"
+
+/datum/supply_pack/faction/solfed/gun/gar
 	name = "Solar 'GAR' Carbine"
 	desc = "Something on Gauss"
-	contains = list(/obj/item/gun/ballistic/automatic/powered/gauss/gar)
-	cost = 1000
-	faction = "solfed"
-	crate_type = /obj/structure/closet/crate/secure/gear
+	contains = list(/obj/item/storage/guncase/gauss)
+	cost = 2500
+
+/datum/supply_pack/faction/solfed/gun/commanders
+	name = "Commander Pistol Crate"
+	desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
+	cost = 750
+	contains = list(/obj/item/storage/pistolcase/commander)
 
-/datum/supply_pack/faction/solfed/hardsuit
-	hidden = FALSE
+/datum/supply_pack/faction/solfed/clothing // Одежда
+	group = "Faction clothing"
+
+/datum/supply_pack/faction/solfed/clothing/hardsuit
 	name = "SolFed hardsuit"
 	desc = "Made in Solar Federation"
 	contains = list(/obj/item/clothing/suit/space/hardsuit/solgov)
 	cost = 2000
-	faction = "solfed"
-	crate_type = /obj/structure/closet/crate/secure/gear
+
+/datum/supply_pack/faction/solfed/clothing/med_hardsuit
+	name = "Medical Hardsuit Crate"
+	desc = "One medical hardsuit, resistant to diseases and useful for retrieving patients in space."
+	cost = 1500
+	contains = list(/obj/item/clothing/suit/space/hardsuit/medical)
+	crate_name = "medical hardsuit crate"