diff --git a/_maps/configs/hard_prison_pod.json b/_maps/configs/hard_prison_pod.json
new file mode 100644
index 0000000000000..f9c28faacb1ba
--- /dev/null
+++ b/_maps/configs/hard_prison_pod.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+ "map_name": "Hard prison pod",
+ "map_short_name": "HPP-class",
+ "map_path": "_maps/shuttles/independent/hard_prison_pod.dmm",
+ "prefix": "SV",
+ "description": " Is it a ship? Oh no...it seems pod.",
+ "tags": ["Soloship"],
+ "namelists": [
+ "SPACE",
+ "NATURAL"
+ ],
+ "limit": 1,
+ "job_slots": {
+ "Prisoner": {
+ "outfit": "/datum/outfit/job/prisoner",
+ "slots": 1
+ }
+ },
+ "enabled": true
+}
diff --git a/_maps/configs/independent_acron.json b/_maps/configs/independent_acron.json
new file mode 100644
index 0000000000000..a9de85f444ae6
--- /dev/null
+++ b/_maps/configs/independent_acron.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+ "map_name": "Acron-class Mercenary Ship",
+ "prefix": "ISV",
+ "description": "Специальный корабль особого назначения клана Паука для выполнения узконаправленных задач.",
+ "tags": [
+ "Боевой",
+ "Медицинский"
+ ],
+ "namelists": [
+ "GENERAL"
+ ],
+ "map_short_name": "Acron-class",
+ "map_path": "_maps/shuttles/independent/independent_acron.dmm",
+ "limit": 1,
+ "job_slots": {
+ "Space Ninja": {
+ "outfit": "/datum/outfit/acron_ninja",
+ "slots": 2,
+ "officer": true
+ }
+ },
+ "enabled": true
+}
diff --git a/_maps/configs/independent_alone.json b/_maps/configs/independent_alone.json
new file mode 100644
index 0000000000000..6ea29f06c3302
--- /dev/null
+++ b/_maps/configs/independent_alone.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+ "map_name": "Alone ship",
+ "map_short_name": "Alone",
+ "map_path": "_maps/shuttles/independent/independent_alone.dmm",
+ "prefix": "ISV",
+ "description": "A budget ship designed for seasoned space explorers...",
+ "tags": [
+ "Soloship"
+ ],
+ "limit": 1,
+ "namelists": [
+ "SPACE",
+ "MYTHOLOGICAL"
+ ],
+ "job_slots": {
+ "Loner": {
+ "outfit": "/datum/outfit/job/hermit",
+ "officer": true,
+ "slots": 1
+ }
+ },
+ "enabled": true
+}
diff --git a/_maps/configs/independent_omega.json b/_maps/configs/independent_omega.json
new file mode 100644
index 0000000000000..b36227d0d53b1
--- /dev/null
+++ b/_maps/configs/independent_omega.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+ "map_name": "Omega-class Personal Shuttle",
+ "map_short_name": "Omega-class",
+ "description": "The Omega is the sports car of space...",
+ "tags": [
+ "Generalist"
+ ],
+ "limit": 1,
+ "prefix": "ISV",
+ "namelists": [
+ "MYTHOLOGICAL",
+ "NATURAL"
+ ],
+ "map_path": "_maps/shuttles/independent/independent_omega.dmm",
+ "job_slots": {
+ "Loner": {
+ "outfit": "/datum/outfit/job/prison",
+ "officer": true,
+ "slots": 1
+ }
+ },
+ "enabled": true
+}
diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
index 06a1358c3e957..beeb918e1bcbb 100644
--- a/_maps/configs/inteq_colossus.json
+++ b/_maps/configs/inteq_colossus.json
@@ -18,29 +18,29 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/captain/inteq/naked",
+ "outfit": "/datum/outfit/job/captain/inteq/naked/cardacces",
"officer": true,
"slots": 1
},
"Master At Arms": {
- "outfit": "/datum/outfit/job/warden/inteq",
+ "outfit": "/datum/outfit/job/warden/inteq/cardacces",
"officer": true,
"slots": 1
},
"Artificer": {
- "outfit": "/datum/outfit/job/engineer/inteq",
+ "outfit": "/datum/outfit/job/engineer/inteq/cardacces",
"slots": 1
},
"Corpsman": {
- "outfit": "/datum/outfit/job/paramedic/inteq",
+ "outfit": "/datum/outfit/job/paramedic/inteq/cardacces",
"slots": 1
},
"Enforcer": {
- "outfit": "/datum/outfit/job/security/inteq",
+ "outfit": "/datum/outfit/job/security/inteq/cardacces",
"slots": 3
},
"Recruit": {
- "outfit": "/datum/outfit/job/assistant/inteq",
+ "outfit": "/datum/outfit/job/assistant/inteq/cardacces",
"slots": 5
}
},
diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json
index 80e8349de9ece..92fa4a2d4f00d 100644
--- a/_maps/configs/inteq_hound.json
+++ b/_maps/configs/inteq_hound.json
@@ -17,16 +17,16 @@
"limit": 2,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/captain/inteq/naked",
+ "outfit": "/datum/outfit/job/captain/inteq/naked/cardacces",
"officer": true,
"slots": 1
},
"Enforcer": {
- "outfit": "/datum/outfit/job/security/inteq",
+ "outfit": "/datum/outfit/job/security/inteq/cardacces",
"slots": 3
},
"Recruit": {
- "outfit": "/datum/outfit/job/assistant/inteq",
+ "outfit": "/datum/outfit/job/assistant/inteq/cardacces",
"slots": 3
}
},
diff --git a/_maps/configs/inteq_iron_maiden.json b/_maps/configs/inteq_iron_maiden.json
index 964a9417946d7..30206e8c2b1fc 100644
--- a/_maps/configs/inteq_iron_maiden.json
+++ b/_maps/configs/inteq_iron_maiden.json
@@ -18,25 +18,25 @@
"limit": 2,
"job_slots": {
"Капитан-лейтенант INTEQ": {
- "outfit": "/datum/outfit/job/captain/inteq/naked",
+ "outfit": "/datum/outfit/job/captain/inteq/naked/cardacces",
"officer": true,
"slots": 1
},
"Первый лейтенант INTEQ": {
- "outfit": "/datum/outfit/job/warden/inteq",
+ "outfit": "/datum/outfit/job/warden/inteq/cardacces",
"officer": true,
"slots": 1
},
"Военный инженер INTEQ": {
- "outfit": "/datum/outfit/job/engineer/inteq",
+ "outfit": "/datum/outfit/job/engineer/inteq/cardacces",
"slots": 1
},
"Полевой Медик INTEQ": {
- "outfit": "/datum/outfit/job/paramedic/inteq",
+ "outfit": "/datum/outfit/job/paramedic/inteq/cardacces",
"slots": 1
},
"Штурмовик INTEQ": {
- "outfit": "/datum/outfit/job/security/inteq",
+ "outfit": "/datum/outfit/job/security/inteq/cardacces",
"slots": 4
}
},
diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
index c298846d55b01..0034f7bfa46b3 100644
--- a/_maps/configs/inteq_talos.json
+++ b/_maps/configs/inteq_talos.json
@@ -18,34 +18,34 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/captain/inteq",
+ "outfit": "/datum/outfit/job/captain/inteq/cardacces",
"officer": true,
"slots": 1
},
"Master At Arms": {
- "outfit": "/datum/outfit/job/warden/inteq",
+ "outfit": "/datum/outfit/job/warden/inteq/cardacces",
"officer": true,
"slots": 1
},
"Artificer Class II": {
- "outfit": "/datum/outfit/job/ce/inteq",
+ "outfit": "/datum/outfit/job/ce/inteq/cardacces",
"officer": true,
"slots": 1
},
"Artificer": {
- "outfit": "/datum/outfit/job/engineer/inteq",
+ "outfit": "/datum/outfit/job/engineer/inteq/cardacces",
"slots": 3
},
"Corpsman": {
- "outfit": "/datum/outfit/job/paramedic/inteq",
+ "outfit": "/datum/outfit/job/paramedic/inteq/cardacces",
"slots": 2
},
"Enforcer": {
- "outfit": "/datum/outfit/job/security/inteq",
+ "outfit": "/datum/outfit/job/security/inteq/cardacces",
"slots": 1
},
"Recruit": {
- "outfit": "/datum/outfit/job/assistant/inteq",
+ "outfit": "/datum/outfit/job/assistant/inteq/cardacces",
"slots": 4
}
},
diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
index 72b2ae65d257c..40a7921a4ce5e 100644
--- a/_maps/configs/inteq_vaquero.json
+++ b/_maps/configs/inteq_vaquero.json
@@ -15,29 +15,29 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/captain/inteq/naked",
+ "outfit": "/datum/outfit/job/captain/inteq/naked/cardacces",
"officer": true,
"slots": 1
},
"Master At Arms": {
- "outfit": "/datum/outfit/job/warden/inteq",
+ "outfit": "/datum/outfit/job/warden/inteq/cardacces",
"officer": true,
"slots": 1
},
"Artificer": {
- "outfit": "/datum/outfit/job/engineer/inteq",
+ "outfit": "/datum/outfit/job/engineer/inteq/cardacces",
"slots": 1
},
"Corpsman": {
- "outfit": "/datum/outfit/job/paramedic/inteq",
+ "outfit": "/datum/outfit/job/paramedic/inteq/cardacces",
"slots": 1
},
"Enforcer": {
- "outfit": "/datum/outfit/job/security/inteq",
+ "outfit": "/datum/outfit/job/security/inteq/cardacces",
"slots": 1
},
"Recruit": {
- "outfit": "/datum/outfit/job/assistant/inteq",
+ "outfit": "/datum/outfit/job/assistant/inteq/cardacces",
"slots": 2
}
},
diff --git a/_maps/shuttles/independent/hard_prison_pod.dmm b/_maps/shuttles/independent/hard_prison_pod.dmm
new file mode 100644
index 0000000000000..8cb24f48d996a
--- /dev/null
+++ b/_maps/shuttles/independent/hard_prison_pod.dmm
@@ -0,0 +1,220 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"b" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/window/reinforced/spawner,
+/obj/structure/window/reinforced/spawner{
+ dir = 8
+ },
+/obj/item/wrench,
+/turf/open/floor/pod,
+/area/ship/bridge)
+"c" = (
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"g" = (
+/obj/structure/window/reinforced/spawner{
+ dir = 1
+ },
+/obj/structure/fans/tiny,
+/obj/machinery/door/window{
+ dir = 8
+ },
+/obj/machinery/door/window/eastright,
+/obj/docking_port/mobile{
+ can_move_docking_ports = 1;
+ dir = 4;
+ launch_status = 0;
+ port_direction = 2;
+ preferred_direction = 4
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"i" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/holopad/emergency,
+/turf/open/floor/pod,
+/area/ship/bridge)
+"p" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 4
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"s" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light_switch{
+ pixel_x = -13;
+ pixel_y = 23
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/pod,
+/area/ship/bridge)
+"u" = (
+/obj/structure/window/reinforced/spawner{
+ dir = 4
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"v" = (
+/turf/closed/wall,
+/area/ship/bridge)
+"z" = (
+/obj/machinery/cryopod{
+ dir = 1;
+ density = 0
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"G" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/closet/wall{
+ pixel_y = 28
+ },
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/firstaid/ancient,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/plants,
+/obj/item/stack/cable_coil/red,
+/obj/item/extinguisher/mini,
+/obj/item/reagent_containers/pill/charcoal,
+/obj/item/reagent_containers/pill/charcoal,
+/obj/item/reagent_containers/pill/charcoal,
+/turf/open/floor/pod,
+/area/ship/bridge)
+"I" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/pod,
+/area/ship/bridge)
+"L" = (
+/obj/machinery/power/shuttle/engine/electric/bad{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/engine/hull,
+/area/ship/bridge)
+"R" = (
+/obj/machinery/power/smes/shuttle/micro/precharged{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 8
+ },
+/turf/open/floor/pod,
+/area/ship/bridge)
+"V" = (
+/turf/open/floor/pod,
+/area/ship/bridge)
+"Y" = (
+/obj/structure/window/reinforced/spawner{
+ dir = 4
+ },
+/obj/item/pickaxe/rusted,
+/obj/item/kitchen/knife/shiv,
+/obj/item/hatchet,
+/obj/item/gps,
+/obj/item/flashlight/lantern,
+/obj/item/clothing/suit/space/fragile,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/head/helmet/space/fragile,
+/obj/structure/rack,
+/obj/item/radio,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/clothing/gloves/color/fyellow,
+/obj/item/tank/internals/oxygen,
+/turf/open/floor/pod,
+/area/ship/bridge)
+
+(1,1,1) = {"
+c
+c
+c
+c
+c
+"}
+(2,1,1) = {"
+v
+b
+L
+g
+v
+"}
+(3,1,1) = {"
+v
+G
+R
+V
+v
+"}
+(4,1,1) = {"
+v
+s
+a
+I
+v
+"}
+(5,1,1) = {"
+v
+f
+i
+z
+v
+"}
+(6,1,1) = {"
+v
+p
+u
+Y
+v
+"}
+(7,1,1) = {"
+v
+c
+c
+c
+v
+"}
diff --git a/_maps/shuttles/independent/independent_acron.dmm b/_maps/shuttles/independent/independent_acron.dmm
new file mode 100644
index 0000000000000..eff79b5e65a63
--- /dev/null
+++ b/_maps/shuttles/independent/independent_acron.dmm
@@ -0,0 +1,1093 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aU" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"bj" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 6;
+ faction = list("Space Ninja")
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"bJ" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -16
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"ck" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/camera/autoname{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"di" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "acron_holofield"
+ },
+/obj/machinery/door/poddoor{
+ id = "acron_cargo"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"dK" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"eb" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/machinery/door/poddoor{
+ id = "acron_eng";
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/engineering)
+"eH" = (
+/obj/machinery/camera/autoname,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"fm" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"fz" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"gs" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 5;
+ faction = list("Space Ninja")
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"gA" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"hh" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/camera/autoname{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"hx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"hA" = (
+/obj/machinery/rnd/server,
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"hY" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"ig" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"iv" = (
+/obj/structure/table/optable,
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"iQ" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/door/poddoor{
+ id = "acron_cargo"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"kB" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_external"
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"kV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"mQ" = (
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -16
+ },
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"na" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_external"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/medical)
+"nx" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"od" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"oQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/structure/chair/office{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"pG" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
+"qv" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_eng";
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/engineering)
+"rG" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"sc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"sB" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 10;
+ faction = list("Space Ninja")
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
+"tt" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -16
+ },
+/obj/machinery/cryopod{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"tA" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"tB" = (
+/obj/item/areaeditor/shuttle,
+/obj/item/radio/intercom/wideband/table{
+ dir = 6
+ },
+/obj/structure/table,
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"tY" = (
+/obj/machinery/light_switch{
+ pixel_y = 21;
+ pixel_x = 8
+ },
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"vn" = (
+/obj/machinery/light/directional/south,
+/obj/machinery/autolathe,
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"vA" = (
+/obj/machinery/camera/autoname{
+ dir = 9
+ },
+/obj/machinery/button/door{
+ pixel_x = 22;
+ pixel_y = 10;
+ name = "blast door control";
+ id = "acron_cargo";
+ dir = 8
+ },
+/obj/machinery/button/shieldwallgen{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = -7;
+ id = "acron_holofield"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"vC" = (
+/obj/machinery/camera/autoname{
+ dir = 5
+ },
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/spiderclan/surgery,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"vG" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"vQ" = (
+/obj/machinery/camera/autoname{
+ dir = 4
+ },
+/obj/machinery/computer/rdconsole{
+ dir = 4
+ },
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"xr" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"xz" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 9;
+ faction = list("Space Ninja")
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
+"xA" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/window{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"yA" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/window{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"yR" = (
+/obj/structure/closet/wall/orange{
+ dir = 6;
+ pixel_y = -32;
+ name = "Engineering Closet"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/item/storage/belt/utility/chief/full,
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"zc" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "acron_holofield";
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor{
+ id = "acron_cargo"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"zB" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable,
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"zL" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"zN" = (
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"Aq" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Au" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"AQ" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/machinery/vending/medical,
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"AV" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"Bf" = (
+/obj/machinery/door/airlock/medical{
+ name = "Medical"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet/black,
+/area/ship/medical)
+"Cq" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+ dir = 1
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"CA" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"CM" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"Dr" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ea" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 16
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ek" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"EK" = (
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"Fa" = (
+/obj/machinery/rnd/production/protolathe/department/science,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"Fg" = (
+/obj/machinery/camera/autoname{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Gl" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/medical)
+"Ht" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command{
+ dir = 4;
+ name = "Bridge"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/ship/bridge)
+"Hw" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/mineral/ore_redemption{
+ dir = 1;
+ output_dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"HD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/button/door{
+ dir = 8;
+ pixel_x = 22;
+ pixel_y = 10;
+ name = "blast door control";
+ id = "acron_external"
+ },
+/obj/machinery/turretid{
+ pixel_x = 32;
+ pixel_y = 12
+ },
+/obj/machinery/light_switch{
+ pixel_x = 22;
+ pixel_y = null;
+ dir = 8
+ },
+/obj/machinery/holopad,
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"IJ" = (
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"JA" = (
+/obj/machinery/door/airlock/research{
+ name = "Research"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet/black,
+/area/ship/science)
+"JB" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/pizzabox/meat,
+/obj/item/pizzabox/meat,
+/obj/item/pizzabox/meat,
+/obj/item/pizzabox/meat,
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"JR" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_external"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/science)
+"JS" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ka" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"MR" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"Os" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Ot" = (
+/obj/docking_port/mobile{
+ port_direction = 8;
+ preferred_direction = 4;
+ dir = 2
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"PO" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_external"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/ship/science)
+"QU" = (
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"Re" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "acron_external";
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"Ru" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -16
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"Tg" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/science)
+"TS" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste,
+/turf/open/floor/engine/hull,
+/area/ship/external)
+"UV" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/engineering{
+ dir = 4;
+ name = "Engineering"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Vm" = (
+/obj/structure/chair/office{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+"Vy" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/carpet/blue,
+/area/ship/medical)
+"VA" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"VD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/visible{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"VX" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Wy" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/window{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"WH" = (
+/obj/machinery/camera/autoname{
+ dir = 8
+ },
+/obj/structure/closet/wall{
+ dir = 6;
+ pixel_y = -32;
+ name = "Mining Closet"
+ },
+/obj/item/t_scanner/adv_mining_scanner,
+/obj/item/t_scanner/adv_mining_scanner,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe/drill/jackhammer/old,
+/obj/item/pickaxe/drill/jackhammer/old,
+/turf/open/floor/carpet/black,
+/area/ship/cargo)
+"WI" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Xk" = (
+/obj/machinery/button/door{
+ dir = 8;
+ pixel_x = 22;
+ pixel_y = 10;
+ name = "blast door control";
+ id = "acron_eng"
+ },
+/obj/machinery/light_switch{
+ pixel_x = 14;
+ pixel_y = null;
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Xu" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/purple,
+/area/ship/science)
+"Yk" = (
+/turf/template_noop,
+/area/template_noop)
+"ZK" = (
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ship/bridge)
+
+(1,1,1) = {"
+xz
+eb
+eb
+qv
+qv
+qv
+eb
+eb
+sB
+"}
+(2,1,1) = {"
+pG
+yA
+xA
+Ek
+WI
+zB
+Wy
+yA
+pG
+"}
+(3,1,1) = {"
+pG
+Aq
+hY
+fm
+rG
+Dr
+zL
+JS
+pG
+"}
+(4,1,1) = {"
+pG
+Ea
+vG
+Xk
+VD
+kV
+Ka
+VA
+pG
+"}
+(5,1,1) = {"
+Gl
+Gl
+Gl
+Gl
+UV
+Tg
+Tg
+Tg
+Tg
+"}
+(6,1,1) = {"
+Gl
+Gl
+vC
+Gl
+VX
+Tg
+vQ
+Tg
+Tg
+"}
+(7,1,1) = {"
+na
+AQ
+mQ
+Gl
+Fg
+Tg
+tY
+nx
+PO
+"}
+(8,1,1) = {"
+na
+hx
+CA
+Bf
+Os
+JA
+Xu
+Fa
+JR
+"}
+(9,1,1) = {"
+na
+IJ
+Vy
+Gl
+eH
+Tg
+aU
+EK
+JR
+"}
+(10,1,1) = {"
+na
+iv
+dK
+dK
+Ru
+dK
+dK
+hA
+JR
+"}
+(11,1,1) = {"
+Gl
+Gl
+dK
+bJ
+ig
+Hw
+dK
+Tg
+Tg
+"}
+(12,1,1) = {"
+Yk
+Yk
+Ot
+CM
+od
+vn
+dK
+Yk
+Yk
+"}
+(13,1,1) = {"
+Yk
+QU
+di
+sc
+od
+tA
+dK
+Yk
+Yk
+"}
+(14,1,1) = {"
+Yk
+TS
+iQ
+xr
+Au
+yR
+Cq
+Yk
+Yk
+"}
+(15,1,1) = {"
+Yk
+QU
+zc
+vA
+od
+WH
+dK
+Yk
+Yk
+"}
+(16,1,1) = {"
+Yk
+gs
+MR
+MR
+Ht
+MR
+MR
+bj
+Yk
+"}
+(17,1,1) = {"
+Yk
+kB
+tt
+hh
+gA
+ck
+JB
+kB
+Yk
+"}
+(18,1,1) = {"
+Yk
+kB
+zN
+Vm
+HD
+oQ
+tB
+kB
+Yk
+"}
+(19,1,1) = {"
+Yk
+kB
+Re
+fz
+AV
+ZK
+Re
+kB
+Yk
+"}
+(20,1,1) = {"
+Yk
+Yk
+Re
+Re
+Re
+Re
+Re
+Yk
+Yk
+"}
diff --git a/_maps/shuttles/independent/independent_alone.dmm b/_maps/shuttles/independent/independent_alone.dmm
new file mode 100644
index 0000000000000..052e5272ca953
--- /dev/null
+++ b/_maps/shuttles/independent/independent_alone.dmm
@@ -0,0 +1,616 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"b" = (
+/turf/closed/wall/r_wall,
+/area/ship/engineering)
+"c" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light_switch{
+ pixel_y = 23
+ },
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/item/flashlight,
+/obj/item/pickaxe/drill,
+/obj/item/shovel,
+/obj/item/soap,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/storage/bag/ore,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"d" = (
+/obj/machinery/button/door{
+ dir = 8;
+ id = 1;
+ name = "Blast Door Control";
+ pixel_x = 25;
+ pixel_y = 5
+ },
+/obj/item/kirbyplants/random,
+/obj/effect/decal/cleanable/chem_pile,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"e" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor{
+ name = "Blast Door";
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"f" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor{
+ name = "Blast Door";
+ dir = 4
+ },
+/obj/docking_port/mobile{
+ dir = 4;
+ launch_status = 0;
+ preferred_direction = 4;
+ port_direction = 2
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"g" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"h" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"i" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"j" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/garbage,
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"k" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"l" = (
+/turf/template_noop,
+/area/template_noop)
+"m" = (
+/obj/machinery/holopad/emergency,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"n" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"o" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"p" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"q" = (
+/turf/closed/wall/r_wall,
+/area/ship/bridge)
+"s" = (
+/obj/structure/fans/tiny,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"u" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 8
+ },
+/obj/machinery/door/window/eastleft,
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"v" = (
+/obj/machinery/autolathe,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"w" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"x" = (
+/obj/machinery/light_switch{
+ pixel_y = 23
+ },
+/obj/machinery/vending/snack/random,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"y" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"z" = (
+/obj/item/kirbyplants/random,
+/obj/effect/decal/cleanable/blood/old{
+ color = "#808080"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"A" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Helm"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old{
+ color = "#808080"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"B" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/directional/west,
+/obj/structure/table,
+/obj/machinery/fax,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"C" = (
+/obj/structure/cable/yellow,
+/obj/machinery/power/port_gen/pacman,
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/box/white,
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"D" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/structure/closet/wall{
+ dir = 1;
+ name = "Radio Closet";
+ pixel_y = -30
+ },
+/obj/item/gps,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/firstaid/advanced,
+/obj/item/storage/firstaid/medical,
+/obj/item/storage/belt/utility/full,
+/obj/item/weaponcrafting/receiver,
+/obj/effect/decal/cleanable/greenglow,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"E" = (
+/obj/machinery/computer/cryopod/directional/south,
+/obj/machinery/cryopod{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/greenglow{
+ color = "#808080"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"F" = (
+/obj/structure/closet,
+/obj/item/areaeditor/shuttle,
+/obj/item/clothing/head/welding,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/extinguisher,
+/obj/item/flashlight,
+/obj/item/paper_bin/bundlenatural,
+/obj/item/pen/survival,
+/obj/item/spacecash/bundle/c10000,
+/obj/item/spacecash/bundle/c10000,
+/obj/item/storage/cans/sixbeer,
+/obj/effect/decal/cleanable/plastic,
+/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/donkpockets/donkpocketpizza,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"G" = (
+/obj/machinery/computer/cargo/express{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"H" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"I" = (
+/obj/docking_port{
+ dwidth = 15;
+ dir = 8;
+ width = 30;
+ height = 15
+ },
+/turf/template_noop,
+/area/template_noop)
+"J" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/item/trash/semki,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/confetti,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"K" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/smes/engineering,
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"L" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"M" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light/directional/west,
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"N" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/item/trash/can,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"O" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Q" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"R" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/microwave,
+/obj/structure/table,
+/obj/machinery/newscaster/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"S" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"T" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"U" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"V" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/directional/east,
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/effect/decal/cleanable/sprayweb,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"W" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+"X" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 8
+ },
+/obj/machinery/door/window/eastright,
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Y" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/item/trash/boritos,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Z" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/engineering)
+
+(1,1,1) = {"
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+"}
+(2,1,1) = {"
+l
+b
+l
+l
+I
+l
+l
+l
+b
+l
+"}
+(3,1,1) = {"
+l
+b
+h
+b
+T
+s
+b
+h
+b
+l
+"}
+(4,1,1) = {"
+l
+b
+u
+b
+n
+Z
+b
+X
+b
+l
+"}
+(5,1,1) = {"
+l
+b
+c
+H
+W
+Q
+o
+D
+b
+l
+"}
+(6,1,1) = {"
+l
+b
+b
+b
+p
+i
+b
+b
+b
+l
+"}
+(7,1,1) = {"
+l
+l
+b
+K
+Y
+J
+M
+b
+l
+l
+"}
+(8,1,1) = {"
+l
+l
+q
+V
+j
+N
+C
+q
+l
+l
+"}
+(9,1,1) = {"
+l
+q
+q
+q
+S
+L
+q
+q
+q
+l
+"}
+(10,1,1) = {"
+l
+q
+B
+w
+y
+U
+O
+E
+q
+l
+"}
+(11,1,1) = {"
+l
+q
+x
+k
+A
+m
+k
+F
+q
+l
+"}
+(12,1,1) = {"
+l
+q
+R
+d
+g
+G
+z
+v
+q
+l
+"}
+(13,1,1) = {"
+l
+q
+q
+q
+f
+e
+q
+q
+q
+l
+"}
+(14,1,1) = {"
+l
+q
+l
+l
+l
+l
+l
+l
+q
+l
+"}
+(15,1,1) = {"
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+"}
diff --git a/_maps/shuttles/independent/independent_omega.dmm b/_maps/shuttles/independent/independent_omega.dmm
new file mode 100644
index 0000000000000..4ddd00871ba27
--- /dev/null
+++ b/_maps/shuttles/independent/independent_omega.dmm
@@ -0,0 +1,448 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"b" = (
+/obj/machinery/holopad/emergency,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"c" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"d" = (
+/obj/machinery/power/shuttle/engine/electric{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"e" = (
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"f" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/machinery/autolathe,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"g" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"h" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"j" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/hydroponics/constructable,
+/obj/item/hatchet,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/cultivator,
+/obj/item/seeds/random,
+/obj/item/seeds/cotton,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -18
+ },
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/apple,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"m" = (
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/plasma/fifty,
+/obj/item/shovel,
+/obj/item/pickaxe/drill,
+/obj/item/soap,
+/obj/item/gps,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/plants/portaseeder,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"p" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"q" = (
+/obj/machinery/button/door{
+ id = 1;
+ name = "Blast Door Control";
+ dir = 8;
+ pixel_x = -9
+ },
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"r" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/maintenance_hatch{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/docking_port/mobile{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"v" = (
+/obj/structure/cable{
+ icon_state = "0-1"
+ },
+/obj/machinery/power/port_gen/pacman,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/industrial/outline,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"x" = (
+/obj/item/kirbyplants/random,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/areaeditor/shuttle,
+/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/donkpockets,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"y" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"z" = (
+/obj/machinery/computer/helm{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"A" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"B" = (
+/obj/effect/turf_decal/industrial/stand_clear{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/bridge)
+"C" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/cryopod,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"F" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"G" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/structure/sink{
+ pixel_y = 20
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"I" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/window/reinforced/spawner/west,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"J" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"L" = (
+/obj/structure/closet,
+/obj/item/mining_scanner,
+/obj/item/storage/cans/sixbeer,
+/obj/item/flashlight,
+/obj/item/storage/firstaid/advanced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/pill_bottle/charcoal,
+/obj/item/storage/pill_bottle/mining,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"N" = (
+/turf/template_noop,
+/area/template_noop)
+"O" = (
+/obj/docking_port/stationary{
+ width = 27;
+ height = 15;
+ dwidth = 8
+ },
+/turf/template_noop,
+/area/template_noop)
+"Q" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"R" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"S" = (
+/obj/machinery/jukebox/boombox,
+/obj/structure/table,
+/obj/item/radio/intercom/wideband/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"V" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Helm"
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"W" = (
+/obj/effect/spawner/structure/window/reinforced/shutters,
+/obj/structure/grille,
+/obj/machinery/door/poddoor{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"X" = (
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+
+(1,1,1) = {"
+N
+N
+N
+N
+N
+N
+N
+N
+N
+N
+"}
+(2,1,1) = {"
+N
+R
+N
+R
+B
+B
+R
+N
+R
+N
+"}
+(3,1,1) = {"
+N
+R
+N
+R
+c
+r
+R
+N
+R
+N
+"}
+(4,1,1) = {"
+N
+R
+d
+R
+J
+A
+R
+d
+R
+N
+"}
+(5,1,1) = {"
+N
+R
+I
+e
+X
+X
+g
+I
+R
+N
+"}
+(6,1,1) = {"
+N
+R
+G
+X
+X
+X
+X
+f
+R
+N
+"}
+(7,1,1) = {"
+O
+R
+C
+F
+F
+F
+F
+j
+R
+N
+"}
+(8,1,1) = {"
+N
+R
+p
+h
+h
+h
+h
+m
+R
+N
+"}
+(9,1,1) = {"
+N
+R
+y
+Q
+a
+a
+a
+v
+R
+N
+"}
+(10,1,1) = {"
+N
+R
+R
+x
+b
+V
+L
+R
+R
+N
+"}
+(11,1,1) = {"
+N
+N
+R
+q
+S
+z
+R
+R
+N
+N
+"}
+(12,1,1) = {"
+N
+N
+N
+R
+W
+W
+R
+N
+N
+N
+"}
+(13,1,1) = {"
+N
+N
+N
+N
+N
+N
+N
+N
+N
+N
+"}
+(14,1,1) = {"
+N
+N
+N
+N
+N
+N
+N
+N
+N
+N
+"}
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index e6bdf143a9cab..ca132f0d83f14 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -95,7 +95,8 @@
/area/ship/engineering)
"bs" = (
/obj/machinery/door/airlock/public/glass{
- name = "Crew Quarters"
+ name = "Crew Quarters";
+ req_access_txt = "147"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -145,7 +146,7 @@
/obj/structure/closet/secure_closet{
icon_state = "armory";
name = "armor locker";
- req_access_txt = "1"
+ req_access_txt = "148"
},
/obj/item/clothing/suit/armor/vest/alt,
/obj/item/clothing/suit/armor/vest/alt,
@@ -671,6 +672,9 @@
dir = 4
},
/obj/machinery/light/directional/east,
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/security)
"hc" = (
@@ -717,7 +721,9 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/port)
"hO" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+ req_access_txt = "147"
+ },
/obj/effect/turf_decal/borderfloor{
dir = 1
},
@@ -821,7 +827,7 @@
can_be_unanchored = 1;
icon_state = "warden";
name = "master at arms' locker";
- req_access_txt = "3"
+ req_access_txt = "148"
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
@@ -1566,7 +1572,7 @@
},
/obj/machinery/light/small/directional/north,
/obj/machinery/door/window/brigdoor/eastright{
- req_access_txt = "3"
+ req_access_txt = "148"
},
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
@@ -1992,7 +1998,8 @@
/area/ship/crew/office)
"vc" = (
/obj/machinery/door/airlock{
- name = "Head"
+ name = "Head";
+ req_access_txt = "147"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -2394,7 +2401,8 @@
},
/obj/machinery/door/airlock/public/glass{
dir = 4;
- name = "Cryogenic Storage"
+ name = "Cryogenic Storage";
+ req_access_txt = "147"
},
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -2420,7 +2428,8 @@
/area/ship/crew/office)
"AZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Port Engines"
+ name = "Port Engines";
+ req_access_txt = "147"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -2647,7 +2656,7 @@
icon_state = "solgov_wall";
name = "vanguard's locker";
pixel_x = -28;
- req_access_txt = "58"
+ req_access_txt = "149"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -2679,7 +2688,8 @@
/area/ship/security/armory)
"Dr" = (
/obj/machinery/door/airlock/security/glass{
- name = "Office"
+ name = "Office";
+ req_access_txt = "148"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -3431,7 +3441,8 @@
},
/obj/machinery/door/airlock/maintenance{
dir = 4;
- name = "Engineering"
+ name = "Engineering";
+ req_access_txt = "147"
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
@@ -3529,6 +3540,9 @@
/obj/item/gps{
pixel_x = 12
},
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"NP" = (
@@ -3768,7 +3782,8 @@
/area/ship/hallway/central)
"Qu" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Starboard Engines"
+ name = "Starboard Engines";
+ req_access_txt = "147"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -3793,7 +3808,9 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"QI" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+ req_access_txt = "147"
+ },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -3812,7 +3829,7 @@
"QL" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge";
- req_access_txt = "58"
+ req_access_txt = "149"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -3952,7 +3969,7 @@
dir = 4;
id_tag = "colossus_armory";
name = "Armory";
- req_access_txt = "1"
+ req_access_txt = "148"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -4166,7 +4183,8 @@
/area/ship/crew/office)
"UN" = (
/obj/machinery/door/airlock/public/glass{
- name = "Office"
+ name = "Office";
+ req_access_txt = "147"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -4296,7 +4314,7 @@
/obj/structure/closet/secure_closet{
icon_state = "sec";
name = "equipment locker";
- req_access_txt = "1"
+ req_access_txt = "148"
},
/obj/item/clothing/mask/gas/sechailer/inteq,
/obj/item/clothing/mask/gas/sechailer/inteq,
@@ -4369,7 +4387,7 @@
"Xc" = (
/obj/machinery/door/window/northleft{
dir = 8;
- req_access_txt = "3"
+ req_access_txt = "148"
},
/obj/structure/cable{
icon_state = "4-8"
diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index 2fc73b689d887..fae4b82802992 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -155,7 +155,8 @@
/area/ship/maintenance/port)
"eb" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Port Engines"
+ name = "Port Engines";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -594,7 +595,7 @@
icon_state = "sec_wall";
name = "weapons lockup";
pixel_y = -28;
- req_one_access_txt = "58"
+ req_one_access_txt = "148,149"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
@@ -614,7 +615,7 @@
"of" = (
/obj/machinery/door/airlock/command{
name = "Bridge";
- req_access_txt = "58"
+ req_access_txt = "148,149"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
@@ -1027,7 +1028,8 @@
/area/ship/crew)
"vC" = (
/obj/machinery/door/airlock{
- name = "Restroom"
+ name = "Restroom";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1055,7 +1057,8 @@
"vI" = (
/obj/machinery/door/airlock/grunge{
dir = 4;
- name = "EVA Storage"
+ name = "EVA Storage";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -1104,7 +1107,7 @@
icon_state = "sec_wall";
name = "equipment locker";
pixel_y = 28;
- req_one_access_txt = "1"
+ req_one_access_txt = "148"
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
@@ -1497,7 +1500,8 @@
"HO" = (
/obj/machinery/door/airlock/grunge{
dir = 4;
- name = "Cargo Bay"
+ name = "Cargo Bay";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -1605,7 +1609,7 @@
icon_state = "solgov_wall";
name = "vanguard's locker";
pixel_x = -28;
- req_access_txt = "58"
+ req_access_txt = "149"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/mask/gas/sechailer/inteq,
@@ -1652,7 +1656,8 @@
/area/ship/maintenance/port)
"Jc" = (
/obj/machinery/door/airlock{
- name = "Dormitory"
+ name = "Dormitory";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -1699,7 +1704,8 @@
/area/ship/maintenance/port)
"JJ" = (
/obj/machinery/door/airlock/external{
- dir = 4
+ dir = 4;
+ req_access_txt = "147"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1745,7 +1751,8 @@
/area/ship/bridge)
"Ky" = (
/obj/machinery/door/airlock/external{
- dir = 4
+ dir = 4;
+ req_access_txt = "147"
},
/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/atmospherics/pipe/layer_manifold{
@@ -2118,7 +2125,8 @@
/area/ship/crew/dorm)
"Ub" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Starboard Engines"
+ name = "Starboard Engines";
+ req_access_txt = "147"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2335,6 +2343,9 @@
name = "vanguard's rubber stamp"
},
/obj/item/pen/fountain,
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Yj" = (
diff --git a/_maps/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/shuttles/inteq/inteq_iron_maiden.dmm
index ee6dc2c4404f2..572e4ab0c1b34 100644
--- a/_maps/shuttles/inteq/inteq_iron_maiden.dmm
+++ b/_maps/shuttles/inteq/inteq_iron_maiden.dmm
@@ -326,13 +326,14 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/door/airlock/security/glass{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer5{
dir = 4
},
+/obj/machinery/door/airlock/security/glass{
+ dir = 4;
+ req_access_txt = "148,149"
+ },
/turf/open/floor/plating/ship,
/area/ship/construction)
"tk" = (
@@ -661,7 +662,8 @@
dir = 4
},
/obj/machinery/door/airlock/security/glass{
- dir = 4
+ dir = 4;
+ req_access_txt = "148,149"
},
/turf/open/floor/plating/ship,
/area/ship/crew/cryo)
@@ -870,10 +872,11 @@
/obj/machinery/door/firedoor/border_only{
dir = 4
},
+/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/door/airlock/security/glass{
- dir = 4
+ dir = 4;
+ req_access_txt = "148,149"
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating/ship,
/area/ship/crew/cryo)
"My" = (
@@ -1127,7 +1130,8 @@
dir = 8
},
/obj/machinery/door/airlock/security/glass{
- dir = 4
+ dir = 4;
+ req_access_txt = "148,149"
},
/turf/open/floor/plating/ship,
/area/ship/construction)
@@ -1139,7 +1143,8 @@
dir = 8
},
/obj/machinery/door/airlock/security/glass{
- dir = 4
+ dir = 4;
+ req_access_txt = "148,149"
},
/turf/open/floor/plating/ship,
/area/ship/construction)
@@ -1172,6 +1177,9 @@
pixel_x = -5;
pixel_y = 8
},
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/tech/grid/airless,
/area/ship/crew/cryo)
"Vj" = (
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 3bd00f00ed9a6..81642d3731b01 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -2588,6 +2588,9 @@
name = "vanguard's rubber stamp"
},
/obj/machinery/airalarm/directional/north,
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"pU" = (
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 2e8d626d4e5ae..863156fb47d51 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -171,6 +171,9 @@
pixel_x = 6
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/security)
"dq" = (
@@ -705,6 +708,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/item/stamp/inteq{
+ layer = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"jE" = (
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index ea51a1c96113a..c4cb8148d6fbb 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -394,6 +394,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define NINJA_SUIT_TRAIT "ninja-suit"
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
#define SLEEPING_CARP_TRAIT "sleeping_carp"
+#define SPACE_NINJA_TRAIT "space_ninja"
#define MADE_UNCLONEABLE "made-uncloneable"
#define TIMESTOP_TRAIT "timestop"
#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name
diff --git a/code/acron/spaceninja.dm b/code/acron/spaceninja.dm
new file mode 100644
index 0000000000000..a82f7432a3413
--- /dev/null
+++ b/code/acron/spaceninja.dm
@@ -0,0 +1,47 @@
+/datum/outfit/acron_ninja
+ name = "Frontier Space Ninja"
+ uniform = /obj/item/clothing/under/color/black
+ suit = /obj/item/clothing/suit/space/space_ninja
+ glasses = /obj/item/clothing/glasses/night
+ mask = /obj/item/clothing/mask/gas/space_ninja
+ head = /obj/item/clothing/head/helmet/space/space_ninja
+ ears = /obj/item/radio/headset
+ shoes = /obj/item/clothing/shoes/space_ninja
+ gloves = /obj/item/clothing/gloves/space_ninja
+ back = /obj/item/storage/backpack
+ l_pocket = /obj/item/grenade/c4/x4
+ r_pocket = /obj/item/tank/internals/emergency_oxygen
+ internals_slot = ITEM_SLOT_RPOCKET
+ belt = /obj/item/energy_katana
+ implants = list(/obj/item/implant/explosive)
+
+/datum/outfit/acron_ninja/post_equip(mob/living/carbon/human/H)
+ if(istype(H.wear_suit, suit))
+ var/obj/item/clothing/suit/space/space_ninja/S = H.wear_suit
+ if(istype(H.belt, belt))
+ S.energyKatana = H.belt
+ S.randomize_param()
+ H.faction |= ROLE_NINJA
+ H.mind.add_antag_datum(/datum/antagonist/ninja/acron_ninja)
+ ADD_TRAIT(H, TRAIT_NOGUNS, SPACE_NINJA_TRAIT)
+ return
+
+/datum/antagonist/ninja/acron_ninja/addMemories()
+ antag_memory += "Я являюсь элитным наемником-ассасином великого клана Паука.>"
+ antag_memory += "Неожиданность - мое оружие. Тень - моя броня. Без них - я ничто. (//Активируйте костюм для использования способностей)!
"
+ antag_memory += "Официально, я наемник, и только я решаю, кто будет моим нанимателем.
"
+
+/datum/antagonist/ninja/acron_ninja/greet()
+ SEND_SOUND(owner.current, sound('sound/effects/ninja_greeting.ogg'))
+ to_chat(owner.current, "Я являюсь элитным наемником-ассасином великого клана Паука!")
+ to_chat(owner.current, "Неожиданность - мое оружие. Тень - моя броня. Без них - я ничто. (//Активируйте костюм для использования способностей)")
+ to_chat(owner.current, "Кровь невиновных на моем клинке лишь запятнает мою честь. Я не должен прибегать к неоправданному насилию.")
+ owner.announce_objectives()
+ return
+
+/datum/antagonist/ninja/acron_ninja/addObjectives(quantity)
+ var/datum/objective/custom/Objective_one = new /datum/objective/custom()
+ Objective_one.owner = owner
+ objectives += Objective_one
+ Objective_one.explanation_text = "Я обязан сохранить существование клана Паука в тайне."
+
diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index 3f519fc491558..d1fea6bd17d2c 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -6,6 +6,7 @@
var/current_charges = 1
var/max_charges = 1
var/charge_rate = 250
+ var/mob/living/carbon/human/holder
var/obj/item/dashing_item
var/dash_sound = 'sound/magic/blink.ogg'
var/recharge_sound = 'sound/magic/charge.ogg'
@@ -16,10 +17,7 @@
/datum/action/innate/dash/Grant(mob/user, obj/dasher)
. = ..()
dashing_item = dasher
-
-/datum/action/innate/dash/Destroy()
- dashing_item = null
- return ..()
+ holder = user
/datum/action/innate/dash/IsAvailable()
if(current_charges > 0)
@@ -28,25 +26,31 @@
return FALSE
/datum/action/innate/dash/Activate()
- dashing_item.attack_self(owner) //Used to toggle dash behavior in the dashing item
+ dashing_item.attack_self(holder) //Used to toggle dash behavior in the dashing item
/datum/action/innate/dash/proc/Teleport(mob/user, atom/target)
if(!IsAvailable())
return
+ var/mob/living/tprange = new(get_turf(user))
+ if(!(target in view(7, tprange)))
+ qdel(tprange)
+ return
+ qdel(tprange)
+ if(!istype(target, /turf/open))
+ return
var/turf/T = get_turf(target)
- if(target in view(user.client.view, user))
- var/obj/spot1 = new phaseout(get_turf(user), user.dir)
- user.forceMove(T)
- playsound(T, dash_sound, 25, TRUE)
- var/obj/spot2 = new phasein(get_turf(user), user.dir)
- spot1.Beam(spot2,beam_effect,time=20)
- current_charges--
- owner.update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/charge), charge_rate)
+ var/obj/spot1 = new phaseout(get_turf(user), user.dir)
+ user.forceMove(T)
+ playsound(T, dash_sound, 25, TRUE)
+ var/obj/spot2 = new phasein(get_turf(user), user.dir)
+ spot1.Beam(spot2,beam_effect,time=20)
+ current_charges--
+ holder.update_action_buttons_icon()
+ addtimer(CALLBACK(src, .proc/charge), charge_rate)
/datum/action/innate/dash/proc/charge()
current_charges = clamp(current_charges + 1, 0, max_charges)
- owner.update_action_buttons_icon()
+ holder.update_action_buttons_icon()
if(recharge_sound)
playsound(dashing_item, recharge_sound, 50, TRUE)
- to_chat(owner, "[src] now has [current_charges]/[max_charges] charges.")
+ to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.")
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index bf61f194b9b79..eb817d53bfa96 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -279,6 +279,13 @@
item_state = "defibnt"
paddle_type = /obj/item/shockpaddles/syndicate/nanotrasen
+/obj/item/defibrillator/compact/combat/loaded/spiderclan
+ name = "elite spider clan defibrillator"
+ desc = "A belt-equipped state-of-the-art defibrillator. Can revive through spacesuits, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or agressive manner."
+ icon_state = "defibsc"
+ item_state = "defibsc"
+ paddle_type = /obj/item/shockpaddles/spiderclan
+
//paddles
/obj/item/shockpaddles
@@ -670,4 +677,13 @@
/obj/item/shockpaddles/syndicate/cyborg
req_defib = FALSE
+/obj/item/shockpaddles/spiderclan
+ name = "spiderclan defibrillator paddles"
+ desc = "A pair of paddles used to revive deceased operatives. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively."
+ combat = TRUE
+ icon = 'icons/obj/defib.dmi'
+ icon_state = "spiderpaddles0"
+ item_state = "spiderpaddles0"
+ base_icon_state = "spiderpaddles"
+
#undef HALFWAYCRITDEATH
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 4d44a749146c6..b365ec8a85726 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -574,6 +574,21 @@
new /obj/item/clothing/mask/muzzle(src)
new /obj/item/mmi/syndie(src)
+/obj/item/storage/backpack/duffelbag/spiderclan/surgery
+ name = "surgery duffel bag"
+ desc = "Spider Clan's surgery duffel bag for holding surgery tools."
+ icon_state = "duffel-spidermed"
+ item_state = "duffel-spidermed"
+
+/obj/item/storage/backpack/duffelbag/spiderclan/surgery/PopulateContents()
+ new /obj/item/surgicaldrill/advanced(src)
+ new /obj/item/scalpel/advanced(src)
+ new /obj/item/retractor/advanced(src)
+ new /obj/item/healthanalyzer/advanced(src)
+ new /obj/item/clothing/glasses/hud/health/night(src)
+ new /obj/item/defibrillator/compact/combat/loaded/spiderclan(src)
+ new /obj/item/mmi(src)
+
/obj/item/storage/backpack/duffelbag/syndie/ammo
name = "ammunition duffel bag"
desc = "A large duffel bag for holding extra weapons ammunition and supplies."
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index c00d32d25809d..e762bbd09f93d 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -7,7 +7,7 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 40
throwforce = 20
- block_chance = 50
+ block_chance = 35
armour_penetration = 50
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -33,6 +33,8 @@
/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
+ if(!is_ninja(user))
+ return
if(dash_toggled)
jaunt.Teleport(user, target)
if(proximity_flag && (isobj(target) || issilicon(target)))
@@ -102,5 +104,5 @@
/datum/action/innate/dash/ninja
current_charges = 3
max_charges = 3
- charge_rate = 30
+ charge_rate = 85
recharge_sound = null
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm
index da0c28346a707..f0def35d347b0 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm
@@ -7,6 +7,9 @@
if(cost && cell.charge < actualCost)
to_chat(H, "Not enough energy!")
return 1
+ if(s_coold)
+ to_chat(H, "Abilities is on cooldown!")
+ return 1
else
//This shit used to be handled individually on every proc.. why even bother with a universal check proc then?
cell.charge-=(actualCost)
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
index ea96c1cdf6121..b361b8a3e8ac9 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
@@ -2,9 +2,8 @@
//Disables nearby tech equipment.
/obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
-
if(!ninjacost(250,N_STEALTH_CANCEL))
var/mob/living/carbon/human/H = affecting
playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
- s_coold = 2
+ s_coold = 5
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
index 1c3fbd814701d..a6bd7a31f7ad3 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
@@ -18,9 +18,9 @@ Contents:
to_chat(U, "You don't have enough power to enable Stealth!")
return
stealth = !stealth
- animate(U, alpha = 50,time = 15)
+ animate(U, alpha = 0,time = 15)
U.visible_message("[U.name] vanishes into thin air!", \
- "You are now mostly invisible to normal detection.")
+ "You are now invisible to normal detection.")
/obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index cb355014d4e7f..d7c4438d9c979 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -140,7 +140,7 @@ Contents:
ADD_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes = H.shoes
ADD_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_shoes.slowdown--
+ n_shoes.slowdown -= 0.3
n_gloves = H.gloves
ADD_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
return TRUE
diff --git a/icons/obj/defib.dmi b/icons/obj/defib.dmi
index 6ee2b4fa4fe76..60b07e80cb2de 100644
Binary files a/icons/obj/defib.dmi and b/icons/obj/defib.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 241476f84bd68..e36d80d2721b3 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 7ead98a88333f..ad1f016251466 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -278,6 +278,7 @@
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\screentip.dm"
#include "code\_onclick\hud\swarmer.dm"
+#include "code\acron\spaceninja.dm"
#include "code\controllers\admin.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"