Merge branch 'beta-dev' into ipc_hair

Signed-off-by: Feenie <62373791+FeenieRU@users.noreply.github.com>

_maps/_mod_celadon/configs/inteq_valor.json

@@ -21,7 +21,7 @@
 			"slots": 1
 		},
 		"Honorable Corpsman": {
-			"outfit": "/datum/outfit/job/inteq/paramedic/celadon",
+			"outfit": "/datum/outfit/job/inteq/cmo/celadon",
 			"officer": true,
 			"slots": 1
 		},

_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm

@@ -2983,9 +2983,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{
-	dir = 1
-	},
 /obj/machinery/power/terminal{
 	dir = 4
 	},
@@ -2996,6 +2993,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1,
+/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Hu" = (
@@ -3930,13 +3930,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/trinary/filter/atmos/o2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1,
+/obj/machinery/atmospherics/components/trinary/filter/atmos/n2,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Sg" = (

_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm

@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aq" = (
 /obj/machinery/door/airlock/highsecurity{
-	req_access = "3,20";
+	req_access = "8485";
 	name = "Armory"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -121,7 +121,7 @@
 	can_be_unanchored = 1;
 	icon_state = "warden";
 	name = "master at arms' locker";
-	req_access_txt = "3"
+	req_access_txt = "8485"
 	},
 /obj/item/clothing/shoes/combat,
 /obj/item/megaphone/sec,
@@ -858,7 +858,7 @@
 	pixel_x = -19;
 	pixel_y = 9;
 	dir = 4;
