From a76f27780c360bf7afbe88e46e53b3eec196914d Mon Sep 17 00:00:00 2001
From: RonninNiko <84266898+RonninNiko@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:11:20 +0300
Subject: [PATCH] Kau,Kansatsu,Executer rebalance (#446)

* QF of ships

* Kau balance fix
---
 .../shuttles/inteq/inteq_executer.dmm         |  58 ++++-----
 .../syndicate/syndicate_cybersun_kansatsu.dmm |   1 +
 .../syndicate/syndicate_kau_delta.dmm         | 114 +++++++++++++-----
 3 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
index e5909282e3e8..62599448d06d 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
+++ b/_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 = list(20);
+	req_access = "3,20";
 	name = "Armory"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -592,6 +592,9 @@
 	icon_state = "2-4";
 	tag = null
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "gB" = (
@@ -989,6 +992,7 @@
 /obj/machinery/light/directional/south,
 /obj/item/reagent_containers/blood/universal,
 /obj/item/reagent_containers/blood/universal,
+/obj/item/reagent_containers/blood/universal,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "kx" = (
@@ -1049,18 +1053,10 @@
 	pixel_y = 11;
 	pixel_x = 3
 	},
-/obj/item/storage/firstaid/toxin{
-	pixel_y = 7;
-	pixel_x = 3
-	},
 /obj/item/storage/firstaid/advanced{
 	pixel_y = 3;
 	pixel_x = 3
 	},
-/obj/item/storage/firstaid/advanced{
-	pixel_y = -1;
-	pixel_x = 3
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -1137,7 +1133,9 @@
 /area/ship/cargo)
 "ml" = (
 /obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/medical,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/mask/gas/sechailer,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "ms" = (
@@ -1231,7 +1229,6 @@
 	},
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/shoes/combat,
-/obj/item/shield/riot/tele,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/military/assault,
 /obj/item/clothing/gloves/tackler/combat/insulated,
@@ -1240,7 +1237,6 @@
 /obj/item/clothing/suit/poncho,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/gun/energy/e_gun/adv_stopping,
-/obj/item/areaeditor/shuttle,
 /obj/item/stock_parts/cell/gun/upgraded,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -1363,8 +1359,6 @@
 	name = "equipment locker";
 	req_access_txt = "1"
 	},
-/obj/item/clothing/accessory/holster,
-/obj/item/clothing/accessory/holster,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "op" = (
@@ -1422,13 +1416,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/machinery/power/ship_gravity,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/fore)
 "oQ" = (
 /obj/machinery/door/airlock/command{
 	name = "Bridge";
-	req_access_txt = "19"
+	req_access_txt = "20"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -1591,9 +1584,14 @@
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "ri" = (
-/obj/machinery/vending/engineering,
 /obj/machinery/light/directional/north,
 /obj/machinery/camera/autoname,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2";
+	pixel_y = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "rp" = (
@@ -2253,7 +2251,7 @@
 /obj/machinery/door/airlock/command{
 	dir = 4;
 	name = "Bridge";
-	req_access_txt = "19"
+	req_access_txt = "20"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -2270,8 +2268,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "AW" = (
-/obj/structure/tank_dispenser,
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Bj" = (
@@ -2637,7 +2635,6 @@
 	pixel_x = 22;
 	pixel_y = -3
 	},
-/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "HR" = (
@@ -2774,10 +2771,10 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Jt" = (
-/obj/item/clothing/suit/radiation/space,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/head/radiation/space,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/fore)
 "JC" = (
@@ -2895,7 +2892,6 @@
 /obj/structure/closet/cardboard,
 /obj/effect/spawner/lootdrop/maintenance/seven,
 /obj/effect/spawner/lootdrop/gloves,
-/obj/effect/spawner/lootdrop/materials,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "KL" = (
@@ -2941,7 +2937,7 @@
 	req_access_txt = "1"
 	},
 /obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
+/obj/item/clothing/accessory/holster,
 /obj/item/melee/baton/loaded,
 /obj/item/melee/classic_baton,
 /obj/item/melee/classic_baton,
@@ -2957,10 +2953,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/item/clothing/accessory/holster,
-/obj/item/clothing/accessory/holster,
-/obj/item/clothing/accessory/holster,
-/obj/item/clothing/accessory/holster,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Lt" = (
@@ -3360,7 +3352,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "QW" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "QX" = (
@@ -3602,7 +3593,6 @@
 /area/ship/engineering)
 "TQ" = (
 /obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop/maintenance/three,
 /obj/effect/spawner/lootdrop/maintenance/six,
 /obj/structure/sign/poster/official/help_others{
 	pixel_x = 32
@@ -3734,8 +3724,10 @@
 /area/ship/maintenance/starboard)
 "VV" = (
 /obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/medical,
 /obj/machinery/camera/autoname,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/mask/gas/sechailer,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
 "Wd" = (
@@ -3959,7 +3951,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Yo" = (
-/obj/machinery/vending/engivend,
+/obj/machinery/vending/tool,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "YF" = (
@@ -4078,8 +4070,8 @@
 /area/ship/cargo)
 "ZQ" = (
 /obj/structure/railing,
-/obj/structure/tank_dispenser,
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "ZW" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index f6c6499f8eeb..86049fbbb2ed 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -372,6 +372,7 @@
 	},
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/mapping_helpers/airlock/locked,
 /turf/open/floor/plasteel/white,
 /area/ship/engineering)
 "hJ" = (
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
index 8c5d0621e7a0..6ca24aedbc20 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
@@ -123,10 +123,10 @@
 /area/ship/cargo/port)
 "cY" = (
 /obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/syndi/elite,
 /obj/item/tank/jetpack/oxygen/security{
 	name = "Suspicious looking jetpack (oxygen)"
 	},
+/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "dg" = (
@@ -298,6 +298,7 @@
 /obj/effect/turf_decal/spline/plain/opaque/syndiered,
 /obj/item/storage/backpack/duffelbag/syndie,
 /obj/item/storage/backpack/duffelbag/syndie,
+/obj/item/storage/backpack/duffelbag/syndie,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "ge" = (
@@ -310,6 +311,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "gn" = (
@@ -403,7 +407,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
-/obj/item/storage/firstaid/regular,
 /obj/effect/spawner/lootdrop/maintenance/six,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo/port)
@@ -596,6 +599,9 @@
 	pixel_x = 8;
 	pixel_y = 15
 	},
+/obj/item/coin/antagtoken{
+	pixel_x = -7
+	},
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "lX" = (
@@ -618,9 +624,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "nm" = (
@@ -648,7 +652,6 @@
 	},
 /obj/machinery/light/directional/south,
 /obj/machinery/rnd/production/techfab/department/security,
-/obj/item/modular_computer/laptop/preset/civilian,
 /obj/item/toy/plush/nukeplushie{
 	pixel_x = 6;
 	pixel_y = 7
@@ -733,12 +736,27 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "pL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
-/obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/circuit/red/off,
 /area/ship/engineering)
+"qm" = (
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/docking_port/mobile{
+	launch_status = 0;
+	port_direction = 4;
+	preferred_direction = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/engineering)
 "qu" = (
 /obj/effect/turf_decal/industrial/stand_clear/red{
 	dir = 8
@@ -764,6 +782,9 @@
 	},
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/machinery/light/directional/east,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/circuit/red/off,
 /area/ship/engineering)
 "qT" = (
@@ -1105,11 +1126,6 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
-/obj/docking_port/mobile{
-	launch_status = 0;
-	port_direction = 4;
-	preferred_direction = 4
-	},
 /obj/effect/turf_decal/industrial/fire,
 /obj/effect/turf_decal/industrial/fire{
 	dir = 1
@@ -1224,7 +1240,6 @@
 /obj/effect/turf_decal/spline/plain/opaque/syndiered{
 	dir = 8
 	},
-/obj/machinery/power/ship_gravity,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/port)
 "Ay" = (
@@ -1306,7 +1321,7 @@
 /area/ship/crew/dorm)
 "BC" = (
 /obj/item/gun/ballistic/automatic/smg/vector{
-	projectile_damage_multiplier = 1.5;
+	projectile_damage_multiplier = 1.35;
 	name = "Suspicious Vector carbine";
 	desc = "A police carbine based on a pre-Night of Fire SMG design. Most of the complex workings have been removed for reliability. Chambered in .45 ACP. Has been modified to suit syndicate needs.";
 	wield_slowdown = 0.25;
@@ -1325,7 +1340,6 @@
 /obj/item/codespeak_manual/unlimited,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/reagent_containers/hypospray/combat/nanites,
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "BW" = (
@@ -1400,7 +1414,6 @@
 	name = "ammo locker"
 	},
 /obj/item/storage/backpack/duffelbag/syndie/ammo/smg,
-/obj/item/storage/backpack/duffelbag/syndie/ammo/smg,
 /obj/item/ammo_box/magazine/m12g,
 /obj/item/ammo_box/magazine/m12g,
 /turf/open/floor/mineral/plastitanium/red,
@@ -1423,6 +1436,13 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo/port)
+"DT" = (
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = 27
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/circuit/red/off,
+/area/ship/engineering)
 "DX" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/central)
@@ -1491,6 +1511,7 @@
 	pixel_x = 7;
 	color = "#730622"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "EY" = (
@@ -1520,6 +1541,10 @@
 	},
 /obj/item/stack/sheet/mineral/plasma/twenty,
 /obj/item/storage/toolbox/electrical,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Fz" = (
@@ -1550,7 +1575,7 @@
 /obj/effect/turf_decal/spline/plain/opaque/syndiered{
 	dir = 9
 	},
-/obj/structure/closet/crate/secure/loot,
+/obj/structure/crate_shelf,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Gb" = (
@@ -1745,6 +1770,13 @@
 /obj/effect/turf_decal/corner/opaque/syndiered{
 	dir = 1
 	},
+/obj/structure/closet/wall/white{
+	dir = 4;
+	name = "Medical Supplies";
+	pixel_x = 32
+	},
+/obj/item/roller,
+/obj/item/modular_computer/laptop/preset/civilian,
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "KQ" = (
@@ -1864,7 +1896,7 @@
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/external)
 "Mc" = (
 /obj/machinery/door/poddoor{
@@ -1894,7 +1926,7 @@
 /obj/machinery/atmospherics/components/binary/pump/on/layer2{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/binary/pump/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "MD" = (
@@ -2028,6 +2060,9 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Ot" = (
@@ -2083,7 +2118,7 @@
 	name = "Captain Error";
 	desc = "An adorable mothperson plushy. It's a BUG! Just like whole build might need some fixes"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/external)
 "Pm" = (
 /obj/effect/decal/cleanable/blood/gibs/down,
@@ -2145,6 +2180,10 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"QE" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
 "QM" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -2196,6 +2235,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"QY" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
 "Rj" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 10
@@ -2265,6 +2310,13 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/dorm)
+"Ss" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+	dir = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/circuit/red/off,
+/area/ship/engineering)
 "SE" = (
 /obj/effect/turf_decal/corner/opaque/syndiered/border{
 	dir = 1
@@ -2541,9 +2593,6 @@
 "ZM" = (
 /obj/machinery/airalarm/directional/north,
 /obj/structure/table/glass,
-/obj/structure/sign/poster/syndicate/random{
-	pixel_x = 32
-	},
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
@@ -2553,6 +2602,9 @@
 /obj/item/storage/backpack/duffelbag/sec/surgery{
 	pixel_y = 5
 	},
+/obj/structure/sign/poster/contraband/cybersun_med{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "ZX" = (
@@ -2674,7 +2726,7 @@ QM
 eS
 CX
 CX
-Ct
+QY
 op
 op
 jv
@@ -2694,8 +2746,8 @@ eS
 QM
 QM
 wv
-op
-op
+DT
+qm
 jv
 jv
 "}
@@ -2713,8 +2765,8 @@ dB
 Oj
 EC
 pL
-op
-op
+Ss
+QE
 jv
 jv
 "}
@@ -2732,7 +2784,7 @@ en
 lX
 Mk
 qJ
-op
+eS
 op
 jv
 jv