-	req_access_txt = "3,20"
+	req_access_txt = "8485"
 	},
 /obj/effect/turf_decal/industrial/traffic/fulltile,
 /obj/effect/turf_decal/industrial/traffic/corner{
@@ -1109,7 +1109,7 @@
 	pixel_x = 18;
 	pixel_y = 9;
 	dir = 8;
-	req_access_txt = "3,20"
+	req_access_txt = "8485"
 	},
 /obj/effect/turf_decal/industrial/traffic/corner{
 	dir = 4
@@ -1368,7 +1368,7 @@
 	can_be_unanchored = 1;
 	icon_state = "brig_phys";
 	name = "equipment locker";
-	req_access_txt = "1"
+	req_access_txt = "8484"
 	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
@@ -1432,7 +1432,7 @@
 "oQ" = (
 /obj/machinery/door/airlock/command{
 	name = "Bridge";
-	req_access_txt = "20"
+	req_access_txt = "8486"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -2268,7 +2268,7 @@
 /obj/machinery/door/airlock/command{
 	dir = 4;
 	name = "Bridge";
-	req_access_txt = "20"
+	req_access_txt = "8486"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3187,7 +3187,7 @@
 "Ob" = (
 /obj/machinery/door/window/northleft{
 	dir = 4;
-	req_access_txt = "3"
+	req_access_txt = "8485"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -4017,7 +4017,8 @@
 	id = "exec_armorysh";
 	name = "Armory shuters";
 	pixel_x = 6;
-	pixel_y = 25
+	pixel_y = 25;
+	req_access_txt = "8485"
 	},
 /obj/machinery/turretid{
 	pixel_y = 34

_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm

@@ -726,7 +726,7 @@
 /obj/item/storage/belt/utility/full/engi,
 /obj/item/clothing/glasses/meson/engine,
 /obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/color/yellow,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "dD" = (
@@ -7587,7 +7587,7 @@
 /obj/item/clothing/glasses/meson/engine,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/holosign_creator/atmos,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/color/yellow,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "WZ" = (

_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm

@@ -167,6 +167,11 @@
 /obj/effect/turf_decal/corner_techfloor_gray{
 	dir = 6
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = 9
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "dV" = (
@@ -223,8 +228,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 25;
-	pixel_y = 7
+	pixel_x = 21;
+	pixel_y = 10
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/storage/eva)
@@ -376,15 +381,6 @@
 "ih" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/maintenance/port)
-"iw" = (
-/obj/machinery/button/door{
-	id = "hound_windows";
-	name = "Window Lockdown";
-	pixel_x = -6;
-	pixel_y = 25
-	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
 "jb" = (
 /obj/structure/table,
 /obj/effect/turf_decal/corner/opaque/yellow,
@@ -1111,13 +1107,16 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "wu" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/advanced_airlock_controller{
 	pixel_x = 25;
 	req_access = null
 	},
 /obj/machinery/light/small/directional/south,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/tank/internals/oxygen/yellow,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage/eva)
 "wX" = (
@@ -1407,6 +1406,11 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/corner_techfloor_gray/diagonal,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = -10
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "EE" = (
@@ -2877,7 +2881,7 @@ pe
 HV
 KK
 BQ
-iw
+pe
 ib
 ib
 ib

_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm

@@ -187,6 +187,9 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/item/radio/intercom/wideband/directional/south{
+	pixel_x = -3
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pu" = (
@@ -646,7 +649,9 @@
 	id = "venture_front"
 	},
 /obj/docking_port/mobile{
-	dir = 8
+	dir = 4;
+	port_direction = 2;
+	preferred_direction = 4
 	},
 /obj/machinery/power/shieldwallgen/atmos{
 	id = "venture_exit";

_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm

@@ -191,7 +191,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/effect/landmark/start/shaft_miner,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "dA" = (
@@ -613,7 +612,6 @@
 	},
 /obj/structure/chair/stool,
 /obj/structure/window/reinforced/tinted/frosted,
-/obj/effect/landmark/start/captain,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "mL" = (
@@ -1002,7 +1000,6 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/effect/landmark/start/shaft_miner,
 /obj/effect/turf_decal/corner_techfloor_grid{
 	dir = 1
 	},
@@ -1062,7 +1059,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/chair/sofa/brown/left/directional/south,
-/obj/effect/landmark/start/assistant,
 /turf/open/floor/carpet/red,
 /area/ship/crew)
 "rR" = (
@@ -1248,7 +1244,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "vi" = (
-/obj/structure/table,
 /obj/item/toy/cards/deck/syndicate{
 	pixel_y = 6
 	},
@@ -1261,6 +1256,7 @@
 	pixel_y = -1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/table,
 /turf/open/floor/carpet/red,
 /area/ship/crew)
 "vv" = (
@@ -1360,7 +1356,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/effect/landmark/start/station_engineer,
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "xK" = (
@@ -1679,10 +1674,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
-"BG" = (
-/obj/machinery/porta_turret/ship/faction/syndicate/ballistic,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
 "BR" = (
 /obj/machinery/porta_turret/ship/faction/syndicate/ballistic{
 	dir = 1
@@ -1944,7 +1935,6 @@
 /turf/open/floor/carpet/red,
 /area/ship/crew/dorm)
 "Gj" = (
-/obj/structure/chair/sofa/brown/corner/directional/east,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -1956,6 +1946,7 @@
 	pixel_y = 12;
 	dir = 4
 	},
+/obj/structure/chair/sofa/brown/corner/directional/east,
 /turf/open/floor/carpet/red,
 /area/ship/crew)
 "Gm" = (
@@ -2005,7 +1996,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/effect/landmark/start/chief_engineer,
 /turf/open/floor/carpet/red,
 /area/ship/cargo/office)
 "Ic" = (
@@ -2797,13 +2787,11 @@
 /area/ship/hallway/central)
 "Tq" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/sofa/brown/right/directional/east,
-/obj/effect/landmark/start/assistant,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/extinguisher_cabinet/directional/west,
 /obj/machinery/newscaster/directional/west{
 	pixel_y = 12
 	},
+/obj/structure/chair/sofa/brown/right/directional/east,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/carpet/red,
 /area/ship/crew)
 "Tu" = (
@@ -3369,7 +3357,7 @@ iT
 iT
 iT
 jt
-BG
+NA
 jI
 cH
 jI

code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm

@@ -812,7 +812,10 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
 
 /obj/item/gun/ballistic/automatic/assault/hydra/dmr/Initialize()
 	. = ..()
-	magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/small(src)
+	// [CELADON-EDIT] -- CELADON_FIXES -- фиксим неподходящий магазин (вагабага дырдырдыр)
+	// magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/small(src)
+	magazine = new mag_type(src)
+	// [/CELADON-EDIT]
 	chamber_round()
 
 

mod_celadon/cargo_items/code/ammunition.dm

@@ -9,3 +9,21 @@
 	desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration"
 	contains = list(/obj/item/ammo_box/a858)
 	cost = 500
+
+/datum/supply_pack/ammo/a410_buckshot
+	name = "410x76mm Buckshot Clip"
+	desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль."
+	contains = list(/obj/item/ammo_box/a410_ammo_box)
+	cost = 1000
+
+/datum/supply_pack/ammo/a410_slug
+	name = "410x76mm Slug Clip"
+	desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль."
+	contains = list(/obj/item/ammo_box/a410_slug_ammo_box)
+	cost = 1500
+
+/datum/supply_pack/ammo/a410_flechette
+	name = "410x76mm Flechette Clip"
+	desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль."
+	contains = list(/obj/item/ammo_box/a410_flechette_ammo_box)
+	cost = 1500