diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index aabd7f476996..06d6a8e9fd27 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -437,7 +437,6 @@
/obj/item/clothing/under/rank/cargo/miner,
/obj/item/clothing/suit/hooded/wintercoat/miner,
/obj/item/clothing/shoes/winterboots,
-/obj/item/card/id/mining,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
index f4307cf7a84b..6bb4f2e48c99 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2068,7 +2068,7 @@
"sa" = (
/obj/effect/turf_decal/rechargefloor,
/obj/effect/turf_decal/industrial/warning/dust,
-/obj/effect/spawner/lootdrop/whiteship_cere_ripley,
+/obj/effect/spawner/lootdrop/ripley,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdockwarehouse)
"sc" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index 322ab73490f9..0f5d01fb7de8 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -9901,12 +9901,12 @@
"Lx" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/blue/half,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/wolftalisman,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/wolftalisman,
-/obj/item/clothing/accessory/wolftalisman,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/neck/fangnecklace,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/neck/fangnecklace,
+/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
index 81a8e67a3456..b90bfbe776bd 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -95,7 +95,7 @@
/area/ruin/powered)
"fq" = (
/obj/structure/table,
-/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/a44roum_speedloader,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"fJ" = (
diff --git a/_maps/outpost/hangar/indie_space_20x20.dmm b/_maps/outpost/hangar/indie_space_20x20.dmm
index 24c00395b2f6..d0a327297d30 100644
--- a/_maps/outpost/hangar/indie_space_20x20.dmm
+++ b/_maps/outpost/hangar/indie_space_20x20.dmm
@@ -66,10 +66,11 @@
/turf/closed/indestructible/reinforced,
/area/hangar)
"az" = (
-/obj/effect/turf_decal/arrows{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/turf/open/floor/plasteel{
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -78,7 +79,11 @@
pixel_y = 25
},
/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -133,12 +138,10 @@
},
/area/hangar)
"aO" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel{
- planetary_atmos = 1
- },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aP" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
@@ -149,20 +152,58 @@
},
/area/hangar)
"aT" = (
-/obj/effect/turf_decal/arrows{
- dir = 1
- },
-/turf/open/floor/plasteel{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
"aY" = (
/obj/effect/landmark/outpost/hangar_numbers,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"aZ" = (
/turf/open/floor/plasteel{
planetary_atmos = 1
},
/area/hangar)
-"aZ" = (
+"dR" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"fT" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"fU" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"gu" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"iT" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
/turf/open/floor/plasteel{
planetary_atmos = 1
},
@@ -178,9 +219,138 @@
planetary_atmos = 1
},
/area/hangar)
+"qO" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
"rQ" = (
-/obj/machinery/atmospherics/pipe/simple/general,
-/turf/closed/indestructible/reinforced,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"un" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"zH" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Af" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "101"
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Aj" = (
+/obj/machinery/computer/hydrogen_exchange,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"An" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"DI" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ie" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"IW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ks" = (
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Li" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Oa" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Sr" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"VO" = (
+/obj/structure/railing/corner{
+ dir = 1;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Wk" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Xu" = (
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Xy" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
/area/hangar)
(1,1,1) = {"
@@ -255,7 +425,7 @@ aH
aH
am
aZ
-aZ
+fU
aM
ac
ac
@@ -278,7 +448,7 @@ aC
ac
ac
ao
-aZ
+fU
aZ
am
"}
@@ -288,7 +458,7 @@ aH
aH
am
aZ
-aZ
+fU
aM
ad
ad
@@ -311,7 +481,7 @@ ad
ad
ad
ao
-aZ
+fU
aZ
am
"}
@@ -321,7 +491,7 @@ aH
aH
am
aZ
-aZ
+fU
aM
aJ
aJ
@@ -344,7 +514,7 @@ aJ
aJ
aB
ao
-aZ
+fU
aZ
am
"}
@@ -354,7 +524,7 @@ aH
aH
am
aZ
-aZ
+fU
aM
aJ
aJ
@@ -377,7 +547,7 @@ aJ
aJ
aJ
ao
-aZ
+fU
aZ
am
"}
@@ -387,7 +557,7 @@ aH
aH
am
aZ
-az
+fU
aM
ap
aJ
@@ -410,7 +580,7 @@ aJ
aJ
ap
ao
-az
+fU
aZ
am
"}
@@ -420,8 +590,8 @@ aH
aH
am
aZ
-aZ
-aM
+Ie
+Oa
aJ
aJ
aJ
@@ -442,8 +612,8 @@ aJ
aJ
aJ
aJ
-ao
-aZ
+Sr
+gu
aZ
am
"}
@@ -453,7 +623,7 @@ aH
aH
am
aZ
-aZ
+az
av
aJ
aJ
@@ -476,7 +646,7 @@ aJ
aJ
aJ
aq
-aZ
+Wk
aZ
am
"}
@@ -486,7 +656,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -509,7 +679,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -519,7 +689,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -542,7 +712,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -575,7 +745,7 @@ aJ
aJ
ap
ao
-az
+Wk
aZ
am
"}
@@ -585,7 +755,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -608,7 +778,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -618,7 +788,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -641,7 +811,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -651,7 +821,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -674,7 +844,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -684,7 +854,7 @@ aH
aH
am
aZ
-aZ
+az
aM
aJ
aJ
@@ -707,7 +877,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -740,17 +910,17 @@ aJ
aJ
ap
ao
-az
+Wk
aZ
am
"}
(18,1,1) = {"
aH
aH
-aH
am
-aZ
-aZ
+am
+iT
+az
aM
aJ
aJ
@@ -773,17 +943,17 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
(19,1,1) = {"
-aH
-aH
-aH
am
-aZ
-aZ
+am
+am
+Xu
+aO
+az
av
aJ
aJ
@@ -806,17 +976,17 @@ aJ
aJ
aJ
aq
-aZ
+Wk
aZ
am
"}
(20,1,1) = {"
-aH
-aH
-aH
am
-aZ
-aZ
+Af
+un
+Xy
+VO
+az
aM
aJ
aJ
@@ -839,18 +1009,18 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
(21,1,1) = {"
-aH
-aH
-aH
am
-aZ
-aZ
-aM
+am
+Aj
+DI
+aT
+zH
+Oa
aJ
aJ
aJ
@@ -871,17 +1041,17 @@ aJ
aJ
aJ
aJ
-ao
-aZ
+Sr
+IW
aZ
am
"}
(22,1,1) = {"
aH
-aH
-aH
am
-aZ
+qO
+Ks
+Li
az
aM
ap
@@ -905,17 +1075,17 @@ aJ
aJ
ap
ao
-az
+Wk
aZ
am
"}
(23,1,1) = {"
aH
-aH
-aH
+am
+am
rQ
aO
-aZ
+dR
aM
aJ
aJ
@@ -938,7 +1108,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -971,7 +1141,7 @@ aJ
aJ
aJ
ao
-aZ
+Wk
aZ
am
"}
@@ -981,7 +1151,7 @@ qz
qz
jk
ax
-aZ
+fT
al
aN
aN
@@ -1004,7 +1174,7 @@ aN
aN
aN
aP
-aZ
+Wk
aZ
am
"}
@@ -1015,29 +1185,29 @@ qz
qz
ax
aY
-aZ
-aZ
-aZ
aT
-aZ
-aZ
-aZ
-aZ
aT
-aZ
-aZ
-aZ
-aZ
aT
-aZ
-aZ
-aZ
-aZ
aT
-aZ
-aZ
-aZ
-aZ
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+aT
+An
aZ
am
"}
@@ -1047,7 +1217,7 @@ qz
qz
qz
ax
-aZ
+un
aZ
aZ
aE
diff --git a/_maps/outpost/hangar/indie_space_40x20.dmm b/_maps/outpost/hangar/indie_space_40x20.dmm
index b3d80e6103bc..35c8c8f6e11c 100644
--- a/_maps/outpost/hangar/indie_space_40x20.dmm
+++ b/_maps/outpost/hangar/indie_space_40x20.dmm
@@ -12,9 +12,10 @@
/area/hangar)
"af" = (
/obj/effect/landmark/outpost/hangar_numbers,
-/turf/open/floor/plasteel{
- planetary_atmos = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
},
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"ai" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
@@ -51,20 +52,25 @@
},
/area/hangar)
"as" = (
-/obj/effect/turf_decal/arrows{
- dir = 1
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
},
-/turf/open/floor/plasteel{
+/area/hangar)
+"at" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "101"
+ },
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
"av" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel{
- planetary_atmos = 1
- },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aw" = (
/obj/effect/turf_decal/arrows{
@@ -134,7 +140,11 @@
pixel_y = 25
},
/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -150,14 +160,24 @@
planetary_atmos = 1
},
/area/hangar)
-"aX" = (
-/obj/effect/turf_decal/arrows{
+"aV" = (
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/machinery/atmospherics/components/binary/volume_pump{
dir = 4
},
/turf/open/floor/plasteel{
planetary_atmos = 1
},
/area/hangar)
+"aX" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
"aY" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 1
@@ -167,6 +187,108 @@
planetary_atmos = 1
},
/area/hangar)
+"cr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"fT" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"id" = (
+/obj/machinery/computer/hydrogen_exchange,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"kN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"oo" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"pb" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"pf" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"qK" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"yq" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"AH" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ek" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ey" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"IY" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
"JT" = (
/turf/open/floor/plasteel/elevatorshaft{
planetary_atmos = 1
@@ -178,9 +300,56 @@
planetary_atmos = 1
},
/area/hangar)
+"Pk" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"SR" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"TQ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
"TX" = (
-/obj/machinery/atmospherics/pipe/simple/general,
-/turf/closed/indestructible/reinforced,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"UV" = (
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Wp" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"XP" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Yu" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
(1,1,1) = {"
@@ -255,7 +424,7 @@ aP
aP
ab
aj
-aj
+IY
aL
aH
aH
@@ -278,7 +447,7 @@ aw
aH
aH
al
-aj
+IY
aj
ab
"}
@@ -288,7 +457,7 @@ aP
aP
ab
aj
-aj
+IY
aL
am
am
@@ -311,7 +480,7 @@ am
am
am
al
-aj
+IY
aj
ab
"}
@@ -321,7 +490,7 @@ aP
aP
ab
aj
-aj
+IY
aL
aD
aD
@@ -344,7 +513,7 @@ aD
aD
ap
al
-aj
+IY
aj
ab
"}
@@ -354,7 +523,7 @@ aP
aP
ab
aj
-aj
+IY
aL
aD
aD
@@ -377,7 +546,7 @@ aD
aD
aD
al
-aj
+IY
aj
ab
"}
@@ -387,7 +556,7 @@ aP
aP
ab
aj
-aX
+IY
aL
aG
aD
@@ -410,7 +579,7 @@ aD
aD
aG
al
-aX
+IY
aj
ab
"}
@@ -420,8 +589,8 @@ aP
aP
ab
aj
-aj
-aL
+oo
+fT
aD
aD
aD
@@ -442,8 +611,8 @@ aD
aD
aD
aD
-al
-aj
+Ek
+cr
aj
ab
"}
@@ -453,7 +622,7 @@ aP
aP
ab
aj
-aj
+aX
ai
aD
aD
@@ -476,7 +645,7 @@ aD
aD
aD
aY
-aj
+kN
aj
ab
"}
@@ -486,7 +655,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -509,7 +678,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -519,7 +688,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -542,7 +711,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -575,7 +744,7 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
@@ -585,7 +754,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -608,7 +777,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -618,7 +787,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -641,7 +810,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -651,7 +820,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -674,7 +843,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -684,7 +853,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -707,7 +876,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -740,7 +909,7 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
@@ -750,7 +919,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -773,7 +942,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -783,7 +952,7 @@ aP
aP
ab
aj
-aj
+aX
ai
aD
aD
@@ -806,7 +975,7 @@ aD
aD
aD
aY
-aj
+kN
aj
ab
"}
@@ -816,7 +985,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -839,7 +1008,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -849,7 +1018,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -872,7 +1041,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -905,7 +1074,7 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
@@ -915,7 +1084,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -938,7 +1107,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -948,8 +1117,8 @@ aP
aP
ab
aj
-aj
-aL
+pb
+fT
aD
aD
aD
@@ -970,8 +1139,8 @@ aD
aD
aD
aD
-al
-aj
+Ek
+SR
aj
ab
"}
@@ -981,7 +1150,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1004,7 +1173,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1014,7 +1183,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1037,7 +1206,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1070,7 +1239,7 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
@@ -1080,7 +1249,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1103,7 +1272,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1113,7 +1282,7 @@ aP
aP
ab
aj
-aj
+aX
ai
aD
aD
@@ -1136,7 +1305,7 @@ aD
aD
aD
aY
-aj
+kN
aj
ab
"}
@@ -1146,7 +1315,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1169,7 +1338,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1179,7 +1348,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1202,7 +1371,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1235,7 +1404,7 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
@@ -1245,7 +1414,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1268,7 +1437,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1278,7 +1447,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1301,7 +1470,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1311,7 +1480,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1334,7 +1503,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1344,7 +1513,7 @@ aP
aP
ab
aj
-aj
+aX
aL
aD
aD
@@ -1367,7 +1536,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1400,17 +1569,17 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
(38,1,1) = {"
aP
aP
-aP
ab
-aj
-aj
+ab
+Pk
+aX
aL
aD
aD
@@ -1433,17 +1602,17 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
(39,1,1) = {"
-aP
-aP
-aP
ab
-aj
-aj
+ab
+ab
+UV
+av
+aX
ai
aD
aD
@@ -1466,17 +1635,17 @@ aD
aD
aD
aY
-aj
+kN
aj
ab
"}
(40,1,1) = {"
-aP
-aP
-aP
ab
-aj
-aj
+at
+Wp
+AH
+pf
+aX
aL
aD
aD
@@ -1499,18 +1668,18 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
(41,1,1) = {"
-aP
-aP
-aP
ab
-aj
-aj
-aL
+ab
+id
+pb
+as
+TQ
+fT
aD
aD
aD
@@ -1531,17 +1700,17 @@ aD
aD
aD
aD
-al
-aj
+Ek
+SR
aj
ab
"}
(42,1,1) = {"
aP
-aP
-aP
ab
-aj
+yq
+aV
+XP
aX
aL
aG
@@ -1565,17 +1734,17 @@ aD
aD
aG
al
-aX
+kN
aj
ab
"}
(43,1,1) = {"
aP
-aP
-aP
+ab
+ab
TX
av
-aj
+qK
aL
aD
aD
@@ -1598,7 +1767,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1631,7 +1800,7 @@ aD
aD
aD
al
-aj
+kN
aj
ab
"}
@@ -1641,7 +1810,7 @@ JT
JT
OP
aF
-aj
+Yu
aM
aU
aU
@@ -1664,7 +1833,7 @@ aU
aU
aU
ae
-aj
+kN
aj
ab
"}
@@ -1675,29 +1844,29 @@ JT
JT
aF
af
-aj
-aj
-aj
as
-aj
-aj
-aj
-aj
as
-aj
-aj
-aj
-aj
as
-aj
-aj
-aj
-aj
as
-aj
-aj
-aj
-aj
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+as
+Ey
aj
ab
"}
@@ -1707,7 +1876,7 @@ JT
JT
JT
aF
-aj
+Wp
aj
aj
aA
diff --git a/_maps/outpost/hangar/indie_space_40x40.dmm b/_maps/outpost/hangar/indie_space_40x40.dmm
index 9818aa943330..01e75c51ee8a 100644
--- a/_maps/outpost/hangar/indie_space_40x40.dmm
+++ b/_maps/outpost/hangar/indie_space_40x40.dmm
@@ -46,7 +46,11 @@
pixel_y = 25
},
/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -79,10 +83,9 @@
/turf/template_noop,
/area/template_noop)
"aw" = (
-/obj/effect/turf_decal/arrows{
- dir = 1
- },
-/turf/open/floor/plasteel{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -94,10 +97,11 @@
},
/area/hangar)
"ay" = (
-/obj/effect/turf_decal/arrows{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/turf/open/floor/plasteel{
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -122,9 +126,10 @@
/area/hangar)
"aP" = (
/obj/effect/landmark/outpost/hangar_numbers,
-/turf/open/floor/plasteel{
- planetary_atmos = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
},
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aQ" = (
/obj/effect/turf_decal/trimline/opaque/yellow/warning{
@@ -154,12 +159,10 @@
},
/area/hangar)
"aY" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel{
- planetary_atmos = 1
- },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aZ" = (
/obj/machinery/door/airlock,
@@ -167,14 +170,135 @@
/obj/structure/lattice/catwalk,
/turf/open/floor/engine,
/area/hangar)
+"fM" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"hX" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"iR" = (
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
"jY" = (
/turf/open/floor/plasteel/elevatorshaft{
planetary_atmos = 1
},
/area/hangar)
+"kN" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"mS" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"qA" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"wm" = (
+/obj/machinery/computer/hydrogen_exchange,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"xH" = (
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"yn" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
"BE" = (
-/obj/machinery/atmospherics/pipe/simple/general,
-/turf/closed/indestructible/reinforced,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Ev" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Fb" = (
+/obj/structure/railing/corner{
+ dir = 1;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Fj" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Fm" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Hs" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"HB" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
/area/hangar)
"JI" = (
/obj/effect/landmark/outpost/elevator,
@@ -182,6 +306,72 @@
planetary_atmos = 1
},
/area/hangar)
+"KC" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ol" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "101"
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Pk" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"PN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"RL" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Se" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Wc" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"XA" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"XZ" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
(1,1,1) = {"
au
@@ -295,7 +485,7 @@ au
au
aa
aT
-aT
+Se
ah
at
at
@@ -338,7 +528,7 @@ as
at
at
ab
-aT
+Se
aT
aa
"}
@@ -348,7 +538,7 @@ au
au
aa
aT
-aT
+Se
ah
aQ
aQ
@@ -391,7 +581,7 @@ aQ
aQ
aQ
ab
-aT
+Se
aT
aa
"}
@@ -401,7 +591,7 @@ au
au
aa
aT
-aT
+Se
ah
aF
aF
@@ -444,7 +634,7 @@ aF
aF
aH
ab
-aT
+Se
aT
aa
"}
@@ -454,7 +644,7 @@ au
au
aa
aT
-aT
+Se
ah
aF
aF
@@ -497,7 +687,7 @@ aF
aF
aF
ab
-aT
+Se
aT
aa
"}
@@ -507,7 +697,7 @@ au
au
aa
aT
-ay
+Se
ah
ac
aF
@@ -550,7 +740,7 @@ aF
aF
ac
ab
-ay
+Se
aT
aa
"}
@@ -560,8 +750,8 @@ au
au
aa
aT
-aT
-ah
+hX
+Ev
aF
aF
aF
@@ -602,8 +792,8 @@ aF
aF
aF
aF
-ab
-aT
+XZ
+KC
aT
aa
"}
@@ -613,7 +803,7 @@ au
au
aa
aT
-aT
+ay
ax
aF
aF
@@ -656,7 +846,7 @@ aF
aF
aF
ak
-aT
+fM
aT
aa
"}
@@ -666,7 +856,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -709,7 +899,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -719,7 +909,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -762,7 +952,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -815,7 +1005,7 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
@@ -825,7 +1015,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -868,7 +1058,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -878,7 +1068,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -921,7 +1111,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -931,7 +1121,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -974,7 +1164,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -984,7 +1174,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1027,7 +1217,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1080,7 +1270,7 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
@@ -1090,7 +1280,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1133,7 +1323,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1143,7 +1333,7 @@ au
au
aa
aT
-aT
+ay
ax
aF
aF
@@ -1186,7 +1376,7 @@ aF
aF
aF
ak
-aT
+fM
aT
aa
"}
@@ -1196,7 +1386,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1239,7 +1429,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1249,7 +1439,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1292,7 +1482,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1345,7 +1535,7 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
@@ -1355,7 +1545,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1398,7 +1588,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1408,8 +1598,8 @@ au
au
aa
aT
-aT
-ah
+HB
+Ev
aF
aF
aF
@@ -1450,8 +1640,8 @@ aF
aF
aF
aF
-ab
-aT
+XZ
+RL
aT
aa
"}
@@ -1461,7 +1651,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1504,7 +1694,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1514,7 +1704,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1557,7 +1747,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1610,7 +1800,7 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
@@ -1620,7 +1810,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1663,7 +1853,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1673,7 +1863,7 @@ au
au
aa
aT
-aT
+ay
ax
aF
aF
@@ -1716,7 +1906,7 @@ aF
aF
aF
ak
-aT
+fM
aT
aa
"}
@@ -1726,7 +1916,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1769,7 +1959,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1779,7 +1969,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1822,7 +2012,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1875,7 +2065,7 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
@@ -1885,7 +2075,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1928,7 +2118,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1938,7 +2128,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -1981,7 +2171,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -1991,7 +2181,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -2034,7 +2224,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -2044,7 +2234,7 @@ au
au
aa
aT
-aT
+ay
ah
aF
aF
@@ -2087,7 +2277,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -2140,17 +2330,17 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
(38,1,1) = {"
au
au
-au
aa
-aT
-aT
+aa
+kN
+ay
ah
aF
aF
@@ -2193,17 +2383,17 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
(39,1,1) = {"
-au
-au
-au
aa
-aT
-aT
+aa
+aa
+xH
+aY
+ay
ax
aF
aF
@@ -2246,17 +2436,17 @@ aF
aF
aF
ak
-aT
+fM
aT
aa
"}
(40,1,1) = {"
-au
-au
-au
aa
-aT
-aT
+Ol
+Pk
+Fj
+Fb
+ay
ah
aF
aF
@@ -2299,18 +2489,18 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
(41,1,1) = {"
-au
-au
-au
aa
-aT
-aT
-ah
+aa
+wm
+HB
+aw
+mS
+Ev
aF
aF
aF
@@ -2351,17 +2541,17 @@ aF
aF
aF
aF
-ab
-aT
+XZ
+RL
aT
aa
"}
(42,1,1) = {"
au
-au
-au
aa
-aT
+qA
+iR
+Fm
ay
ah
ac
@@ -2405,17 +2595,17 @@ aF
aF
ac
ab
-ay
+fM
aT
aa
"}
(43,1,1) = {"
au
-au
-au
+aa
+aa
BE
aY
-aT
+XA
ah
aF
aF
@@ -2458,7 +2648,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -2511,7 +2701,7 @@ aF
aF
aF
ab
-aT
+fM
aT
aa
"}
@@ -2521,7 +2711,7 @@ jY
jY
JI
aZ
-aT
+Wc
aC
ag
ag
@@ -2535,6 +2725,7 @@ ag
ag
ag
ag
+yn
ag
ag
ag
@@ -2549,8 +2740,7 @@ ag
ag
ag
ag
-ag
-ag
+yn
ag
ag
ag
@@ -2564,7 +2754,7 @@ ag
ag
ag
aX
-aT
+fM
aT
aa
"}
@@ -2575,49 +2765,49 @@ jY
jY
aZ
aP
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
aw
-aT
-aT
-aT
-aT
+aw
+aw
+aw
+aw
+aw
+Hs
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+Hs
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+PN
aT
aa
"}
@@ -2627,7 +2817,7 @@ jY
jY
jY
aZ
-aT
+Pk
aT
aS
aT
diff --git a/_maps/outpost/hangar/indie_space_56x20.dmm b/_maps/outpost/hangar/indie_space_56x20.dmm
index 93842d2587a5..ad3aeb33fe8a 100644
--- a/_maps/outpost/hangar/indie_space_56x20.dmm
+++ b/_maps/outpost/hangar/indie_space_56x20.dmm
@@ -17,6 +17,12 @@
"ag" = (
/turf/closed/indestructible/reinforced,
/area/hangar)
+"ah" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
"ai" = (
/obj/effect/turf_decal/arrows{
dir = 1
@@ -65,7 +71,11 @@
pixel_y = 25
},
/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -78,18 +88,17 @@
},
/area/hangar)
"ay" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel{
- planetary_atmos = 1
- },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aB" = (
/obj/effect/landmark/outpost/hangar_numbers,
-/turf/open/floor/plasteel{
- planetary_atmos = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
},
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"aC" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
@@ -100,10 +109,9 @@
},
/area/hangar)
"aD" = (
-/obj/effect/turf_decal/arrows{
- dir = 1
- },
-/turf/open/floor/plasteel{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -116,10 +124,11 @@
},
/area/hangar)
"aG" = (
-/obj/effect/turf_decal/arrows{
- dir = 4
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
},
-/turf/open/floor/plasteel{
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -173,14 +182,167 @@
planetary_atmos = 1
},
/area/hangar)
+"lA" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"mV" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
"mX" = (
/turf/open/floor/plasteel/elevatorshaft{
planetary_atmos = 1
},
/area/hangar)
+"pt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"qG" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"rb" = (
+/obj/structure/railing/corner{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"st" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
"vM" = (
-/obj/machinery/atmospherics/pipe/simple/general,
-/turf/closed/indestructible/reinforced,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"wb" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"xG" = (
+/obj/machinery/computer/hydrogen_exchange,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"DF" = (
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"EZ" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"GM" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "101"
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Jt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ld" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"MY" = (
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Td" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"TZ" = (
+/obj/structure/railing/corner{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Ua" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ud" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"UF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"WZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
/area/hangar)
(1,1,1) = {"
@@ -255,7 +417,7 @@ aZ
aZ
ag
an
-an
+pt
aJ
ae
ae
@@ -278,7 +440,7 @@ ai
ae
ae
aC
-an
+pt
an
ag
"}
@@ -288,7 +450,7 @@ aZ
aZ
ag
an
-an
+pt
aJ
ax
ax
@@ -311,7 +473,7 @@ ax
ax
ax
aC
-an
+pt
an
ag
"}
@@ -321,7 +483,7 @@ aZ
aZ
ag
an
-an
+pt
aJ
aN
aN
@@ -344,7 +506,7 @@ aN
aN
af
aC
-an
+pt
an
ag
"}
@@ -354,7 +516,7 @@ aZ
aZ
ag
an
-an
+pt
aJ
aN
aN
@@ -377,7 +539,7 @@ aN
aN
aN
aC
-an
+pt
an
ag
"}
@@ -387,7 +549,7 @@ aZ
aZ
ag
an
-aG
+pt
aJ
al
aN
@@ -410,7 +572,7 @@ aN
aN
al
aC
-aG
+pt
an
ag
"}
@@ -420,8 +582,8 @@ aZ
aZ
ag
an
-an
-aJ
+st
+qG
aN
aN
aN
@@ -442,8 +604,8 @@ aN
aN
aN
aN
-aC
-an
+Ud
+Ua
an
ag
"}
@@ -453,7 +615,7 @@ aZ
aZ
ag
an
-an
+Jt
aI
aN
aN
@@ -476,7 +638,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -486,7 +648,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -509,7 +671,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -519,7 +681,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -542,7 +704,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -552,7 +714,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -575,7 +737,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -585,7 +747,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -608,7 +770,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -618,7 +780,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -641,7 +803,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -651,7 +813,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -674,7 +836,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -684,7 +846,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -707,7 +869,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -717,7 +879,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -740,7 +902,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -750,7 +912,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -773,7 +935,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -783,7 +945,7 @@ aZ
aZ
ag
an
-an
+Jt
aI
aN
aN
@@ -806,7 +968,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -816,7 +978,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -839,7 +1001,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -849,7 +1011,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -872,7 +1034,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -882,7 +1044,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -905,7 +1067,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -915,7 +1077,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -938,7 +1100,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -948,7 +1110,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -971,7 +1133,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -981,7 +1143,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1004,7 +1166,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1014,7 +1176,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1037,7 +1199,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1048,7 +1210,7 @@ aZ
ag
an
aG
-aJ
+qG
al
aN
aN
@@ -1069,8 +1231,8 @@ aN
aN
aN
al
-aC
-aG
+Ud
+UF
an
ag
"}
@@ -1080,7 +1242,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1103,7 +1265,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1113,7 +1275,7 @@ aZ
aZ
ag
an
-an
+Jt
aI
aN
aN
@@ -1136,7 +1298,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -1146,7 +1308,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1169,7 +1331,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1179,7 +1341,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1202,7 +1364,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1212,7 +1374,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -1235,7 +1397,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -1245,7 +1407,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1268,7 +1430,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1278,7 +1440,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1301,7 +1463,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1311,7 +1473,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1334,7 +1496,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1344,7 +1506,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1367,7 +1529,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1377,7 +1539,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -1400,7 +1562,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -1410,7 +1572,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1433,7 +1595,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1443,7 +1605,7 @@ aZ
aZ
ag
an
-an
+Jt
aI
aN
aN
@@ -1466,7 +1628,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -1476,7 +1638,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1499,7 +1661,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1509,8 +1671,8 @@ aZ
aZ
ag
an
-an
-aJ
+aG
+qG
aN
aN
aN
@@ -1531,8 +1693,8 @@ aN
aN
aN
aN
-aC
-an
+Ud
+UF
an
ag
"}
@@ -1542,7 +1704,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -1565,7 +1727,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -1575,7 +1737,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1598,7 +1760,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1608,7 +1770,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1631,7 +1793,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1641,7 +1803,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1664,7 +1826,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1674,7 +1836,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1697,7 +1859,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1707,7 +1869,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -1730,7 +1892,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -1740,7 +1902,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1763,7 +1925,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1773,7 +1935,7 @@ aZ
aZ
ag
an
-an
+Jt
aI
aN
aN
@@ -1796,7 +1958,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -1806,7 +1968,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1829,7 +1991,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1839,7 +2001,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1862,7 +2024,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -1872,7 +2034,7 @@ aZ
aZ
ag
an
-aG
+Jt
aJ
al
aN
@@ -1895,7 +2057,7 @@ aN
aN
al
aC
-aG
+Jt
an
ag
"}
@@ -1905,7 +2067,7 @@ aZ
aZ
ag
an
-an
+Jt
aJ
aN
aN
@@ -1928,17 +2090,17 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
(54,1,1) = {"
aZ
aZ
-aZ
ag
-an
-an
+ag
+rb
+Jt
aJ
aN
aN
@@ -1961,17 +2123,17 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
(55,1,1) = {"
-aZ
-aZ
-aZ
ag
-an
-an
+ag
+ag
+MY
+ay
+Jt
aJ
aN
aN
@@ -1994,17 +2156,17 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
(56,1,1) = {"
-aZ
-aZ
-aZ
ag
-an
-an
+GM
+mV
+Td
+EZ
+Jt
aJ
aN
aN
@@ -2027,18 +2189,18 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
(57,1,1) = {"
-aZ
-aZ
-aZ
ag
-an
+ag
+xG
aG
-aJ
+aD
+Ld
+qG
al
aN
aN
@@ -2059,18 +2221,18 @@ aN
aN
aN
al
-aC
-aG
+Ud
+UF
an
ag
"}
(58,1,1) = {"
aZ
-aZ
-aZ
ag
-an
-an
+wb
+DF
+TZ
+Jt
aJ
aN
aN
@@ -2093,17 +2255,17 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
(59,1,1) = {"
aZ
-aZ
-aZ
+ag
+ag
vM
ay
-an
+WZ
aI
aN
aN
@@ -2126,7 +2288,7 @@ aN
aN
aN
aK
-an
+Jt
an
ag
"}
@@ -2159,7 +2321,7 @@ aN
aN
aN
aC
-an
+Jt
an
ag
"}
@@ -2169,7 +2331,7 @@ mX
mX
jJ
aj
-an
+ah
ap
aE
aE
@@ -2192,7 +2354,7 @@ aE
aE
aE
am
-an
+Jt
an
ag
"}
@@ -2203,29 +2365,29 @@ mX
mX
aj
aB
-an
-an
-an
aD
-an
-an
-an
-an
aD
-an
-an
-an
-an
aD
-an
-an
-an
-an
aD
-an
-an
-an
-an
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+aD
+lA
an
ag
"}
@@ -2235,7 +2397,7 @@ mX
mX
mX
aj
-an
+mV
an
an
aP
diff --git a/_maps/outpost/hangar/indie_space_56x40.dmm b/_maps/outpost/hangar/indie_space_56x40.dmm
index 4adf317b8435..f2c909c23aaf 100644
--- a/_maps/outpost/hangar/indie_space_56x40.dmm
+++ b/_maps/outpost/hangar/indie_space_56x40.dmm
@@ -4,7 +4,11 @@
pixel_y = 25
},
/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -48,17 +52,16 @@
/area/hangar)
"ar" = (
/obj/effect/landmark/outpost/hangar_numbers,
-/turf/open/floor/plasteel{
- planetary_atmos = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
},
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"at" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
+/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel{
- planetary_atmos = 1
- },
+/turf/open/floor/plasteel/tech/techmaint,
/area/hangar)
"au" = (
/obj/machinery/light/floor/hangar,
@@ -82,10 +85,8 @@
},
/area/hangar)
"aD" = (
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/turf/open/floor/plasteel{
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
@@ -161,21 +162,172 @@
/turf/template_noop,
/area/template_noop)
"aZ" = (
-/obj/effect/turf_decal/arrows{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ck" = (
+/turf/open/floor/plasteel/elevatorshaft{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"cR" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 1
},
+/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel{
planetary_atmos = 1
},
/area/hangar)
-"ck" = (
-/turf/open/floor/plasteel/elevatorshaft{
+"ec" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"el" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ho" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ik" = (
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"il" = (
+/obj/machinery/computer/hydrogen_exchange,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"mh" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"mP" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"qn" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"uh" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/warning/nosmoking/burnt{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"vi" = (
+/obj/structure/railing/corner{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"vl" = (
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"vq" = (
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"zp" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"AN" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"GH" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Hd" = (
+/obj/structure/railing/corner{
+ dir = 1;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Lx" = (
+/obj/structure/railing/corner{
+ dir = 4;
+ layer = 4.1
+ },
+/turf/open/floor/plasteel{
planetary_atmos = 1
},
/area/hangar)
"MN" = (
-/obj/machinery/atmospherics/pipe/simple/general,
-/turf/closed/indestructible/reinforced,
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"NB" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
/area/hangar)
"Qi" = (
/obj/effect/landmark/outpost/elevator,
@@ -183,6 +335,37 @@
planetary_atmos = 1
},
/area/hangar)
+"Sw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"SV" = (
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/hangar)
+"Tt" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel{
+ planetary_atmos = 1
+ },
+/area/hangar)
+"WQ" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "101"
+ },
+/turf/open/floor/plating{
+ planetary_atmos = 1
+ },
+/area/hangar)
(1,1,1) = {"
aV
@@ -296,7 +479,7 @@ aV
aV
aH
aN
-aN
+aD
aP
aG
aG
@@ -339,7 +522,7 @@ aw
aG
aG
aT
-aN
+aD
aN
aH
"}
@@ -349,7 +532,7 @@ aV
aV
aH
aN
-aN
+aD
aP
ai
ai
@@ -392,7 +575,7 @@ ai
ai
ai
aT
-aN
+aD
aN
aH
"}
@@ -402,7 +585,7 @@ aV
aV
aH
aN
-aN
+aD
aP
aM
aM
@@ -445,7 +628,7 @@ aM
aM
aj
aT
-aN
+aD
aN
aH
"}
@@ -455,7 +638,7 @@ aV
aV
aH
aN
-aN
+aD
aP
aM
aM
@@ -498,7 +681,7 @@ aM
aM
aM
aT
-aN
+aD
aN
aH
"}
@@ -561,8 +744,8 @@ aV
aV
aH
aN
-aN
-aP
+el
+Tt
aM
aM
aM
@@ -603,8 +786,8 @@ aM
aM
aM
aM
-aT
-aN
+cR
+zp
aN
aH
"}
@@ -614,7 +797,7 @@ aV
aV
aH
aN
-aN
+qn
am
aM
aM
@@ -657,7 +840,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -667,7 +850,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -710,7 +893,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -720,7 +903,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -763,7 +946,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -773,7 +956,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -816,7 +999,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -826,7 +1009,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -869,7 +1052,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -879,7 +1062,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -922,7 +1105,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -932,7 +1115,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -975,7 +1158,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -985,7 +1168,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1028,7 +1211,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1038,7 +1221,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -1081,7 +1264,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -1091,7 +1274,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1134,7 +1317,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1144,7 +1327,7 @@ aV
aV
aH
aN
-aN
+qn
am
aM
aM
@@ -1187,7 +1370,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -1197,7 +1380,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1240,7 +1423,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1250,7 +1433,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1293,7 +1476,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1303,7 +1486,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -1346,7 +1529,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -1356,7 +1539,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1399,7 +1582,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1409,7 +1592,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1452,7 +1635,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1462,7 +1645,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1505,7 +1688,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1515,7 +1698,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1558,7 +1741,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1568,8 +1751,8 @@ aV
aV
aH
aN
-aD
-aP
+Sw
+Tt
aE
aM
aM
@@ -1610,8 +1793,8 @@ aM
aM
aM
aE
-aT
-aD
+cR
+mh
aN
aH
"}
@@ -1621,7 +1804,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1664,7 +1847,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1674,7 +1857,7 @@ aV
aV
aH
aN
-aN
+qn
am
aM
aM
@@ -1717,7 +1900,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -1727,7 +1910,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1770,7 +1953,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1780,7 +1963,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1823,7 +2006,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1833,7 +2016,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -1876,7 +2059,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -1886,7 +2069,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1929,7 +2112,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1939,7 +2122,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -1982,7 +2165,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -1992,7 +2175,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2035,7 +2218,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2045,7 +2228,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2088,7 +2271,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2098,7 +2281,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -2141,7 +2324,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -2151,7 +2334,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2194,7 +2377,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2204,7 +2387,7 @@ aV
aV
aH
aN
-aN
+qn
am
aM
aM
@@ -2247,7 +2430,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -2257,7 +2440,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2300,7 +2483,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2310,8 +2493,8 @@ aV
aV
aH
aN
-aN
-aP
+Sw
+Tt
aM
aM
aM
@@ -2352,8 +2535,8 @@ aM
aM
aM
aM
-aT
-aN
+cR
+mh
aN
aH
"}
@@ -2363,7 +2546,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -2406,7 +2589,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -2416,7 +2599,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2459,7 +2642,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2469,7 +2652,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2512,7 +2695,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2522,7 +2705,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2565,7 +2748,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2575,7 +2758,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2618,7 +2801,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2628,7 +2811,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -2671,7 +2854,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -2681,7 +2864,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2724,7 +2907,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2734,7 +2917,7 @@ aV
aV
aH
aN
-aN
+qn
am
aM
aM
@@ -2777,7 +2960,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -2787,7 +2970,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2830,7 +3013,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2840,7 +3023,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2883,7 +3066,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -2893,7 +3076,7 @@ aV
aV
aH
aN
-aD
+qn
aP
aE
aM
@@ -2936,7 +3119,7 @@ aM
aM
aE
aT
-aD
+qn
aN
aH
"}
@@ -2946,7 +3129,7 @@ aV
aV
aH
aN
-aN
+qn
aP
aM
aM
@@ -2989,17 +3172,17 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
(54,1,1) = {"
aV
aV
-aV
aH
-aN
-aN
+aH
+Lx
+qn
aP
aM
aM
@@ -3042,17 +3225,17 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
(55,1,1) = {"
-aV
-aV
-aV
aH
-aN
-aN
+aH
+aH
+SV
+at
+qn
aP
aM
aM
@@ -3095,17 +3278,17 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
(56,1,1) = {"
-aV
-aV
-aV
aH
-aN
-aN
+WQ
+vq
+ik
+Hd
+qn
aP
aM
aM
@@ -3148,18 +3331,18 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
(57,1,1) = {"
-aV
-aV
-aV
aH
-aN
-aD
-aP
+aH
+il
+Sw
+aZ
+ho
+Tt
aE
aM
aM
@@ -3200,18 +3383,18 @@ aM
aM
aM
aE
-aT
-aD
+cR
+mh
aN
aH
"}
(58,1,1) = {"
aV
-aV
-aV
aH
-aN
-aN
+uh
+vl
+vi
+qn
aP
aM
aM
@@ -3254,17 +3437,17 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
(59,1,1) = {"
aV
-aV
-aV
+aH
+aH
MN
at
-aN
+GH
am
aM
aM
@@ -3307,7 +3490,7 @@ aM
aM
aM
ao
-aN
+qn
aN
aH
"}
@@ -3360,7 +3543,7 @@ aM
aM
aM
aT
-aN
+qn
aN
aH
"}
@@ -3370,7 +3553,7 @@ ck
ck
Qi
aA
-aN
+AN
aK
aO
aO
@@ -3384,6 +3567,7 @@ aO
aO
aO
aO
+ec
aO
aO
aO
@@ -3398,8 +3582,7 @@ aO
aO
aO
aO
-aO
-aO
+ec
aO
aO
aO
@@ -3413,7 +3596,7 @@ aO
aO
aO
aI
-aN
+qn
aN
aH
"}
@@ -3424,49 +3607,49 @@ ck
ck
aA
ar
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
aZ
-aN
-aN
-aN
-aN
+aZ
+aZ
+aZ
+aZ
+aZ
+mP
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+mP
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+NB
aN
aH
"}
@@ -3476,7 +3659,7 @@ ck
ck
ck
aA
-aN
+vq
aN
au
aN
diff --git a/_maps/outpost/hangar/nt_ice_20x20.dmm b/_maps/outpost/hangar/nt_ice_20x20.dmm
index ec7577ab620f..06e76cbe6b5b 100644
--- a/_maps/outpost/hangar/nt_ice_20x20.dmm
+++ b/_maps/outpost/hangar/nt_ice_20x20.dmm
@@ -191,6 +191,31 @@
planetary_atmos = 1
},
/area/hangar)
+"bv" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"bw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"bA" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -264,6 +289,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -280,6 +306,17 @@
planetary_atmos = 1
},
/area/hangar)
+"ee" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"fb" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -289,6 +326,15 @@
planetary_atmos = 1
},
/area/hangar)
+"fT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"gy" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -350,6 +396,49 @@
light_range = 2
},
/area/hangar)
+"iT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ka" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"kq" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"me" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -359,6 +448,20 @@
planetary_atmos = 1
},
/area/hangar)
+"mz" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"mR" = (
/obj/machinery/door/airlock/outpost,
/turf/open/floor/plasteel/tech,
@@ -374,6 +477,18 @@
planetary_atmos = 1
},
/area/hangar)
+"nI" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"nK" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -399,6 +514,20 @@
light_range = 2
},
/area/hangar)
+"om" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"oA" = (
+/obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"oE" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -444,6 +573,26 @@
planetary_atmos = 1
},
/area/hangar)
+"qk" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/machinery/computer/hydrogen_exchange{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"qV" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"rj" = (
/turf/open/floor/plating/asteroid/snow/temperatre{
light_color = "#1B1D2E";
@@ -469,6 +618,15 @@
planetary_atmos = 1
},
/area/hangar)
+"sd" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/item/toy/plush/moth/firewatch{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"sV" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/industrial/outline/yellow,
@@ -481,6 +639,18 @@
},
/turf/open/floor/plasteel/dark,
/area/hangar)
+"tt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ui" = (
/obj/effect/turf_decal/borderfloor{
dir = 10
@@ -514,6 +684,25 @@
planetary_atmos = 1
},
/area/hangar)
+"xv" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"xB" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -549,6 +738,32 @@
planetary_atmos = 1
},
/area/hangar)
+"yE" = (
+/obj/structure/flora/grass/both,
+/obj/item/trash/candy{
+ pixel_x = 4;
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"zs" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/floor{
+ bulb_power = 0.75
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Aj" = (
/obj/effect/turf_decal/borderfloor/corner,
/obj/effect/turf_decal/siding/white{
@@ -563,6 +778,44 @@
planetary_atmos = 1
},
/area/hangar)
+"AE" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"AI" = (
+/obj/structure/flora/grass/green,
+/obj/item/trash/energybar{
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Bw" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"De" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Dh" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -575,6 +828,29 @@
planetary_atmos = 1
},
/area/hangar)
+"Dq" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pressure_valve,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"DK" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"ES" = (
/obj/effect/turf_decal/borderfloor{
dir = 6
@@ -604,6 +880,18 @@
planetary_atmos = 1
},
/area/hangar)
+"Fn" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"FM" = (
/obj/effect/turf_decal/siding/white{
dir = 10
@@ -625,6 +913,7 @@
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
@@ -663,6 +952,20 @@
light_range = 2
},
/area/hangar)
+"HG" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Iz" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -693,12 +996,29 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
planetary_atmos = 1
},
/area/hangar)
+"JD" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"JU" = (
/obj/effect/turf_decal/siding/white{
dir = 8
@@ -718,6 +1038,17 @@
planetary_atmos = 1
},
/area/hangar)
+"Kw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"KC" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/oil,
@@ -738,6 +1069,37 @@
light_range = 2
},
/area/hangar)
+"Lu" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Lz" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"MI" = (
/obj/structure/flora/grass/both,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -768,11 +1130,23 @@
/obj/effect/turf_decal/siding/white{
dir = 1
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"NH" = (
+/obj/effect/turf_decal/borderfloor{
dir = 1
},
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel/patterned/brushed{
light_color = "#1B1D2E";
light_range = 2;
@@ -802,6 +1176,36 @@
planetary_atmos = 1
},
/area/hangar)
+"PI" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"PL" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Qb" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -914,6 +1318,44 @@
},
/turf/open/floor/plasteel/tech,
/area/hangar)
+"TU" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north{
+ pixel_x = -6;
+ bulb_power = 0.25
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"TX" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Ul" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -942,6 +1384,19 @@
planetary_atmos = 1
},
/area/hangar)
+"UZ" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Vk" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -971,6 +1426,20 @@
planetary_atmos = 1
},
/area/hangar)
+"WY" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Xd" = (
/obj/effect/turf_decal/siding/white{
dir = 8
@@ -987,6 +1456,17 @@
planetary_atmos = 1
},
/area/hangar)
+"Xt" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"XC" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -1017,6 +1497,33 @@
light_range = 2
},
/area/hangar)
+"Yt" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Yu" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"YN" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -1051,6 +1558,18 @@
planetary_atmos = 1
},
/area/hangar)
+"Zc" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Ze" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -1061,6 +1580,18 @@
planetary_atmos = 1
},
/area/hangar)
+"Zf" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Zi" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
@@ -1303,7 +1834,7 @@ rj
rj
MI
rj
-rj
+DK
rj
MI
rj
@@ -1316,7 +1847,7 @@ rj
rj
MN
rj
-rj
+DK
rj
rj
rj
@@ -1341,7 +1872,7 @@ rj
rj
rj
rj
-rj
+DK
rj
rj
rj
@@ -1350,7 +1881,7 @@ rj
rj
MN
rj
-rj
+DK
rj
MI
rj
@@ -1473,7 +2004,7 @@ TA
rj
rj
rj
-rj
+DK
rj
rj
rj
@@ -1522,7 +2053,7 @@ rj
rj
rj
rj
-rj
+DK
MI
rj
rj
@@ -1714,7 +2245,7 @@ ac
ac
aM
MN
-rj
+GX
aC
rQ
av
@@ -1755,8 +2286,8 @@ am
am
am
rj
-rj
-MI
+yE
+qk
Fi
ap
av
@@ -1794,14 +2325,14 @@ am
(18,1,1) = {"
am
hg
-hg
+sd
am
+MI
rj
-GX
-rj
-nr
-ap
-av
+Yu
+TX
+ee
+NH
aJ
aJ
aJ
@@ -1822,8 +2353,8 @@ aJ
aJ
aJ
aJ
-nr
-rQ
+De
+Fn
aT
MI
rj
@@ -1836,13 +2367,13 @@ am
(19,1,1) = {"
am
hg
-hg
+qV
am
-rj
-rj
-rj
+bv
+bv
+zs
Fi
-rQ
+tt
av
aJ
aJ
@@ -1865,7 +2396,7 @@ aJ
aJ
aJ
aO
-rQ
+Zc
nK
rj
rj
@@ -1878,13 +2409,13 @@ ac
(20,1,1) = {"
am
hg
-hg
-mR
-rj
-rj
-GX
-aC
-NO
+Bw
+oA
+om
+om
+Lz
+PL
+PI
av
aJ
aJ
@@ -1907,7 +2438,7 @@ aJ
aJ
aJ
nr
-rQ
+Zc
nK
rj
GX
@@ -1922,10 +2453,10 @@ am
hg
hg
am
-MI
-rj
-rj
-aC
+TU
+WY
+HG
+Yt
IG
av
aJ
@@ -1949,7 +2480,7 @@ aJ
aJ
aJ
nr
-NO
+Lu
nK
rj
rj
@@ -1964,10 +2495,10 @@ am
am
am
am
+AI
rj
-MN
-rj
-aC
+ka
+Dq
cI
av
ad
@@ -1991,7 +2522,7 @@ aJ
aJ
ad
nr
-NO
+Lu
nK
MI
rj
@@ -2007,10 +2538,10 @@ ac
ac
ac
rj
-GX
-MN
-aC
-NO
+rj
+JD
+nr
+PI
aT
aJ
aJ
@@ -2033,7 +2564,7 @@ aJ
aJ
aJ
nr
-NO
+Lu
nK
rj
GX
@@ -2049,10 +2580,10 @@ ac
ac
ac
rj
-rj
-rj
-aC
-NO
+MI
+xv
+mz
+PI
aT
aJ
aJ
@@ -2075,7 +2606,7 @@ aJ
aJ
aJ
nr
-NO
+Lu
uC
rj
rj
@@ -2091,10 +2622,10 @@ ac
ac
TA
rj
-MI
+GX
rj
-Fi
-rQ
+aC
+tt
aT
aJ
aJ
@@ -2117,7 +2648,7 @@ aJ
aJ
aJ
nr
-rQ
+Zc
TF
rj
MI
@@ -2134,9 +2665,9 @@ ac
rj
rj
rj
-MI
+rj
aC
-rQ
+tt
av
aJ
aJ
@@ -2159,7 +2690,7 @@ aJ
aJ
aJ
nr
-NO
+Lu
TF
rj
ac
@@ -2174,11 +2705,11 @@ ac
ac
ac
rj
-rj
+MN
rj
rj
aC
-rQ
+tt
av
ad
aJ
@@ -2201,7 +2732,7 @@ aJ
aJ
ad
aO
-ap
+kq
nK
MN
ac
@@ -2220,7 +2751,7 @@ rj
rj
GX
aC
-ap
+Kw
av
aJ
aJ
@@ -2243,7 +2774,7 @@ aJ
aJ
aJ
aO
-rQ
+Zc
nK
rj
ac
@@ -2262,7 +2793,7 @@ MI
rj
rj
aC
-ap
+Kw
av
aJ
aJ
@@ -2285,7 +2816,7 @@ aJ
aJ
aJ
aO
-rQ
+Zc
nK
MI
rj
@@ -2304,7 +2835,7 @@ rj
rj
rj
aC
-ap
+Kw
av
aJ
aJ
@@ -2327,7 +2858,7 @@ aJ
aJ
aJ
nr
-rQ
+Zc
nK
GX
rj
@@ -2346,7 +2877,7 @@ rj
MI
rj
aC
-ap
+Kw
av
aJ
aJ
@@ -2369,7 +2900,7 @@ aJ
aJ
aJ
nr
-NO
+Lu
nK
rj
rj
@@ -2388,7 +2919,7 @@ rj
GX
rj
aC
-rQ
+tt
aT
ad
aJ
@@ -2410,8 +2941,8 @@ aJ
aJ
aJ
ad
-nr
-NO
+De
+iT
nK
rj
MI
@@ -2430,8 +2961,8 @@ rj
MN
rj
Fi
-rQ
-aT
+Zf
+UZ
aJ
aJ
aJ
@@ -2453,7 +2984,7 @@ aJ
aJ
aJ
nr
-rQ
+Zc
nK
rj
GX
@@ -2472,7 +3003,7 @@ rj
rj
GX
Fi
-ap
+Kw
aT
aJ
aJ
@@ -2495,7 +3026,7 @@ ad
aJ
aJ
nr
-ap
+kq
nK
rj
rj
@@ -2514,7 +3045,7 @@ rj
rj
rj
aC
-ap
+Kw
SW
Qb
Qb
@@ -2537,7 +3068,7 @@ Qb
Qb
Qb
ES
-ap
+kq
nK
MI
TA
@@ -2556,30 +3087,30 @@ rj
MI
rj
aC
-hv
-ap
-NO
-rQ
-rQ
-rQ
-ap
-NO
-NO
-rQ
-rQ
-rQ
-FS
-ap
-rQ
-ap
-ap
-ap
-NO
-NO
-rQ
-ap
-ap
+Xt
+fT
+bw
+AE
+AE
+AE
+fT
+bw
+bw
+AE
+AE
+AE
FS
+fT
+AE
+fT
+fT
+fT
+bw
+bw
+AE
+fT
+fT
+nI
uC
rj
ac
diff --git a/_maps/outpost/hangar/nt_ice_40x20.dmm b/_maps/outpost/hangar/nt_ice_40x20.dmm
index a9066a1dcef2..defafdc3b085 100644
--- a/_maps/outpost/hangar/nt_ice_40x20.dmm
+++ b/_maps/outpost/hangar/nt_ice_40x20.dmm
@@ -242,6 +242,21 @@
planetary_atmos = 1
},
/area/hangar)
+"ca" = (
+/obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"cx" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"dA" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -281,6 +296,22 @@
planetary_atmos = 1
},
/area/hangar)
+"eg" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pressure_valve,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"es" = (
/obj/effect/decal/fakelattice,
/obj/machinery/light/small/directional/east,
@@ -339,6 +370,21 @@
planetary_atmos = 1
},
/area/hangar)
+"gk" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"hh" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -350,6 +396,15 @@
light_range = 2
},
/area/hangar)
+"hr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"hX" = (
/obj/effect/landmark/outpost/hangar_dock,
/turf/open/floor/plating{
@@ -387,6 +442,19 @@
light_range = 2
},
/area/hangar)
+"jm" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"jv" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -429,6 +497,10 @@
planetary_atmos = 1
},
/area/hangar)
+"ln" = (
+/obj/structure/flora/rock/pile/icy,
+/turf/open/floor/plating/asteroid/icerock/temperate,
+/area/hangar)
"lG" = (
/obj/effect/turf_decal/siding/white{
dir = 9
@@ -482,6 +554,48 @@
planetary_atmos = 1
},
/area/hangar)
+"mE" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"mM" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"nE" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ok" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"oA" = (
/obj/effect/turf_decal/borderfloor/corner{
dir = 1
@@ -530,6 +644,32 @@
planetary_atmos = 1
},
/area/hangar)
+"pn" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/floor{
+ bulb_power = 0.75
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"pu" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"pv" = (
/obj/structure/flora/grass/both,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -537,6 +677,20 @@
light_range = 2
},
/area/hangar)
+"pz" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"qa" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -681,12 +835,82 @@
planetary_atmos = 1
},
/area/hangar)
+"tW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"uk" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"us" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"uv" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"uK" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"wH" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -729,6 +953,19 @@
planetary_atmos = 1
},
/area/hangar)
+"yt" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"zT" = (
/obj/structure/flora/tree/dead,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -736,6 +973,19 @@
light_range = 2
},
/area/hangar)
+"Af" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"AN" = (
/obj/effect/turf_decal/borderfloor{
dir = 9
@@ -750,6 +1000,34 @@
planetary_atmos = 1
},
/area/hangar)
+"AY" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"Br" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Cg" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -760,6 +1038,31 @@
planetary_atmos = 1
},
/area/hangar)
+"CQ" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Db" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"DM" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -778,6 +1081,27 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/hangar)
+"EI" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"EJ" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -801,6 +1125,26 @@
planetary_atmos = 1
},
/area/hangar)
+"FO" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"FX" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -814,6 +1158,18 @@
planetary_atmos = 1
},
/area/hangar)
+"GG" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"GS" = (
/obj/effect/turf_decal/borderfloor{
dir = 5
@@ -828,15 +1184,45 @@
planetary_atmos = 1
},
/area/hangar)
+"Hw" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"HZ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Iv" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
},
/area/hangar)
+"IF" = (
+/obj/structure/flora/grass/both,
+/obj/item/trash/raisins{
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Jb" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -854,6 +1240,30 @@
planetary_atmos = 1
},
/area/hangar)
+"Je" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Jh" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Js" = (
/obj/effect/turf_decal/corner/opaque/neutral,
/obj/effect/turf_decal/siding/white{
@@ -939,6 +1349,50 @@
"MM" = (
/turf/open/floor/plasteel/tech,
/area/hangar)
+"MV" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"MY" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Nz" = (
+/obj/structure/flora/grass/green,
+/obj/item/trash/pistachios{
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"ON" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/item/toy/plush/moth/firewatch{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"OP" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -979,6 +1433,25 @@
planetary_atmos = 1
},
/area/hangar)
+"Rh" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"RU" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -992,6 +1465,13 @@
planetary_atmos = 1
},
/area/hangar)
+"Sb" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Sh" = (
/obj/effect/turf_decal/siding/white{
dir = 8
@@ -1024,6 +1504,12 @@
planetary_atmos = 1
},
/area/hangar)
+"Td" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"TX" = (
/obj/effect/decal/fakelattice,
/turf/open/floor/plasteel/elevatorshaft{
@@ -1034,6 +1520,37 @@
/obj/machinery/door/airlock/outpost,
/turf/open/floor/plasteel/tech,
/area/hangar)
+"UH" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"UU" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/machinery/computer/hydrogen_exchange{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Vs" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -1044,6 +1561,17 @@
planetary_atmos = 1
},
/area/hangar)
+"Wa" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Ww" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -1063,7 +1591,9 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -1091,6 +1621,49 @@
planetary_atmos = 1
},
/area/hangar)
+"XS" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"YG" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"YV" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north{
+ pixel_x = -6;
+ bulb_power = 0.25
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Zc" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -1121,6 +1694,20 @@
light_range = 2
},
/area/hangar)
+"Zl" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ZK" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -1354,7 +1941,7 @@ aO
as
aO
aO
-aO
+Sb
pv
aO
aO
@@ -1370,7 +1957,7 @@ aO
aO
as
aO
-aO
+Sb
aO
aO
aO
@@ -1405,7 +1992,7 @@ aO
as
aO
aO
-aO
+Sb
pv
aO
aO
@@ -1442,7 +2029,7 @@ aO
aO
aO
aO
-aO
+Sb
aO
aO
aO
@@ -1499,7 +2086,7 @@ aO
aO
aO
aO
-aO
+Sb
aO
aO
aO
@@ -1519,7 +2106,7 @@ aO
aO
as
aO
-aO
+Sb
aO
aO
aO
@@ -1529,7 +2116,7 @@ aO
aO
aO
aO
-aO
+Sb
aO
pv
aO
@@ -1854,8 +2441,8 @@ pv
aO
aO
aL
-aR
-DM
+YG
+uk
ae
ae
ae
@@ -1876,8 +2463,8 @@ ae
ae
ae
ae
-fQ
-WM
+yt
+MY
OP
aO
al
@@ -1896,7 +2483,7 @@ aO
aO
aO
aL
-rI
+nE
DM
ae
ae
@@ -1919,7 +2506,7 @@ ae
ae
ae
fQ
-aR
+Af
lQ
aO
aO
@@ -1938,7 +2525,7 @@ aY
aO
as
aL
-rI
+nE
DM
ae
ae
@@ -1961,7 +2548,7 @@ ae
ae
ae
rq
-am
+MV
OP
aO
aO
@@ -1980,7 +2567,7 @@ aw
al
aO
aL
-rI
+nE
DM
ae
ae
@@ -2003,7 +2590,7 @@ ae
ae
ae
rq
-am
+MV
OP
aO
pv
@@ -2022,7 +2609,7 @@ aY
aO
pv
aL
-rI
+nE
DM
aD
ae
@@ -2045,7 +2632,7 @@ ae
ae
aD
rq
-am
+MV
OP
aO
aO
@@ -2064,7 +2651,7 @@ aY
aO
aO
aL
-rI
+nE
DM
ae
ae
@@ -2087,7 +2674,7 @@ ae
ae
ae
rq
-am
+MV
OP
aO
aO
@@ -2106,7 +2693,7 @@ aY
wR
aO
Ww
-rI
+nE
DM
ae
ae
@@ -2129,7 +2716,7 @@ ae
ae
ae
rq
-am
+MV
OP
aO
al
@@ -2148,7 +2735,7 @@ aY
aY
aO
Ww
-rI
+nE
DM
ae
ae
@@ -2171,7 +2758,7 @@ ae
ae
ae
rq
-am
+MV
OP
aO
as
@@ -2190,7 +2777,7 @@ aY
aY
aO
Ww
-am
+mE
DM
ae
ae
@@ -2213,7 +2800,7 @@ ae
ae
ae
fQ
-am
+MV
OP
pv
aO
@@ -2232,7 +2819,7 @@ aY
pv
aO
Ww
-am
+mE
DM
aD
ae
@@ -2255,7 +2842,7 @@ ae
ae
aD
rq
-aR
+Af
OP
aO
aO
@@ -2274,7 +2861,7 @@ aY
aO
as
Ww
-am
+mE
DM
ae
ae
@@ -2297,7 +2884,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
al
@@ -2316,7 +2903,7 @@ aY
aO
al
aL
-am
+mE
DM
ae
ae
@@ -2339,7 +2926,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
aO
@@ -2358,7 +2945,7 @@ aY
aO
aO
aL
-am
+mE
DM
ae
ae
@@ -2381,7 +2968,7 @@ ae
ae
ae
rq
-rI
+GG
OP
aO
pv
@@ -2400,7 +2987,7 @@ aY
pv
aO
aL
-am
+mE
aM
ae
ae
@@ -2423,7 +3010,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
aO
@@ -2442,7 +3029,7 @@ aY
aO
aO
aL
-rI
+nE
aM
aD
ae
@@ -2465,7 +3052,7 @@ ae
ae
aD
rq
-rI
+GG
lQ
aO
aO
@@ -2480,11 +3067,11 @@ aY
aY
aY
aY
-aw
-as
+aY
+Nz
aO
aL
-rI
+nE
DM
ae
ae
@@ -2507,7 +3094,7 @@ ae
ae
ae
qa
-aR
+Af
lQ
aO
aO
@@ -2522,11 +3109,11 @@ ab
ab
ab
ab
+ln
aO
-aO
-pv
-rq
-rI
+UU
+Ww
+mE
DM
ae
ae
@@ -2549,7 +3136,7 @@ ae
ae
ae
rq
-rI
+GG
DM
aO
aO
@@ -2562,14 +3149,14 @@ ab
(35,1,1) = {"
ab
MM
-MM
+ON
ab
+pv
aO
-al
-aO
-aL
-rI
-DM
+gk
+FO
+HZ
+uk
ae
ae
ae
@@ -2590,8 +3177,8 @@ ae
ae
ae
ae
-rq
-rI
+XS
+Je
lQ
pv
aO
@@ -2604,13 +3191,13 @@ ab
(36,1,1) = {"
ab
MM
-MM
+Td
ab
-aO
-aO
-aO
-aL
-rI
+Zl
+Zl
+pn
+Ww
+nE
DM
ae
ae
@@ -2633,7 +3220,7 @@ ae
ae
ae
rq
-am
+MV
lQ
al
aO
@@ -2646,13 +3233,13 @@ aY
(37,1,1) = {"
ab
MM
-MM
-Uo
-aO
-aO
-al
-Ww
-am
+Hw
+ca
+mM
+mM
+uK
+UH
+WM
DM
aD
ae
@@ -2675,7 +3262,7 @@ ae
ae
aD
rq
-rI
+GG
lQ
aO
aO
@@ -2690,11 +3277,11 @@ ab
MM
MM
ab
-pv
-aO
-aO
-aL
-am
+YV
+uv
+Br
+CQ
+pz
DM
ae
ae
@@ -2717,7 +3304,7 @@ ae
ae
ae
rq
-rI
+GG
OP
aO
aO
@@ -2732,11 +3319,11 @@ ab
ab
ab
ab
-aO
as
aO
-Ww
-rI
+EI
+eg
+jm
DM
ae
ae
@@ -2759,7 +3346,7 @@ ae
ae
ae
fQ
-rI
+GG
lQ
pv
aO
@@ -2773,12 +3360,12 @@ aY
aY
aY
aY
-aY
+ln
aO
-al
-as
-aL
-aR
+aO
+AY
+rq
+WM
DM
ae
ae
@@ -2801,7 +3388,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
al
@@ -2817,9 +3404,9 @@ aY
aY
aY
aO
-aO
-aO
-aL
+IF
+Rh
+Jh
WM
DM
ae
@@ -2843,7 +3430,7 @@ ae
ae
ae
rq
-aR
+Af
lQ
aO
aO
@@ -2857,9 +3444,9 @@ aY
aY
aY
aY
-wR
aO
-pv
+aO
+al
aO
aL
wH
@@ -2885,7 +3472,7 @@ ae
ae
aD
rq
-aR
+Af
lQ
aO
pv
@@ -2902,9 +3489,9 @@ aY
aO
aO
aO
-pv
+as
aL
-aR
+WM
aM
ae
ae
@@ -2927,7 +3514,7 @@ ae
ae
ae
rq
-aR
+Af
lQ
aO
aY
@@ -2942,11 +3529,11 @@ aY
aY
aY
aO
-aO
+pv
aO
aO
aL
-aR
+WM
aM
ae
ae
@@ -2969,7 +3556,7 @@ ae
ae
ae
rq
-aR
+Af
OP
as
aY
@@ -2988,7 +3575,7 @@ aO
aO
al
Ww
-rI
+nE
aM
ae
ae
@@ -3011,7 +3598,7 @@ ae
ae
ae
rq
-rI
+GG
Sn
aO
aY
@@ -3026,11 +3613,11 @@ aY
aY
aw
aO
-pv
+al
aO
aO
aL
-rI
+nE
DM
ae
ae
@@ -3053,7 +3640,7 @@ ae
ae
ae
rq
-aR
+Af
Sn
pv
aO
@@ -3072,7 +3659,7 @@ aO
aO
aO
aL
-rI
+nE
DM
aD
ae
@@ -3095,7 +3682,7 @@ ae
ae
aD
fQ
-am
+MV
lQ
al
aO
@@ -3114,7 +3701,7 @@ aO
pv
aO
aL
-am
+mE
DM
ae
ae
@@ -3137,7 +3724,7 @@ ae
ae
ae
fQ
-rI
+GG
lQ
aO
aO
@@ -3156,7 +3743,7 @@ aO
al
aO
aL
-am
+mE
DM
ae
ae
@@ -3179,7 +3766,7 @@ ae
ae
ae
fQ
-rI
+GG
lQ
aO
pv
@@ -3198,7 +3785,7 @@ aO
as
aO
aL
-am
+mE
DM
ae
ae
@@ -3221,7 +3808,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
al
@@ -3240,7 +3827,7 @@ aO
aO
al
aL
-am
+mE
DM
ae
ae
@@ -3263,7 +3850,7 @@ ae
ae
ae
rq
-aR
+Af
lQ
aO
aO
@@ -3282,8 +3869,8 @@ aO
aO
aO
aL
-rI
-aM
+tW
+Db
aD
ae
ae
@@ -3304,8 +3891,8 @@ ae
ae
ae
aD
-rq
-aR
+XS
+Wa
lQ
pv
wR
@@ -3324,7 +3911,7 @@ aO
pv
aO
Ww
-rI
+nE
aM
ae
ae
@@ -3347,7 +3934,7 @@ ae
ae
ae
rq
-rI
+GG
lQ
aO
aY
@@ -3366,7 +3953,7 @@ aO
aO
aO
Ww
-am
+mE
aM
ae
ae
@@ -3389,7 +3976,7 @@ aD
ae
ae
rq
-am
+MV
lQ
as
aY
@@ -3408,7 +3995,7 @@ al
aO
aO
aL
-am
+mE
GS
af
af
@@ -3431,7 +4018,7 @@ af
af
af
mj
-am
+MV
lQ
pv
aY
@@ -3450,29 +4037,29 @@ pv
aO
aO
aL
-aU
-am
-aR
-rI
-rI
-rI
-am
-aR
-aR
-rI
-rI
-rI
-Iv
-am
-rI
-am
-am
-am
-aR
-aR
-rI
-am
-am
+pu
+hr
+us
+cx
+cx
+cx
+hr
+us
+us
+cx
+cx
+cx
+ok
+hr
+cx
+hr
+hr
+hr
+us
+us
+cx
+hr
+hr
Iv
OP
aO
diff --git a/_maps/outpost/hangar/nt_ice_40x40.dmm b/_maps/outpost/hangar/nt_ice_40x40.dmm
index f2f644dd7dda..62c3858641a5 100644
--- a/_maps/outpost/hangar/nt_ice_40x40.dmm
+++ b/_maps/outpost/hangar/nt_ice_40x40.dmm
@@ -168,6 +168,37 @@
planetary_atmos = 1
},
/area/hangar)
+"aJ" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north{
+ pixel_x = -6;
+ bulb_power = 0.25
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"aP" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"aQ" = (
/obj/structure/flora/rock/pile/icy,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -201,7 +232,9 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -212,6 +245,7 @@
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
@@ -258,6 +292,10 @@
planetary_atmos = 1
},
/area/hangar)
+"cG" = (
+/obj/structure/flora/rock/pile/icy,
+/turf/open/floor/plating/asteroid/icerock/temperate,
+/area/hangar)
"dQ" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/greenglow{
@@ -285,6 +323,17 @@
planetary_atmos = 1
},
/area/hangar)
+"eF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"eU" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -297,6 +346,17 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/tech,
/area/hangar)
+"fd" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"fJ" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 1
@@ -336,6 +396,30 @@
planetary_atmos = 1
},
/area/hangar)
+"gN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"hh" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"hr" = (
/obj/effect/turf_decal/borderfloor/corner{
dir = 8
@@ -406,6 +490,19 @@
planetary_atmos = 1
},
/area/hangar)
+"iY" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"jF" = (
/obj/effect/turf_decal/corner/opaque/neutral,
/obj/effect/turf_decal/siding/white,
@@ -457,6 +554,39 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/telecomms_floor,
/area/hangar)
+"lb" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"lg" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"lC" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -552,13 +682,32 @@
"pd" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning,
-/obj/structure/filingcabinet/double/grey,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
+/obj/structure/filingcabinet/double/grey{
+ dir = 8;
+ pixel_x = 7
+ },
/turf/open/floor/plating{
planetary_atmos = 1
},
/area/hangar)
+"qS" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"qW" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -583,6 +732,24 @@
planetary_atmos = 1
},
/area/hangar)
+"rY" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"so" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"sS" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -631,6 +798,32 @@
planetary_atmos = 1
},
/area/hangar)
+"tQ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"tR" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"um" = (
/obj/effect/turf_decal/borderfloor{
dir = 5
@@ -686,6 +879,66 @@
planetary_atmos = 1
},
/area/hangar)
+"xS" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ym" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/floor{
+ bulb_power = 0.75
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"yn" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"yw" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"yG" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -706,6 +959,48 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/telecomms_floor,
/area/hangar)
+"zS" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Au" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"AJ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"AO" = (
+/obj/structure/flora/grass/green,
+/obj/item/trash/chips{
+ layer = 2.8;
+ pixel_y = 3;
+ pixel_x = -2
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Bf" = (
/obj/structure/flora/tree/dead,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -713,6 +1008,18 @@
light_range = 2
},
/area/hangar)
+"Bj" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"BE" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -741,6 +1048,29 @@
planetary_atmos = 1
},
/area/hangar)
+"Ck" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"CC" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"CG" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -798,6 +1128,17 @@
light_range = 2
},
/area/hangar)
+"Fw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"FH" = (
/obj/effect/turf_decal/corner/opaque/neutral,
/obj/effect/turf_decal/siding/white{
@@ -839,6 +1180,30 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/telecomms_floor,
/area/hangar)
+"GW" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Hr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Hv" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/lamp{
@@ -891,6 +1256,36 @@
planetary_atmos = 1
},
/area/hangar)
+"Is" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"IH" = (
+/obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"Jt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"JI" = (
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating{
@@ -932,6 +1327,18 @@
light_range = 2
},
/area/hangar)
+"Ll" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Lt" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/vending/coffee,
@@ -966,6 +1373,12 @@
planetary_atmos = 1
},
/area/hangar)
+"Md" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Mm" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -976,6 +1389,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech,
/area/hangar)
+"Ms" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pressure_valve,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Mz" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -992,6 +1421,41 @@
planetary_atmos = 1
},
/area/hangar)
+"Nh" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"NG" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"NY" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -1116,6 +1580,15 @@
planetary_atmos = 1
},
/area/hangar)
+"Qk" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Qs" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -1160,6 +1633,20 @@
planetary_atmos = 1
},
/area/hangar)
+"Rr" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/machinery/computer/hydrogen_exchange{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Rx" = (
/obj/effect/turf_decal/borderfloor{
dir = 10
@@ -1173,12 +1660,27 @@
planetary_atmos = 1
},
/area/hangar)
+"RY" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Sf" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -1191,11 +1693,23 @@
/turf/open/floor/plasteel/elevatorshaft{
planetary_atmos = 1
},
-/area/hangar)
-"SC" = (
-/obj/machinery/light/floor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating{
+/area/hangar)
+"SC" = (
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Tj" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
light_color = "#1B1D2E";
light_range = 2;
planetary_atmos = 1
@@ -1266,6 +1780,37 @@
planetary_atmos = 1
},
/area/hangar)
+"UJ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"UR" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"VR" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -1355,6 +1900,56 @@
planetary_atmos = 1
},
/area/hangar)
+"Zr" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Zx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/item/toy/plush/moth/firewatch{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"ZN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ZP" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"ZW" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -1636,7 +2231,7 @@ ac
ac
ac
ac
-ac
+zS
ac
ac
ac
@@ -1650,7 +2245,7 @@ ac
ac
ac
ac
-ac
+zS
ac
ac
ac
@@ -1691,7 +2286,7 @@ aQ
ak
ac
ac
-ac
+zS
ac
ak
ac
@@ -1720,7 +2315,7 @@ ac
ac
ac
ac
-ac
+zS
ac
ak
ac
@@ -1953,7 +2548,7 @@ ac
ac
ak
ac
-ac
+zS
ac
ac
ac
@@ -2011,7 +2606,7 @@ ac
ac
ac
ac
-ac
+zS
ac
ac
ac
@@ -2028,7 +2623,7 @@ ac
ac
ac
ac
-ac
+zS
ac
ac
ab
@@ -2428,8 +3023,8 @@ ab
ac
ac
Rk
-hI
-au
+iY
+RY
ah
ah
ah
@@ -2470,8 +3065,8 @@ ah
ah
ah
ah
-ay
-aY
+xS
+hh
bQ
ac
aC
@@ -2490,7 +3085,7 @@ ac
ac
ac
Rk
-an
+Ll
au
ah
ah
@@ -2533,7 +3128,7 @@ ah
ah
ah
ay
-hI
+aP
ax
ac
ac
@@ -2552,7 +3147,7 @@ aT
ac
ak
Rk
-an
+Ll
au
ah
ah
@@ -2595,7 +3190,7 @@ ah
ah
ah
ag
-JI
+eF
bQ
ac
ac
@@ -2614,7 +3209,7 @@ as
aC
ac
Rk
-an
+Ll
au
ah
ah
@@ -2657,7 +3252,7 @@ ah
ah
ah
ag
-JI
+eF
bQ
ac
ab
@@ -2676,7 +3271,7 @@ aT
ac
ab
Rk
-an
+Ll
au
jY
ah
@@ -2719,7 +3314,7 @@ ah
ah
jY
ag
-JI
+eF
bQ
ac
ac
@@ -2738,7 +3333,7 @@ aT
ac
ac
Rk
-an
+Ll
au
ah
ah
@@ -2781,7 +3376,7 @@ ah
ah
ah
ag
-JI
+eF
bQ
ac
ac
@@ -2800,7 +3395,7 @@ aT
aQ
ac
Dd
-an
+Ll
au
ah
ah
@@ -2843,7 +3438,7 @@ ah
ah
ah
ag
-JI
+eF
bQ
ac
aC
@@ -2862,7 +3457,7 @@ aT
aT
ac
Dd
-an
+Ll
au
ah
ah
@@ -2905,7 +3500,7 @@ ah
ah
ah
ag
-JI
+eF
bQ
ac
ak
@@ -2924,7 +3519,7 @@ aT
aT
ac
Dd
-JI
+UJ
au
ah
ah
@@ -2967,7 +3562,7 @@ ah
ah
ah
ay
-JI
+eF
bQ
ab
ac
@@ -2986,7 +3581,7 @@ aT
ab
ac
Dd
-JI
+UJ
au
jY
ah
@@ -3029,7 +3624,7 @@ ah
ah
jY
ag
-hI
+aP
bQ
ac
ac
@@ -3048,7 +3643,7 @@ aT
ac
ak
Dd
-JI
+UJ
au
ah
ah
@@ -3091,7 +3686,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
aC
@@ -3110,7 +3705,7 @@ aT
ac
aC
Rk
-JI
+UJ
au
ah
ah
@@ -3153,7 +3748,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
ac
@@ -3172,7 +3767,7 @@ aT
ac
ac
Rk
-JI
+UJ
au
ah
ah
@@ -3215,7 +3810,7 @@ ah
ah
ah
ag
-an
+Au
bQ
ac
ab
@@ -3234,7 +3829,7 @@ aT
ab
ac
Rk
-JI
+UJ
at
ah
ah
@@ -3277,7 +3872,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
ac
@@ -3296,7 +3891,7 @@ aT
ac
ac
Rk
-an
+Ll
at
jY
ah
@@ -3339,7 +3934,7 @@ ah
ah
jY
ag
-an
+Au
ax
ac
ac
@@ -3354,11 +3949,11 @@ aT
aT
aT
aT
-as
-ak
+aT
ac
+ak
Rk
-an
+Ll
au
ah
ah
@@ -3401,7 +3996,7 @@ ah
ah
ah
lC
-hI
+aP
ax
ac
ac
@@ -3416,11 +4011,11 @@ aa
aa
aa
aa
+cG
ac
-ac
-ab
-ag
-an
+Rr
+Dd
+UJ
au
ah
ah
@@ -3463,7 +4058,7 @@ ah
ah
ah
ag
-an
+Au
au
ac
ac
@@ -3476,14 +4071,14 @@ aa
(35,1,1) = {"
aa
Yt
-Yt
+Zx
aa
+ab
ac
-aC
-ac
-Rk
-an
-au
+ZP
+UR
+Fw
+RY
ah
ah
ah
@@ -3524,8 +4119,8 @@ ah
ah
ah
ah
-ag
-an
+Tj
+gN
ax
ab
ac
@@ -3538,13 +4133,13 @@ aa
(36,1,1) = {"
aa
Yt
-Yt
+so
aa
-ac
-ac
-ac
-Rk
-an
+Tn
+Tn
+ym
+Dd
+Ll
au
ah
ah
@@ -3587,7 +4182,7 @@ ah
ah
ah
ag
-JI
+eF
ax
aC
ac
@@ -3600,13 +4195,13 @@ aT
(37,1,1) = {"
aa
Yt
-Yt
-HH
-ac
-ac
-aC
-Dd
-JI
+Md
+IH
+Qk
+Qk
+yw
+Zr
+aY
au
jY
ah
@@ -3649,7 +4244,7 @@ ah
ah
jY
ag
-an
+Au
ax
ac
ac
@@ -3664,11 +4259,11 @@ aa
Yt
Yt
aa
-ab
-ac
-ac
-Rk
-JI
+aJ
+lb
+Is
+Bj
+NG
au
ah
ah
@@ -3711,7 +4306,7 @@ ah
ah
ah
ag
-an
+Au
bQ
ac
ac
@@ -3727,10 +4322,10 @@ aa
aa
aa
ac
-ak
-ac
-Dd
-an
+AO
+Nh
+Ms
+CC
au
ah
ah
@@ -3773,7 +4368,7 @@ ah
ah
ah
ay
-an
+Au
ax
ab
ac
@@ -3789,10 +4384,10 @@ aT
aT
aT
ac
-aC
-ak
-Rk
-hI
+ac
+yn
+ag
+aY
au
ah
ah
@@ -3835,7 +4430,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
aC
@@ -3850,10 +4445,10 @@ aT
aT
aT
aT
+ab
ac
-ac
-ac
-Rk
+lg
+tR
aY
au
ah
@@ -3897,7 +4492,7 @@ ah
ah
ah
ag
-hI
+aP
ax
ac
ac
@@ -3913,7 +4508,7 @@ aT
aT
aQ
ac
-ab
+ac
ac
Rk
Sf
@@ -3959,7 +4554,7 @@ ah
ah
jY
ag
-hI
+aP
ax
ac
ab
@@ -3978,7 +4573,7 @@ ac
ac
ab
Rk
-hI
+aP
at
ah
ah
@@ -4021,7 +4616,7 @@ ah
ah
ah
ag
-hI
+aP
ax
ac
aT
@@ -4040,7 +4635,7 @@ aC
ac
ac
Rk
-hI
+aP
at
ah
ah
@@ -4083,7 +4678,7 @@ ah
ah
ah
ag
-hI
+aP
bQ
ak
aT
@@ -4102,7 +4697,7 @@ ac
ac
aC
Dd
-an
+Au
at
ah
ah
@@ -4145,7 +4740,7 @@ ah
ah
ah
ag
-an
+Au
lJ
ac
aT
@@ -4164,7 +4759,7 @@ ab
ac
ac
Rk
-an
+Au
au
ah
ah
@@ -4207,7 +4802,7 @@ ah
ah
ah
ag
-hI
+aP
lJ
ab
ac
@@ -4226,7 +4821,7 @@ ac
ac
ac
Rk
-an
+Au
au
jY
ah
@@ -4269,7 +4864,7 @@ ah
ah
jY
ay
-JI
+eF
ax
aC
ac
@@ -4288,7 +4883,7 @@ ac
ab
ac
Rk
-JI
+eF
au
ah
ah
@@ -4331,7 +4926,7 @@ ah
ah
ah
ay
-an
+Au
ax
ac
ac
@@ -4350,7 +4945,7 @@ ac
aC
ac
Rk
-JI
+eF
au
ah
ah
@@ -4393,7 +4988,7 @@ ah
ah
ah
ay
-an
+Au
ax
ac
ab
@@ -4412,7 +5007,7 @@ ac
ak
ac
Rk
-JI
+eF
au
ah
ah
@@ -4455,7 +5050,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
aC
@@ -4474,7 +5069,7 @@ ac
ac
aC
Rk
-JI
+eF
au
ah
ah
@@ -4517,7 +5112,7 @@ ah
ah
ah
ag
-hI
+aP
ax
ac
ac
@@ -4536,8 +5131,8 @@ ac
ac
ac
Rk
-an
-at
+tQ
+GW
jY
ah
ah
@@ -4578,8 +5173,8 @@ ah
ah
ah
jY
-ag
-hI
+Tj
+Hr
ax
ab
aQ
@@ -4598,7 +5193,7 @@ ac
ab
ac
Dd
-an
+Au
at
ah
ah
@@ -4641,7 +5236,7 @@ ah
ah
ah
ag
-an
+Au
ax
ac
aT
@@ -4660,7 +5255,7 @@ ac
ab
ac
Dd
-JI
+eF
at
ah
ah
@@ -4703,7 +5298,7 @@ jY
ah
ah
ag
-JI
+eF
ax
ak
aT
@@ -4722,7 +5317,7 @@ aC
ac
ac
Rk
-JI
+eF
um
Tn
aX
@@ -4735,7 +5330,7 @@ aX
aX
aX
aX
-aX
+qS
aX
aX
aX
@@ -4755,7 +5350,7 @@ aX
aX
aX
aX
-aX
+qS
aX
aX
aX
@@ -4765,7 +5360,7 @@ aX
aX
aX
OJ
-JI
+eF
ax
ab
aT
@@ -4784,50 +5379,50 @@ ab
ac
ac
Rk
-am
-JI
-JI
-JI
-JI
-JI
-an
-an
-an
-an
-an
-JI
-JI
-JI
-JI
-an
-an
-hI
-an
-an
-an
-an
-hI
-by
-an
-an
-JI
-hI
-hI
-an
-an
-JI
-JI
-JI
-an
-JI
-JI
-JI
-hI
-hI
-an
-JI
-JI
+fd
+ZN
+ZN
+ZN
+ZN
+ZN
+Ck
+Ck
+Ck
+Ck
+Ck
+ZN
+ZN
+AJ
+ZN
+Ck
+Ck
+Jt
+Ck
+Ck
+Ck
+Ck
+Jt
by
+Ck
+Ck
+ZN
+Jt
+Jt
+Ck
+Ck
+ZN
+ZN
+AJ
+Ck
+ZN
+ZN
+ZN
+Jt
+Jt
+Ck
+ZN
+ZN
+rY
bQ
ac
ac
diff --git a/_maps/outpost/hangar/nt_ice_56x20.dmm b/_maps/outpost/hangar/nt_ice_56x20.dmm
index c7e73652ef0d..08deb1360025 100644
--- a/_maps/outpost/hangar/nt_ice_56x20.dmm
+++ b/_maps/outpost/hangar/nt_ice_56x20.dmm
@@ -174,6 +174,27 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/hangar)
+"bK" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"cu" = (
+/obj/structure/flora/grass/green,
+/obj/item/trash/energybar{
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"cY" = (
/obj/effect/turf_decal/borderfloor/corner,
/obj/effect/turf_decal/siding/white{
@@ -201,6 +222,27 @@
},
/turf/open/floor/plasteel/tech,
/area/hangar)
+"dN" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"ez" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 1
@@ -211,6 +253,40 @@
planetary_atmos = 1
},
/area/hangar)
+"eS" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"fj" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"fC" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -221,6 +297,19 @@
planetary_atmos = 1
},
/area/hangar)
+"gk" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"gQ" = (
/obj/effect/turf_decal/borderfloor{
dir = 9
@@ -233,6 +322,37 @@
planetary_atmos = 1
},
/area/hangar)
+"hD" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"if" = (
+/obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"is" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"iY" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -249,6 +369,15 @@
planetary_atmos = 1
},
/area/hangar)
+"ji" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"jk" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -264,6 +393,38 @@
planetary_atmos = 1
},
/area/hangar)
+"kt" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/item/toy/plush/moth/firewatch{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"kH" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"la" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ll" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/sprayweb{
@@ -274,6 +435,20 @@
planetary_atmos = 1
},
/area/hangar)
+"lH" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/machinery/computer/hydrogen_exchange{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"mu" = (
/obj/effect/turf_decal/borderfloor{
dir = 9
@@ -288,6 +463,28 @@
planetary_atmos = 1
},
/area/hangar)
+"my" = (
+/obj/structure/flora/grass/green,
+/obj/item/trash/candy{
+ pixel_x = 4;
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"mP" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"mX" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -300,6 +497,20 @@
light_range = 2
},
/area/hangar)
+"nD" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"oq" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -340,7 +551,23 @@
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"pm" = (
+/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -383,6 +610,9 @@
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
@@ -401,6 +631,17 @@
planetary_atmos = 1
},
/area/hangar)
+"qR" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"sp" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -440,6 +681,17 @@
planetary_atmos = 1
},
/area/hangar)
+"sW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"uy" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -494,6 +746,34 @@
planetary_atmos = 1
},
/area/hangar)
+"wK" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/floor{
+ bulb_power = 0.75
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"xp" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"xt" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -545,6 +825,24 @@
planetary_atmos = 1
},
/area/hangar)
+"yh" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north{
+ pixel_x = -6;
+ bulb_power = 0.25
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"zG" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -571,6 +869,18 @@
light_range = 2
},
/area/hangar)
+"AZ" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Bh" = (
/obj/machinery/door/airlock/outpost,
/turf/open/floor/plasteel/tech,
@@ -592,6 +902,57 @@
planetary_atmos = 1
},
/area/hangar)
+"Cg" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Cj" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Ck" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pressure_valve,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Cn" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Cs" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -708,6 +1069,45 @@
planetary_atmos = 1
},
/area/hangar)
+"HJ" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"HR" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"HT" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Jh" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -718,6 +1118,18 @@
planetary_atmos = 1
},
/area/hangar)
+"JW" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"KH" = (
/obj/structure/flora/grass/both,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -725,6 +1137,31 @@
light_range = 2
},
/area/hangar)
+"Lh" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Li" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Ms" = (
/obj/effect/turf_decal/corner/opaque/neutral,
/obj/effect/turf_decal/siding/white,
@@ -796,6 +1233,18 @@
planetary_atmos = 1
},
/area/hangar)
+"Pp" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Pu" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -809,6 +1258,18 @@
planetary_atmos = 1
},
/area/hangar)
+"PL" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"PW" = (
/obj/effect/turf_decal/borderfloor/corner{
dir = 1
@@ -875,6 +1336,18 @@
planetary_atmos = 1
},
/area/hangar)
+"Si" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Sk" = (
/obj/effect/turf_decal/siding/white{
dir = 9
@@ -884,6 +1357,19 @@
planetary_atmos = 1
},
/area/hangar)
+"Sr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"SC" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -895,6 +1381,16 @@
planetary_atmos = 1
},
/area/hangar)
+"SJ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"SS" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -908,6 +1404,12 @@
planetary_atmos = 1
},
/area/hangar)
+"Tb" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Tj" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -921,6 +1423,32 @@
light_range = 2
},
/area/hangar)
+"TK" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"TR" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Uo" = (
/obj/structure/chair{
dir = 1
@@ -958,7 +1486,21 @@
/obj/structure/railing{
dir = 1
},
-/turf/open/floor/plasteel/patterned/brushed{
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Vu" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
planetary_atmos = 1
@@ -1007,6 +1549,24 @@
planetary_atmos = 1
},
/area/hangar)
+"WL" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"WP" = (
/obj/effect/turf_decal/siding/white{
dir = 10
@@ -1028,6 +1588,31 @@
planetary_atmos = 1
},
/area/hangar)
+"Xf" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Xs" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"XO" = (
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -1106,6 +1691,20 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"ZF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
@@ -1127,6 +1726,29 @@
planetary_atmos = 1
},
/area/hangar)
+"ZR" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"ZX" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"ZZ" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -1864,8 +2486,8 @@ NE
aG
KH
UJ
-Cs
-OZ
+Si
+JW
aN
aN
aN
@@ -1886,8 +2508,8 @@ aN
aN
aN
aN
-vM
-pb
+ZR
+gk
zG
KH
aG
@@ -1906,7 +2528,7 @@ KH
aG
aG
UJ
-Dn
+pb
OZ
aN
aN
@@ -1929,7 +2551,7 @@ aN
aN
aN
vM
-Cs
+TR
ay
aG
aG
@@ -1948,7 +2570,7 @@ aG
aG
aG
UJ
-Dn
+pb
OZ
aN
aN
@@ -1971,7 +2593,7 @@ aN
aN
aN
SC
-as
+Cg
zG
KH
aG
@@ -1990,7 +2612,7 @@ aG
aG
aG
UJ
-Dn
+YT
OZ
aN
aN
@@ -2013,7 +2635,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
aG
@@ -2032,7 +2654,7 @@ aG
NE
KH
UJ
-Dn
+is
OZ
ax
aN
@@ -2055,7 +2677,7 @@ aN
aN
ax
SC
-as
+Cg
zG
aG
aG
@@ -2074,7 +2696,7 @@ KH
aG
aG
UJ
-Dn
+is
OZ
aN
aN
@@ -2097,7 +2719,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
NE
@@ -2116,7 +2738,7 @@ aG
KH
aG
Dk
-Dn
+bK
OZ
aN
aN
@@ -2139,7 +2761,7 @@ aN
aN
aN
SC
-as
+Cg
zG
KH
aG
@@ -2158,7 +2780,7 @@ NE
aG
aG
Dk
-Dn
+bK
OZ
aN
aN
@@ -2181,7 +2803,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
aG
@@ -2200,7 +2822,7 @@ aG
aG
NE
Dk
-as
+bK
OZ
aN
aN
@@ -2223,7 +2845,7 @@ aN
aN
aN
vM
-as
+Cg
zG
ap
aG
@@ -2242,7 +2864,7 @@ ap
KH
aG
Dk
-as
+HR
OZ
ax
aN
@@ -2265,7 +2887,7 @@ aN
aN
ax
SC
-Cs
+TR
zG
aG
KH
@@ -2284,7 +2906,7 @@ aG
aG
KH
Dk
-as
+HR
OZ
aN
aN
@@ -2307,7 +2929,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
aG
@@ -2326,7 +2948,7 @@ aG
ap
aG
UJ
-as
+HR
OZ
aN
aN
@@ -2349,7 +2971,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
KH
aG
@@ -2368,7 +2990,7 @@ KH
aG
NE
UJ
-as
+HR
OZ
aN
aN
@@ -2391,7 +3013,7 @@ aN
aN
aN
SC
-Dn
+ZF
zG
aG
aG
@@ -2410,7 +3032,7 @@ aG
aG
KH
UJ
-as
+bK
Rs
aN
aN
@@ -2433,7 +3055,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
aG
@@ -2452,7 +3074,7 @@ aG
NE
aG
UJ
-Cs
+pb
Rs
ax
aN
@@ -2475,7 +3097,7 @@ aN
aN
ax
SC
-Dn
+ZF
zG
aG
aG
@@ -2494,7 +3116,7 @@ aG
ap
aG
UJ
-Cs
+pb
aX
aN
aN
@@ -2517,7 +3139,7 @@ aN
aN
aN
SC
-Cs
+TR
zG
ap
aG
@@ -2536,7 +3158,7 @@ KH
aG
ap
UJ
-Cs
+PL
OZ
aN
aN
@@ -2559,7 +3181,7 @@ aN
aN
aN
vM
-pb
+Sr
zG
aG
NE
@@ -2578,8 +3200,8 @@ aG
aG
aG
UJ
-Dn
-OZ
+pm
+JW
aN
aN
aN
@@ -2600,8 +3222,8 @@ aN
aN
aN
aN
-vM
-Cs
+ZR
+SJ
ay
aG
aG
@@ -2620,7 +3242,7 @@ al
aG
ap
UJ
-Dn
+is
OZ
aN
aN
@@ -2643,7 +3265,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
aG
@@ -2662,7 +3284,7 @@ ae
NE
aG
UJ
-Dn
+is
OZ
ax
aN
@@ -2685,7 +3307,7 @@ aN
aN
ax
SC
-as
+Cg
zG
aG
KH
@@ -2704,7 +3326,7 @@ al
aG
KH
UJ
-Dn
+HR
OZ
aN
aN
@@ -2727,7 +3349,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
aG
@@ -2746,7 +3368,7 @@ al
ap
aG
UJ
-Dn
+HR
OZ
aN
aN
@@ -2769,7 +3391,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
aG
@@ -2788,7 +3410,7 @@ al
Fs
aG
Dk
-Dn
+pb
OZ
aN
aN
@@ -2811,7 +3433,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
NE
@@ -2830,7 +3452,7 @@ al
al
aG
Dk
-Dn
+pb
OZ
aN
aN
@@ -2853,7 +3475,7 @@ aN
aN
aN
SC
-as
+Cg
zG
aG
ap
@@ -2872,7 +3494,7 @@ al
al
aG
Dk
-as
+YT
OZ
ax
aN
@@ -2895,7 +3517,7 @@ aN
aN
ax
vM
-as
+Cg
zG
KH
aG
@@ -2914,7 +3536,7 @@ al
KH
aG
Dk
-as
+is
OZ
aN
aN
@@ -2937,7 +3559,7 @@ aN
aN
aN
SC
-Cs
+TR
zG
aG
aG
@@ -2956,7 +3578,7 @@ al
aG
ap
Dk
-as
+is
OZ
aN
aN
@@ -2979,7 +3601,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
NE
@@ -2998,7 +3620,7 @@ al
aG
NE
UJ
-as
+bK
OZ
aN
aN
@@ -3021,7 +3643,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
aG
@@ -3040,7 +3662,7 @@ al
aG
aG
UJ
-as
+bK
OZ
aN
aN
@@ -3063,7 +3685,7 @@ aN
aN
aN
SC
-Dn
+ZF
zG
aG
KH
@@ -3082,7 +3704,7 @@ al
KH
aG
UJ
-as
+bK
Rs
ax
aN
@@ -3105,7 +3727,7 @@ aN
aN
ax
SC
-Dn
+ZF
ay
aG
aG
@@ -3124,7 +3746,7 @@ al
aG
aG
UJ
-Dn
+HR
Rs
aN
aN
@@ -3147,7 +3769,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
aG
@@ -3163,10 +3785,10 @@ al
al
al
ae
-ap
+my
aG
UJ
-Dn
+HR
OZ
aN
aN
@@ -3189,7 +3811,7 @@ aN
aN
aN
ZZ
-Cs
+TR
ay
aG
aG
@@ -3206,9 +3828,9 @@ ag
ag
aG
aG
-KH
-SC
-Dn
+lH
+Dk
+HR
OZ
aN
aN
@@ -3231,7 +3853,7 @@ aN
aN
aN
SC
-Dn
+ZF
OZ
aG
aG
@@ -3244,14 +3866,14 @@ ag
(51,1,1) = {"
ag
Hr
-Hr
+kt
ag
+KH
aG
-NE
-aG
-UJ
-Dn
-OZ
+Xs
+fj
+Xf
+JW
aN
aN
aN
@@ -3272,8 +3894,8 @@ aN
aN
aN
aN
-SC
-Dn
+HT
+ji
ay
KH
aG
@@ -3286,13 +3908,13 @@ ag
(52,1,1) = {"
ag
Hr
-Hr
+Li
ag
-aG
-aG
-aG
-UJ
-Dn
+kH
+kH
+wK
+Dk
+PL
OZ
ax
aN
@@ -3315,7 +3937,7 @@ aN
aN
ax
SC
-as
+Cg
ay
NE
aG
@@ -3328,13 +3950,13 @@ al
(53,1,1) = {"
ag
Hr
-Hr
-Bh
-aG
-aG
-NE
-Dk
-as
+Tb
+if
+la
+la
+WL
+HJ
+pb
OZ
aN
aN
@@ -3357,7 +3979,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
aG
@@ -3372,11 +3994,11 @@ ag
Hr
Hr
ag
-KH
-aG
-aG
-UJ
-as
+yh
+nD
+hD
+AZ
+Vu
OZ
aN
aN
@@ -3399,7 +4021,7 @@ aN
aN
aN
SC
-Dn
+ZF
zG
aG
aG
@@ -3414,11 +4036,11 @@ ag
ag
ag
ag
+cu
aG
-ap
-aG
-Dk
-Dn
+dN
+Ck
+xp
OZ
aN
aN
@@ -3441,7 +4063,7 @@ aN
aN
aN
vM
-Dn
+ZF
ay
KH
aG
@@ -3457,10 +4079,10 @@ al
al
al
aG
-NE
-ap
-UJ
-Cs
+aG
+TK
+SC
+pb
OZ
aN
aN
@@ -3483,7 +4105,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
NE
@@ -3499,9 +4121,9 @@ al
al
al
aG
-aG
-aG
-UJ
+KH
+Lh
+eS
pb
OZ
ax
@@ -3525,7 +4147,7 @@ aN
aN
ax
SC
-Cs
+TR
ay
aG
aG
@@ -3541,7 +4163,7 @@ al
al
Fs
aG
-KH
+aG
aG
UJ
YT
@@ -3567,7 +4189,7 @@ aN
aN
aN
SC
-Cs
+TR
ay
aG
KH
@@ -3586,7 +4208,7 @@ aG
aG
KH
UJ
-Cs
+is
Rs
aN
aN
@@ -3609,7 +4231,7 @@ aN
aN
aN
SC
-Cs
+TR
ay
aG
al
@@ -3628,7 +4250,7 @@ NE
aG
aG
UJ
-Cs
+is
Rs
aN
aN
@@ -3651,7 +4273,7 @@ aN
aN
aN
SC
-Cs
+TR
zG
ap
al
@@ -3670,7 +4292,7 @@ aG
aG
NE
Dk
-Dn
+bK
Rs
aN
aN
@@ -3693,7 +4315,7 @@ aN
aN
aN
SC
-Dn
+ZF
OC
aG
al
@@ -3712,7 +4334,7 @@ KH
aG
aG
UJ
-Dn
+bK
OZ
ax
aN
@@ -3735,7 +4357,7 @@ aN
aN
ax
SC
-Cs
+TR
OC
KH
aG
@@ -3754,7 +4376,7 @@ aG
aG
aG
UJ
-Dn
+bK
OZ
aN
aN
@@ -3777,7 +4399,7 @@ aN
aN
aN
vM
-as
+Cg
ay
NE
aG
@@ -3796,7 +4418,7 @@ aG
KH
aG
UJ
-as
+HR
OZ
aN
aN
@@ -3819,7 +4441,7 @@ aN
aN
aN
vM
-Dn
+ZF
ay
aG
aG
@@ -3838,7 +4460,7 @@ aG
NE
aG
UJ
-as
+HR
OZ
aN
aN
@@ -3861,7 +4483,7 @@ aN
aN
aN
vM
-Dn
+ZF
ay
aG
KH
@@ -3880,7 +4502,7 @@ aG
ap
aG
UJ
-as
+HR
OZ
aN
aN
@@ -3903,7 +4525,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
NE
@@ -3922,7 +4544,7 @@ aG
aG
NE
UJ
-as
+HR
OZ
aN
aN
@@ -3945,7 +4567,7 @@ aN
aN
aN
SC
-Cs
+TR
ay
aG
aG
@@ -3964,8 +4586,8 @@ aG
aG
aG
UJ
-Dn
-Rs
+sW
+Cj
ax
aN
aN
@@ -3986,8 +4608,8 @@ aN
aN
aN
ax
-SC
-Cs
+HT
+SJ
ay
KH
Fs
@@ -4006,7 +4628,7 @@ aG
KH
aG
Dk
-Dn
+bK
Rs
aN
aN
@@ -4029,7 +4651,7 @@ aN
aN
aN
SC
-Dn
+ZF
ay
aG
al
@@ -4048,7 +4670,7 @@ aG
aG
aG
Dk
-as
+HR
Rs
aN
aN
@@ -4071,7 +4693,7 @@ ax
aN
aN
SC
-as
+Cg
ay
ap
al
@@ -4090,7 +4712,7 @@ NE
aG
aG
UJ
-as
+HR
HC
RC
RC
@@ -4113,7 +4735,7 @@ RC
RC
RC
vl
-as
+Cg
ay
KH
al
@@ -4132,29 +4754,29 @@ KH
aG
aG
UJ
-aE
-as
-Cs
-Dn
-Dn
-Dn
-as
-Cs
-Cs
-Dn
-Dn
-as
-pM
-as
-Dn
-as
-as
-as
-Cs
-Cs
-Dn
-as
-as
+qR
+ZX
+Cn
+mP
+mP
+mP
+ZX
+Cn
+Cn
+mP
+mP
+ZX
+Pp
+ZX
+mP
+ZX
+ZX
+ZX
+Cn
+Cn
+mP
+ZX
+ZX
pM
zG
aG
diff --git a/_maps/outpost/hangar/nt_ice_56x40.dmm b/_maps/outpost/hangar/nt_ice_56x40.dmm
index 90841c2cf6a1..d484671d2f94 100644
--- a/_maps/outpost/hangar/nt_ice_56x40.dmm
+++ b/_maps/outpost/hangar/nt_ice_56x40.dmm
@@ -234,6 +234,17 @@
light_range = 2
},
/area/hangar)
+"cb" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ck" = (
/turf/open/floor/plating{
light_color = "#1B1D2E";
@@ -279,6 +290,17 @@
planetary_atmos = 1
},
/area/hangar)
+"dn" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ds" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -292,6 +314,17 @@
light_range = 2
},
/area/hangar)
+"dQ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"dT" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 1
@@ -319,9 +352,12 @@
"eZ" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning,
-/obj/structure/filingcabinet/double/grey,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
+/obj/structure/filingcabinet/double/grey{
+ dir = 8;
+ pixel_x = 7
+ },
/turf/open/floor/plating{
planetary_atmos = 1
},
@@ -353,6 +389,18 @@
planetary_atmos = 1
},
/area/hangar)
+"fT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"gc" = (
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
@@ -370,6 +418,38 @@
},
/turf/open/floor/plasteel/telecomms_floor,
/area/hangar)
+"ia" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"iG" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/binary/pressure_valve,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"iJ" = (
/obj/effect/turf_decal/borderfloor/full,
/obj/effect/turf_decal/industrial/warning{
@@ -394,6 +474,15 @@
light_range = 2
},
/area/hangar)
+"jF" = (
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 4
+ },
+/obj/item/toy/plush/moth/firewatch{
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"jS" = (
/obj/effect/turf_decal/borderfloor/corner{
dir = 8
@@ -422,6 +511,19 @@
planetary_atmos = 1
},
/area/hangar)
+"kr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"kH" = (
/obj/effect/turf_decal/borderfloor{
dir = 9
@@ -436,6 +538,15 @@
planetary_atmos = 1
},
/area/hangar)
+"ln" = (
+/obj/structure/flora/rock/pile/icy,
+/turf/open/floor/plating/asteroid/icerock/temperate,
+/area/hangar)
+"lo" = (
+/obj/machinery/door/airlock/outpost,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"lu" = (
/obj/effect/decal/fakelattice,
/turf/open/floor/plasteel/elevatorshaft{
@@ -517,6 +628,23 @@
light_range = 2
},
/area/hangar)
+"ne" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"nC" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -535,6 +663,18 @@
planetary_atmos = 1
},
/area/hangar)
+"nZ" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"oc" = (
/obj/effect/turf_decal/siding/white{
dir = 8
@@ -551,6 +691,53 @@
planetary_atmos = 1
},
/area/hangar)
+"pa" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"pi" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"ps" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"pD" = (
/obj/effect/turf_decal/borderfloor,
/obj/effect/turf_decal/siding/white{
@@ -575,6 +762,20 @@
},
/turf/open/floor/plasteel/tech,
/area/hangar)
+"qN" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"qX" = (
/obj/effect/turf_decal/borderfloor{
dir = 6
@@ -601,6 +802,16 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/tech,
/area/hangar)
+"sd" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"sw" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -636,6 +847,31 @@
"tj" = (
/turf/open/floor/plasteel/tech,
/area/hangar)
+"ts" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"tF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"tR" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -709,6 +945,29 @@
planetary_atmos = 1
},
/area/hangar)
+"vT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"wG" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"wT" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -720,6 +979,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/tech,
/area/hangar)
+"wZ" = (
+/obj/effect/turf_decal/borderfloor,
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"yU" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -732,6 +1003,32 @@
planetary_atmos = 1
},
/area/hangar)
+"AU" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"AW" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Be" = (
/obj/effect/turf_decal/borderfloor{
dir = 8
@@ -877,6 +1174,50 @@
light_range = 2
},
/area/hangar)
+"El" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Eo" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/industrial/shutoff,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"Eu" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Fi" = (
+/obj/structure/flora/grass/both,
+/obj/item/trash/raisins{
+ layer = 2.8
+ },
+/turf/open/floor/plating/asteroid/snow/temperatre{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Fn" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/industrial/outline/yellow,
@@ -889,6 +1230,19 @@
},
/turf/open/floor/plasteel/dark,
/area/hangar)
+"Fw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"FS" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -902,6 +1256,32 @@
planetary_atmos = 1
},
/area/hangar)
+"Ht" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/floor{
+ bulb_power = 0.75
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"HF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"HV" = (
/obj/effect/turf_decal/borderfloor{
dir = 10
@@ -920,11 +1300,20 @@
planetary_atmos = 1
},
/area/hangar)
+"HY" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
"Iz" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -983,6 +1372,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
@@ -1069,6 +1461,20 @@
planetary_atmos = 1
},
/area/hangar)
+"Mk" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/machinery/computer/hydrogen_exchange{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Mt" = (
/obj/machinery/computer/secure_data{
icon_state = "computer-left";
@@ -1105,6 +1511,39 @@
planetary_atmos = 1
},
/area/hangar)
+"Od" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Oj" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/tech,
+/area/hangar)
+"Or" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/binary/valve/digital,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"OW" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
@@ -1197,6 +1636,24 @@
planetary_atmos = 1
},
/area/hangar)
+"SR" = (
+/obj/structure/railing{
+ dir = 9;
+ layer = 2.8
+ },
+/obj/machinery/atmospherics/components/unary/hydrogen_pump{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 9
+ },
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"Ts" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -1222,6 +1679,27 @@
planetary_atmos = 1
},
/area/hangar)
+"UV" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 1;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
"UZ" = (
/obj/effect/turf_decal/siding/white{
dir = 10
@@ -1239,13 +1717,76 @@
planetary_atmos = 1
},
/area/hangar)
-"Vu" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 9
- },
-/obj/effect/turf_decal/siding/white,
+"Vu" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"VK" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Wm" = (
+/obj/structure/railing{
+ dir = 5;
+ layer = 2.8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 5
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/patterned{
+ planetary_atmos = 1;
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"WY" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/light/floor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/patterned/cargo_one{
+ light_color = "#1B1D2E";
+ light_range = 2
+ },
+/area/hangar)
+"Xf" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
+"Xq" = (
+/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/patterned/brushed{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2;
planetary_atmos = 1
@@ -1271,6 +1812,20 @@
},
/turf/open/floor/plasteel/telecomms_floor,
/area/hangar)
+"XS" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Yb" = (
/obj/effect/turf_decal/borderfloor{
dir = 4
@@ -1288,6 +1843,19 @@
planetary_atmos = 1
},
/area/hangar)
+"Ye" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"Yn" = (
/obj/effect/decal/fakelattice,
/obj/effect/decal/cleanable/dirt{
@@ -1329,11 +1897,25 @@
/obj/effect/turf_decal/borderfloor/full,
/obj/machinery/light/floor,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/patterned/cargo_one{
light_color = "#1B1D2E";
light_range = 2
},
/area/hangar)
+"YW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"YX" = (
/obj/structure/flora/tree/dead,
/turf/open/floor/plating/asteroid/snow/temperatre{
@@ -1341,6 +1923,24 @@
light_range = 2
},
/area/hangar)
+"Zj" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north{
+ pixel_x = -6;
+ bulb_power = 0.25
+ },
+/turf/open/floor/plasteel/patterned/brushed{
+ light_color = "#1B1D2E";
+ light_range = 2;
+ planetary_atmos = 1
+ },
+/area/hangar)
"ZE" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/vending/coffee,
@@ -2428,8 +3028,8 @@ ao
aE
aZ
aj
-fM
-aK
+YW
+AU
ck
ck
ck
@@ -2470,8 +3070,8 @@ ck
ck
ck
ck
-aN
-Iz
+ts
+XS
am
aZ
aE
@@ -2490,7 +3090,7 @@ aZ
aE
aE
aj
-aw
+fT
aK
ck
ck
@@ -2533,7 +3133,7 @@ ck
ck
ck
aN
-fM
+kr
tR
aE
aE
@@ -2552,7 +3152,7 @@ aE
aE
ao
aj
-aw
+fT
aK
ck
ck
@@ -2595,7 +3195,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aZ
aE
@@ -2614,7 +3214,7 @@ aE
aE
aE
aj
-aw
+fT
aK
ck
ck
@@ -2657,7 +3257,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
aE
@@ -2676,7 +3276,7 @@ aE
ao
aZ
aj
-aw
+fT
aK
aG
ck
@@ -2719,7 +3319,7 @@ ck
ck
aG
pD
-ad
+dQ
am
aE
aE
@@ -2738,7 +3338,7 @@ aZ
aE
aE
aj
-aw
+fT
aK
ck
ck
@@ -2781,7 +3381,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
ao
@@ -2800,7 +3400,7 @@ aE
aZ
aE
aD
-aw
+fT
aK
ck
ck
@@ -2843,7 +3443,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aZ
aE
@@ -2862,7 +3462,7 @@ ao
aE
aE
aD
-aw
+fT
aK
ck
ck
@@ -2905,7 +3505,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
aE
@@ -2924,7 +3524,7 @@ aE
aE
ao
aD
-ad
+El
aK
ck
ck
@@ -2967,7 +3567,7 @@ ck
ck
ck
aN
-ad
+dQ
am
ai
aE
@@ -2986,7 +3586,7 @@ ai
aZ
aE
aD
-ad
+El
aK
aG
ck
@@ -3029,7 +3629,7 @@ ck
ck
aG
pD
-fM
+kr
am
aE
aZ
@@ -3048,7 +3648,7 @@ aE
ao
aZ
aD
-ad
+El
aK
ck
ck
@@ -3091,7 +3691,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
aE
@@ -3110,7 +3710,7 @@ aE
ai
aE
aj
-ad
+El
aK
ck
ck
@@ -3153,7 +3753,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aZ
aE
@@ -3172,7 +3772,7 @@ aZ
aE
ao
aj
-ad
+El
aK
ck
ck
@@ -3215,7 +3815,7 @@ ck
ck
ck
pD
-aw
+tF
am
aE
aE
@@ -3234,7 +3834,7 @@ aE
aE
aZ
aj
-ad
+El
kd
ck
ck
@@ -3277,7 +3877,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
aE
@@ -3296,7 +3896,7 @@ aE
ao
aE
aj
-fM
+Ye
kd
ck
ck
@@ -3339,7 +3939,7 @@ ck
ck
ck
pD
-aw
+tF
am
aE
aE
@@ -3358,7 +3958,7 @@ aE
ai
aE
aj
-fM
+Ye
sw
aG
ck
@@ -3401,7 +4001,7 @@ ck
ck
aG
pD
-fM
+kr
am
ai
aE
@@ -3420,7 +4020,7 @@ aZ
aE
ai
aj
-fM
+Ye
aK
ck
ck
@@ -3482,8 +4082,8 @@ aE
aE
aE
aj
-aw
-aK
+nZ
+AU
ck
ck
ck
@@ -3524,8 +4124,8 @@ ck
ck
ck
ck
-aN
-fM
+ts
+cb
tR
aE
aE
@@ -3544,7 +4144,7 @@ aI
aE
ai
aj
-aw
+fT
aK
ck
ck
@@ -3587,7 +4187,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
aE
@@ -3606,7 +4206,7 @@ au
ao
aE
aj
-aw
+fT
aK
ck
ck
@@ -3649,7 +4249,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
aZ
@@ -3668,7 +4268,7 @@ aI
aE
aZ
aj
-aw
+fT
aK
aG
ck
@@ -3711,7 +4311,7 @@ ck
ck
aG
pD
-ad
+dQ
am
aE
aE
@@ -3730,7 +4330,7 @@ aI
ai
aE
aj
-aw
+fT
aK
ck
ck
@@ -3773,7 +4373,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
aE
@@ -3792,7 +4392,7 @@ aI
aT
aE
aD
-aw
+fT
aK
ck
ck
@@ -3835,7 +4435,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
ao
@@ -3854,7 +4454,7 @@ aI
aI
aE
aD
-aw
+fT
aK
ck
ck
@@ -3897,7 +4497,7 @@ ck
ck
ck
pD
-ad
+dQ
am
aE
ai
@@ -3916,7 +4516,7 @@ aI
aI
aE
aD
-ad
+El
aK
ck
ck
@@ -3959,7 +4559,7 @@ ck
ck
ck
aN
-ad
+dQ
am
aZ
aE
@@ -3978,7 +4578,7 @@ aI
aZ
aE
aD
-ad
+El
aK
aG
ck
@@ -4021,7 +4621,7 @@ ck
ck
aG
pD
-fM
+kr
am
aE
aE
@@ -4040,7 +4640,7 @@ aI
aE
ai
aD
-ad
+El
aK
ck
ck
@@ -4083,7 +4683,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
ao
@@ -4102,7 +4702,7 @@ aI
aE
ao
aj
-ad
+El
aK
ck
ck
@@ -4145,7 +4745,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
aE
@@ -4164,7 +4764,7 @@ aI
aE
aE
aj
-ad
+El
aK
ck
ck
@@ -4207,7 +4807,7 @@ ck
ck
ck
pD
-aw
+tF
am
aE
aZ
@@ -4226,7 +4826,7 @@ aI
aZ
aE
aj
-ad
+El
kd
ck
ck
@@ -4269,7 +4869,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
aE
@@ -4288,7 +4888,7 @@ aI
aE
aE
aj
-aw
+fT
kd
aG
ck
@@ -4331,7 +4931,7 @@ ck
ck
aG
pD
-aw
+tF
tR
aE
aE
@@ -4350,7 +4950,7 @@ au
ai
aE
aj
-aw
+fT
aK
ck
ck
@@ -4393,7 +4993,7 @@ ck
ck
ck
Ck
-fM
+kr
tR
aE
aE
@@ -4408,11 +5008,11 @@ aH
aH
aH
aH
+ln
aE
-aE
-aZ
-pD
-aw
+Mk
+aD
+El
aK
ck
ck
@@ -4455,7 +5055,7 @@ ck
ck
ck
pD
-aw
+tF
aK
aE
aE
@@ -4468,14 +5068,14 @@ aH
(51,1,1) = {"
aH
tj
-tj
+jF
aH
+aZ
aE
-ao
-aE
-aj
-aw
-aK
+pi
+ps
+dn
+AU
ck
ck
ck
@@ -4516,8 +5116,8 @@ ck
ck
ck
ck
-pD
-aw
+wZ
+Xf
tR
aZ
aE
@@ -4530,13 +5130,13 @@ aH
(52,1,1) = {"
aH
tj
-tj
+HY
aH
-aE
-aE
-aE
-aj
-aw
+Mj
+Mj
+Ht
+aD
+fT
aK
ck
ck
@@ -4579,7 +5179,7 @@ ck
ck
ck
pD
-ad
+dQ
tR
ao
aE
@@ -4592,13 +5192,13 @@ aI
(53,1,1) = {"
aH
tj
-tj
-sB
-aE
-aE
-ao
-aD
-ad
+Oj
+lo
+vT
+vT
+SR
+ne
+Ye
aK
aG
ck
@@ -4641,7 +5241,7 @@ ck
ck
aG
pD
-aw
+tF
tR
aE
aE
@@ -4656,11 +5256,11 @@ aH
tj
tj
aH
-aZ
-aE
-aE
-aj
-ad
+Zj
+qN
+Eo
+pa
+Od
aK
ck
ck
@@ -4703,7 +5303,7 @@ ck
ck
ck
pD
-aw
+tF
am
aE
aE
@@ -4718,11 +5318,11 @@ aH
aH
aH
aH
-aE
ai
aE
-aD
-aw
+UV
+iG
+Fw
aK
ck
ck
@@ -4765,7 +5365,7 @@ ck
ck
ck
aN
-aw
+tF
tR
aZ
aE
@@ -4779,12 +5379,12 @@ aI
aI
aI
aI
-aI
+ln
aE
-ao
-ai
-aj
-fM
+aE
+AW
+pD
+Ye
aK
ck
ck
@@ -4827,7 +5427,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
ao
@@ -4843,10 +5443,10 @@ aI
aI
aI
aE
-aE
-aE
-aj
-Iz
+Fi
+Wm
+wG
+Ye
aK
ck
ck
@@ -4889,7 +5489,7 @@ ck
ck
ck
pD
-fM
+kr
tR
aE
aE
@@ -4951,7 +5551,7 @@ ck
ck
aG
pD
-fM
+kr
tR
aE
aZ
@@ -4970,7 +5570,7 @@ aE
aE
aZ
aj
-fM
+Ye
kd
ck
ck
@@ -5013,7 +5613,7 @@ ck
ck
ck
pD
-fM
+kr
tR
aE
aI
@@ -5032,7 +5632,7 @@ ao
aE
aE
aj
-fM
+Ye
kd
ck
ck
@@ -5075,7 +5675,7 @@ ck
ck
ck
pD
-fM
+kr
am
ai
aI
@@ -5094,7 +5694,7 @@ aE
aE
ao
aD
-aw
+fT
kd
ck
ck
@@ -5137,7 +5737,7 @@ ck
ck
ck
pD
-aw
+tF
aO
aE
aI
@@ -5156,7 +5756,7 @@ aZ
aE
aE
aj
-aw
+fT
aK
ck
ck
@@ -5199,7 +5799,7 @@ ck
ck
ck
pD
-fM
+kr
aO
aZ
aE
@@ -5218,7 +5818,7 @@ aE
aE
aE
aj
-aw
+fT
aK
aG
ck
@@ -5261,7 +5861,7 @@ ck
ck
aG
aN
-ad
+dQ
tR
ao
aE
@@ -5280,7 +5880,7 @@ aE
aZ
aE
aj
-ad
+El
aK
ck
ck
@@ -5323,7 +5923,7 @@ ck
ck
ck
aN
-aw
+tF
tR
aE
aE
@@ -5342,7 +5942,7 @@ aE
ao
aE
aj
-ad
+El
aK
ck
ck
@@ -5385,7 +5985,7 @@ ck
ck
ck
aN
-aw
+tF
tR
aE
aZ
@@ -5404,7 +6004,7 @@ aE
ai
aE
aj
-ad
+El
aK
ck
ck
@@ -5447,7 +6047,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
ao
@@ -5466,7 +6066,7 @@ aE
aE
ao
aj
-ad
+El
aK
ck
ck
@@ -5509,7 +6109,7 @@ ck
ck
ck
pD
-fM
+kr
tR
aE
aE
@@ -5528,8 +6128,8 @@ aE
aE
aE
aj
-aw
-kd
+nZ
+Or
aG
ck
ck
@@ -5570,8 +6170,8 @@ ck
ck
ck
aG
-pD
-fM
+wZ
+cb
tR
aZ
aT
@@ -5590,7 +6190,7 @@ aE
aZ
aE
aD
-aw
+fT
kd
ck
ck
@@ -5633,7 +6233,7 @@ ck
ck
ck
pD
-aw
+tF
tR
aE
aI
@@ -5652,7 +6252,7 @@ aE
aE
aE
aD
-ad
+El
kd
ck
ck
@@ -5695,7 +6295,7 @@ aG
ck
ck
pD
-ad
+dQ
tR
ai
aI
@@ -5714,7 +6314,7 @@ ao
aE
aE
aj
-ad
+El
cX
Mj
ar
@@ -5727,7 +6327,7 @@ ar
ar
ar
ar
-ar
+ia
ar
ar
ar
@@ -5747,7 +6347,7 @@ ar
ar
ar
ar
-ar
+ia
ar
ar
ar
@@ -5757,7 +6357,7 @@ ar
ar
ar
qX
-ad
+dQ
tR
aZ
aI
@@ -5776,50 +6376,50 @@ aZ
aE
aE
aj
-Cb
-ad
-ad
-ad
-ad
-ad
-aw
-aw
-aw
-aw
-aw
-ad
-ad
-ad
-ad
-aw
-aw
-fM
-aw
-aw
-aw
-aw
-fM
-YA
-aw
-aw
-ad
-fM
-fM
-aw
-aw
-ad
-ad
-ad
-aw
-ad
-ad
-ad
-fM
-fM
-aw
-ad
-ad
+VK
+Eu
+Eu
+Eu
+Eu
+Eu
+sd
+sd
+sd
+sd
+sd
+Eu
+Eu
+HF
+Eu
+sd
+sd
+Xq
+sd
+sd
+sd
+sd
+Xq
YA
+sd
+sd
+Eu
+Xq
+Xq
+sd
+sd
+Eu
+Eu
+HF
+sd
+Eu
+Eu
+Eu
+Xq
+Xq
+sd
+Eu
+Eu
+WY
am
aE
aE
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
index d7debf2a5dc7..7560d2921d2c 100644
--- a/_maps/outpost/indie_space.dmm
+++ b/_maps/outpost/indie_space.dmm
@@ -182,17 +182,16 @@
/turf/open/floor/plasteel,
/area/outpost/maintenance/fore)
"bi" = (
-/obj/machinery/mineral/processing_unit_console{
- pixel_y = -31;
- machinedir = 1;
- output_dir = 1
- },
/obj/structure/railing{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 10
},
+/obj/machinery/computer/electrolyzer_console{
+ pixel_y = -31;
+ density = 0
+ },
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"bn" = (
@@ -728,11 +727,10 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/fore)
"fd" = (
-/obj/machinery/mineral/processing_unit{
- input_dir = 8;
- output_dir = 1
+/obj/machinery/conveyor/inverted{
+ id = "outpost1";
+ dir = 10
},
-/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo)
"fh" = (
@@ -2541,6 +2539,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/outpost/hallway/central)
+"rk" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/mineral/electrolyzer{
+ output_dir = 4
+ },
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/outpost/cargo)
"rm" = (
/obj/effect/turf_decal/corner/opaque/grey/full,
/obj/effect/turf_decal/corner/opaque/neutral{
@@ -5032,10 +5037,8 @@
},
/area/outpost/crew/bar)
"FE" = (
-/obj/machinery/mineral/unloading_machine{
- dir = 1
- },
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/mineral/electrolyzer_unloader,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo)
"FF" = (
@@ -7064,13 +7067,13 @@
/obj/structure/railing{
dir = 6
},
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor_switch{
id = "outpost1";
layer = 3.11;
pixel_y = 4;
pixel_x = 5
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo)
"RU" = (
@@ -17438,8 +17441,8 @@ Dp
tI
tI
RO
-gO
-BZ
+rk
+bi
Uw
HD
HD
@@ -17562,7 +17565,7 @@ ca
ca
ca
fd
-bi
+BZ
Uw
HD
HD
diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
index 696342178b2d..d029c3dc86a8 100644
--- a/_maps/outpost/nanotrasen_ice.dmm
+++ b/_maps/outpost/nanotrasen_ice.dmm
@@ -554,8 +554,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
-/obj/structure/closet/crate,
/obj/effect/turf_decal/box,
+/obj/structure/closet/crate,
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo/smeltery)
"dM" = (
@@ -2851,10 +2851,9 @@
"td" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/mineral/processing_unit_console{
- machinedir = 8;
- output_dir = 1;
- pixel_x = 32
+/obj/machinery/computer/electrolyzer_console{
+ pixel_x = 32;
+ density = 0
},
/turf/open/floor/plasteel/patterned,
/area/outpost/cargo/smeltery)
@@ -2958,8 +2957,8 @@
},
/area/outpost/exterior)
"tM" = (
-/obj/machinery/mineral/unloading_machine,
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/mineral/electrolyzer_unloader,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/outpost/cargo/smeltery)
"tO" = (
@@ -6342,11 +6341,10 @@
/turf/open/floor/plasteel/patterned,
/area/outpost/crew/bathroom)
"Rg" = (
-/obj/machinery/mineral/processing_unit{
- output_dir = 4;
- input_dir = 8
- },
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/mineral/electrolyzer{
+ output_dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/outpost/cargo/smeltery)
"Rh" = (
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index 262ac034dc5a..70063e0ac720 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -138,11 +138,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "engine fuel pump"
- },
/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/components/trinary/mixer{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"bW" = (
@@ -287,7 +286,7 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"gF" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
+/obj/machinery/power/shuttle/engine/fire{
dir = 4
},
/turf/open/floor/plating/airless,
@@ -346,9 +345,6 @@
/turf/open/floor/plating/airless,
/area/ship/external)
"hK" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/reinforced{
dir = 8
},
@@ -356,16 +352,20 @@
dir = 4;
name = "Engine Access"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"hZ" = (
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/item/radio/intercom/directional/east,
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
-/obj/item/radio/intercom/directional/east,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plating,
/area/ship/engineering)
"ig" = (
@@ -477,9 +477,10 @@
/turf/open/floor/plating/airless,
/area/ship/external)
"kQ" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins{
+/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/ship/engineering)
"ls" = (
@@ -1203,15 +1204,12 @@
/area/ship/cargo)
"CD" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 10
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"CO" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/reinforced{
dir = 8
},
@@ -1219,6 +1217,9 @@
dir = 4;
name = "Engine Access"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"CP" = (
@@ -1625,16 +1626,6 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
-"Mk" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/item/stack/sheet/mineral/plasma/five,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
"Mn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -1893,6 +1884,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plating,
/area/ship/cargo)
"QI" = (
@@ -2124,9 +2117,9 @@
pixel_x = 6;
pixel_y = 7
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/machinery/light/directional/west,
/obj/item/storage/box/lights/mixed,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"WZ" = (
@@ -2206,12 +2199,11 @@
/turf/open/floor/plasteel/mono,
/area/ship/medical)
"YE" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 8;
- name = "engine fuel pump"
- },
/obj/structure/catwalk/over,
/obj/machinery/computer/helm/viewscreen/directional/north,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 6
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"YJ" = (
@@ -2381,7 +2373,7 @@ tq
CD
vn
WL
-Mk
+IF
IF
as
kf
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
index 93c59445ee41..f910af5043c8 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -72,7 +72,7 @@
/turf/open/floor/plating/rust,
/area/ship/crew/toilet)
"aQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4,
/turf/open/floor/plasteel,
/area/ship/cargo)
"aR" = (
@@ -97,6 +97,15 @@
/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
+"bh" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
"bk" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
dir = 4
@@ -153,17 +162,17 @@
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"bz" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering/atmospherics)
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/carpet/nanoweave,
+/area/ship/hallway/central)
"bA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 6
},
@@ -173,9 +182,6 @@
/turf/open/floor/engine,
/area/ship/engineering/atmospherics)
"bG" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/reinforced/spawner/west,
/obj/machinery/door/poddoor{
dir = 4;
@@ -184,13 +190,15 @@
/obj/machinery/door/window/eastleft{
name = "Engine Access"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"bI" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/fulltile,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"bO" = (
/obj/structure/table/reinforced,
@@ -224,10 +232,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/ship/cargo)
"cd" = (
@@ -269,7 +277,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
@@ -432,17 +439,15 @@
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"dO" = (
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 10
- },
+/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer4,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"dS" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 5
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -466,9 +471,6 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"dZ" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
- dir = 4
- },
/obj/structure/fireaxecabinet{
pixel_y = -29
},
@@ -806,6 +808,16 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/carpet/red,
/area/ship/hallway/central)
+"fQ" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+ dir = 1;
+ name = "Fuel Pump"
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/cargo)
"fT" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 9
@@ -941,7 +953,7 @@
"gO" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
- name = "engine fuel pump"
+ name = "thruster fuel pump"
},
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/structure/catwalk/over/plated_catwalk/dark,
@@ -1515,18 +1527,14 @@
/turf/open/floor/wood,
/area/ship/crew/crewthree)
"lg" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"lh" = (
@@ -1606,9 +1614,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"lY" = (
@@ -1661,7 +1667,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ship/crew/toilet)
"mF" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
+/obj/machinery/power/shuttle/engine/fire{
dir = 4
},
/turf/open/floor/plating/airless,
@@ -1702,7 +1708,6 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"mS" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
dir = 8
@@ -1803,13 +1808,12 @@
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"np" = (
@@ -1876,6 +1880,9 @@
/obj/machinery/door/firedoor/border_only{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"ok" = (
@@ -1911,7 +1918,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
@@ -2066,6 +2072,9 @@
/obj/machinery/door/firedoor/border_only{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"pT" = (
@@ -2125,20 +2134,15 @@
/turf/open/floor/plasteel,
/area/ship/cargo)
"qF" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
+/obj/machinery/power/shuttle/engine/fire{
dir = 4
},
/turf/open/floor/plating,
/area/ship/external)
"qK" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Plasma to Engines and Mix"
- },
-/obj/effect/turf_decal/atmos/plasma{
- dir = 1
- },
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"qR" = (
/obj/machinery/door/airlock/mining{
@@ -2350,6 +2354,9 @@
dir = 4
},
/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/ship/engineering/atmospherics)
"sD" = (
@@ -2359,13 +2366,18 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"sJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 10
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"sK" = (
@@ -2483,14 +2495,10 @@
/turf/closed/wall,
/area/ship/crew/office)
"tF" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/atmospherics/components/binary/pump/layer4{
dir = 1;
name = "Emergency Recycling Override"
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
@@ -2527,24 +2535,23 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"ub" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/effect/turf_decal/techfloor/corner{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"ug" = (
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 9
+ },
/turf/open/floor/plasteel,
/area/ship/cargo)
"uh" = (
@@ -2644,9 +2651,6 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"uM" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 5
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -2805,9 +2809,6 @@
/turf/open/floor/wood,
/area/ship/crew/office)
"vW" = (
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
dir = 1
},
@@ -2850,6 +2851,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"wg" = (
@@ -2880,8 +2882,13 @@
/turf/open/floor/wood,
/area/ship/crew/crewtwo)
"wt" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "thruster fuel pump"
+ },
+/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"ww" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2932,7 +2939,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
dir = 1
},
-/turf/open/floor/engine/plasma,
+/turf/open/floor/engine/airless,
/area/ship/engineering/atmospherics)
"wG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3071,10 +3078,10 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"yh" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/item/radio/intercom/directional/east,
/turf/open/floor/plasteel,
/area/ship/cargo)
"yj" = (
@@ -3106,11 +3113,9 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"yF" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -3206,11 +3211,11 @@
/turf/open/floor/plasteel,
/area/ship/cargo)
"zy" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
- name = "engine fuel pump"
+ name = "thruster fuel pump"
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"zC" = (
@@ -3240,11 +3245,9 @@
/area/ship/crew/toilet)
"zK" = (
/obj/machinery/light/directional/east,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4,
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/effect/turf_decal/industrial/outline/orange,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"zM" = (
@@ -3362,13 +3365,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/trinary/mixer/flipped{
- dir = 4;
- name = "Chamber Mixer"
- },
/obj/item/paper/crumpled{
default_raw_text = "66% Oxy (Node 1) to 34% Plasma (Node 2) works great at 500 kPa."
},
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 8;
+ name = "engine fuel pump"
+ },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"AP" = (
@@ -3589,6 +3592,9 @@
dir = 4
},
/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/ship/engineering/atmospherics)
"CB" = (
@@ -3603,7 +3609,6 @@
"CE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -3630,12 +3635,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/cryo)
"CR" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"CV" = (
@@ -3718,7 +3721,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
dir = 1
},
-/turf/open/floor/engine/plasma,
+/turf/open/floor/engine/hydrogen,
/area/ship/engineering/atmospherics)
"DL" = (
/obj/effect/decal/cleanable/food/flour,
@@ -3813,9 +3816,6 @@
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/bridge)
"EE" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/reinforced/spawner/west,
/obj/machinery/door/poddoor{
dir = 4;
@@ -3824,6 +3824,9 @@
/obj/machinery/door/window/eastright{
name = "Engine Access"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"EF" = (
@@ -3852,16 +3855,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/turf_decal/techfloor{
dir = 6
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"EP" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 9
- },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"ES" = (
@@ -4062,15 +4061,13 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"Hm" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 6
- },
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+ name = "Oxygen to Mix"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Hq" = (
@@ -4088,10 +4085,13 @@
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Hu" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible,
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
dir = 5
},
+/obj/effect/turf_decal/atmos/mix,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"HA" = (
@@ -4141,7 +4141,6 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -4179,24 +4178,20 @@
/turf/open/floor/wood,
/area/ship/crew/dorm)
"IV" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-4"
},
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Jj" = (
@@ -4204,12 +4199,15 @@
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Jk" = (
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
- dir = 4
- },
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
+ dir = 6
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Jm" = (
@@ -4217,9 +4215,6 @@
icon_state = "1-2"
},
/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"Jn" = (
@@ -4322,12 +4317,12 @@
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
"Kd" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 10
- },
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 10
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Kf" = (
@@ -4481,6 +4476,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4,
/turf/open/floor/plasteel,
/area/ship/cargo)
"Lv" = (
@@ -4496,15 +4492,9 @@
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Lz" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -4512,6 +4502,8 @@
dir = 1
},
/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"LA" = (
@@ -4601,6 +4593,9 @@
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
+ dir = 6
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Mr" = (
@@ -4660,16 +4655,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/turf_decal/techfloor/corner,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"MP" = (
@@ -4784,21 +4775,20 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/ship/cargo)
"NH" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"NK" = (
@@ -4828,19 +4818,15 @@
/turf/open/floor/plasteel,
/area/ship/cargo)
"Oo" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Op" = (
@@ -4903,6 +4889,16 @@
},
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
+"OQ" = (
+/obj/machinery/door/poddoor{
+ id = "amogusdoors";
+ name = "Cargo Bay Blast Door"
+ },
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/ship/cargo)
"OT" = (
/obj/effect/turf_decal/corner/opaque/white/mono,
/turf/open/floor/plasteel,
@@ -4944,6 +4940,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/ship/cargo)
"Px" = (
@@ -5072,9 +5071,6 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/atmospherics/components/binary/pump{
- name = "Oxygen to Mix"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
@@ -5099,9 +5095,11 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Rv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/fulltile,
+/obj/machinery/atmospherics/pipe/simple/brown/visible,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
"Rw" = (
/obj/structure/railing{
dir = 8
@@ -5120,12 +5118,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -5133,6 +5125,8 @@
dir = 8
},
/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"RK" = (
@@ -5278,6 +5272,11 @@
/obj/effect/turf_decal/techfloor/corner{
dir = 4
},
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Th" = (
@@ -5321,7 +5320,6 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"TG" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
@@ -5402,18 +5400,14 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo/office)
"Uk" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Uo" = (
@@ -5430,12 +5424,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Uu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
@@ -5647,7 +5641,6 @@
"Ws" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -5733,14 +5726,13 @@
/turf/closed/wall,
/area/ship/crew/cryo)
"Xe" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
@@ -5753,12 +5745,6 @@
"Xp" = (
/turf/closed/wall/r_wall,
/area/ship/cargo/office)
-"Xs" = (
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/structure/window/plasma/reinforced/fulltile,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
"Xt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
@@ -5853,21 +5839,16 @@
/turf/open/floor/plating,
/area/ship/cargo)
"Yn" = (
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 2
},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 1
- },
/obj/effect/turf_decal/techfloor{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/atmospherics)
"Yp" = (
@@ -5890,11 +5871,10 @@
/turf/open/floor/plasteel,
/area/ship/cargo)
"Yv" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{
+/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Yx" = (
/obj/structure/chair/sofa/brown/right/directional/south,
@@ -5959,10 +5939,13 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Zr" = (
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer4{
- dir = 10
- },
/obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/components/binary/volume_pump{
+ name = "Fuel Pump"
+ },
+/obj/machinery/atmospherics/components/binary/valve/on/layer4{
+ name = "Emergency Stop"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"Zu" = (
@@ -6012,7 +5995,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer4,
/turf/open/floor/plasteel,
/area/ship/cargo)
"ZJ" = (
@@ -6131,7 +6117,7 @@ fW
kz
kz
JT
-gO
+wt
gO
dJ
xO
@@ -6177,7 +6163,7 @@ Yn
Uk
ub
Oo
-yF
+bI
Xe
yF
CR
@@ -6195,7 +6181,7 @@ kz
pT
At
RK
-wt
+qK
dS
Ra
tF
@@ -6212,10 +6198,10 @@ Kz
Fc
lW
sJ
-bz
+qK
dO
qK
-bI
+Rv
DF
kz
fW
@@ -6247,7 +6233,7 @@ Mq
zK
Zr
Ew
-Xs
+Rv
wC
kz
fW
@@ -6403,14 +6389,14 @@ WZ
rW
cS
sU
-gc
+bh
Fu
Yp
TI
PI
Pq
-JE
-Ym
+fQ
+OQ
fW
"}
(13,1,1) = {"
@@ -6435,10 +6421,10 @@ WZ
tI
xb
hA
-gc
+bz
Ls
aQ
-Rv
+aQ
ZI
ug
jv
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index 2ae859c2bcfe..919770509bec 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -27,8 +27,8 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/light/directional/east,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/port)
"aw" = (
@@ -141,9 +141,6 @@
/turf/open/floor/plasteel/mono,
/area/ship/hangar/starboard)
"bB" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -151,6 +148,9 @@
/obj/structure/window/plasma/reinforced{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/engines/starboard)
"bD" = (
@@ -1052,14 +1052,14 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/port)
"is" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/door/poddoor{
dir = 4;
id = "lib_engine_blast"
},
+/obj/machinery/power/shuttle/engine/fire{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/engines/port)
"it" = (
@@ -1318,7 +1318,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/starboard)
"kw" = (
@@ -1347,6 +1347,13 @@
},
/turf/open/floor/plasteel/mono,
/area/ship/hangar/starboard)
+"kO" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/starboard)
"kR" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2,
/obj/structure/window/plasma/reinforced,
@@ -1898,15 +1905,16 @@
/area/ship/crew/canteen)
"qp" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer2{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-10"
},
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/components/trinary/mixer/flipped/layer2{
+ dir = 1
+ },
+/obj/item/paper/guides/jobs/engi/combustion_thruster,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/starboard)
"qy" = (
@@ -1922,6 +1930,13 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/dark,
/area/ship/hangar/starboard)
+"qA" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engines/port)
"qB" = (
/obj/machinery/door/poddoor/shutters{
id = "lib_armory_1";
@@ -3412,8 +3427,8 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/light/directional/east,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/starboard)
"Dq" = (
@@ -3891,14 +3906,14 @@
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"FN" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/door/poddoor{
dir = 4;
id = "lib_engine_blast"
},
+/obj/machinery/power/shuttle/engine/fire{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/engines/starboard)
"FO" = (
@@ -5131,15 +5146,15 @@
/area/ship/engineering)
"Ph" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/atmospherics/components/trinary/mixer/layer2{
- dir = 1
- },
/obj/structure/cable{
icon_state = "2-9"
},
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/components/trinary/mixer/layer2{
+ dir = 1
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/port)
"Pi" = (
@@ -5795,7 +5810,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/port)
"UB" = (
@@ -5863,9 +5878,6 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"UM" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -5873,6 +5885,9 @@
/obj/structure/window/plasma/reinforced{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering/engines/port)
"Vc" = (
@@ -6805,14 +6820,14 @@ hK
ys
Uw
au
-Uw
+qA
lc
qZ
QI
TV
kq
Dm
-kq
+kO
OS
ps
TV
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
index 8a411993f382..d8d7b6714d6e 100644
--- a/_maps/shuttles/roumain/srm_elder.dmm
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -2026,9 +2026,9 @@
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/storage/backpack/satchel/leather,
-/obj/item/ammo_box/c45_speedloader,
-/obj/item/ammo_box/c45_speedloader,
-/obj/item/ammo_box/c45,
+/obj/item/ammo_box/a44roum_speedloader,
+/obj/item/ammo_box/a44roum_speedloader,
+/obj/item/ammo_box/a44roum,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
index 25c1da558e56..22f6c55e224a 100644
--- a/_maps/shuttles/solgov/solgov_inkwell.dmm
+++ b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -826,16 +826,14 @@
/turf/open/floor/wood,
/area/ship/crew/canteen)
"fG" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/techfloor/orange{
- dir = 5
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/turf_decal/corner/opaque/solgovblue{
dir = 8
},
-/obj/structure/sign/poster/solgov/random{
- pixel_y = 32
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
@@ -1441,6 +1439,27 @@
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
+"jJ" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
+"jK" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 6
+ },
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
"jM" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2255,15 +2274,14 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"oG" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
- dir = 5
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/techfloor/orange/corner{
+ dir = 8
},
-/obj/machinery/light/directional/south,
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/atmospherics/components/trinary/mixer/flipped{
+ dir = 4;
+ name = "Fuel Mixer"
},
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"oH" = (
@@ -2602,9 +2620,6 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
@@ -3011,6 +3026,25 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/dorm/dormthree)
+"tz" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/poddoor{
+ id = "sgi_engine";
+ dir = 4
+ },
+/obj/machinery/door/window/westright{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/maintenance/starboard)
"tB" = (
/obj/effect/turf_decal/techfloor/corner,
/obj/effect/turf_decal/techfloor/corner{
@@ -3040,6 +3074,12 @@
},
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm/dormtwo)
+"tE" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
"tK" = (
/obj/structure/table/wood,
/obj/item/radio/intercom/directional/east,
@@ -3095,6 +3135,17 @@
},
/turf/open/floor/plasteel/white,
/area/ship/engineering)
+"ub" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
"uc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -3428,6 +3479,16 @@
},
/turf/open/floor/wood,
/area/ship/bridge)
+"vY" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/light/floor,
+/obj/machinery/power/shuttle/engine/fire{
+ dir = 4
+ },
+/turf/open/floor/engine/hull,
+/area/ship/maintenance/starboard)
"wb" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/maintenance/starboard)
@@ -4636,6 +4697,20 @@
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
+"DL" = (
+/obj/structure/sign/poster/solgov/random{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 5
+ },
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
"DP" = (
/obj/effect/turf_decal/corner/opaque/solgovblue{
dir = 10
@@ -5887,6 +5962,25 @@
},
/turf/open/floor/wood/birch,
/area/ship/crew/dorm/dormthree)
+"MA" = (
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/poddoor{
+ id = "sgi_engine";
+ dir = 4
+ },
+/obj/machinery/door/window/westright{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/maintenance/port)
"MI" = (
/obj/effect/turf_decal/techfloor{
dir = 4
@@ -6295,9 +6389,6 @@
/turf/open/floor/plasteel/stairs/wood/right,
/area/ship/bridge)
"Qt" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
/obj/effect/turf_decal/techfloor/orange{
dir = 10
},
@@ -6311,8 +6402,8 @@
id = "sgi_engine";
name = "engine blast door control"
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
},
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
@@ -6389,16 +6480,13 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"QT" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
+ dir = 5
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"QX" = (
@@ -6718,17 +6806,17 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"SB" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 8;
- piping_layer = 2
- },
-/obj/effect/turf_decal/techfloor/orange{
- dir = 6
- },
/obj/effect/turf_decal/corner/opaque/solgovblue{
dir = 1
},
+/obj/effect/turf_decal/techfloor/orange{
+ dir = 4
+ },
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"SC" = (
@@ -6907,16 +6995,12 @@
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"Ud" = (
-/obj/effect/turf_decal/techfloor/orange{
+/obj/effect/turf_decal/techfloor/orange/corner{
dir = 1
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/light/directional/north,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/atmospherics/components/trinary/mixer{
+ dir = 8;
+ name = "Fuel Mixer"
},
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
@@ -6979,6 +7063,16 @@
},
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen/kitchen)
+"UJ" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/light/floor,
+/obj/machinery/power/shuttle/engine/fire{
+ dir = 4
+ },
+/turf/open/floor/engine/hull,
+/area/ship/maintenance/port)
"UM" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -7062,6 +7156,8 @@
/obj/machinery/newscaster/security_unit/directional/west,
/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/white,
/area/ship/engineering)
"VO" = (
@@ -7375,16 +7471,10 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen/kitchen)
"XQ" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
/obj/effect/turf_decal/techfloor/orange{
dir = 9
},
/obj/effect/turf_decal/corner/opaque/solgovblue,
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/button/door{
pixel_y = 24;
pixel_x = -4;
@@ -7392,6 +7482,9 @@
name = "engine blast door control"
},
/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"XV" = (
@@ -7752,7 +7845,7 @@
(1,1,1) = {"
iG
hE
-zI
+UJ
Hp
Hp
zI
@@ -7778,7 +7871,7 @@ hE
ni
dv
dv
-ni
+vY
hE
iG
iG
@@ -7786,7 +7879,7 @@ iG
(2,1,1) = {"
iG
Od
-op
+MA
op
op
op
@@ -7812,13 +7905,13 @@ DH
Zj
Zj
Zj
-Zj
+tz
DH
iG
iG
"}
(3,1,1) = {"
-iG
+Od
Od
XQ
ia
@@ -7848,12 +7941,12 @@ FG
FH
Qt
DH
-iG
+DH
iG
"}
(4,1,1) = {"
-iG
Od
+jJ
Ud
rD
Bp
@@ -7881,13 +7974,13 @@ Iw
BQ
QT
oG
+ub
DH
iG
-iG
"}
(5,1,1) = {"
-iG
Od
+DL
fG
xs
Xu
@@ -7915,12 +8008,12 @@ xS
nJ
YE
SB
+jK
DH
iG
-iG
"}
(6,1,1) = {"
-iG
+Od
Od
Od
Od
@@ -7950,7 +8043,7 @@ su
DH
DH
DH
-iG
+DH
iG
"}
(7,1,1) = {"
@@ -8041,7 +8134,7 @@ dH
Nb
Kt
qw
-Rr
+tE
sH
Sf
hl
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 445b6391a30d..9782403c12ae 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -43,6 +43,7 @@
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3,
/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"as" = (
@@ -184,7 +185,8 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/open/floor/plating/rust,
/area/ship/maintenance/starboard)
"dD" = (
@@ -1270,15 +1272,15 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
- dir = 4
- },
/obj/effect/turf_decal/industrial/warning/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 10
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"mp" = (
@@ -1968,6 +1970,7 @@
dir = 4
},
/obj/machinery/light/dim/directional/north,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"sV" = (
@@ -2466,12 +2469,12 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/components/binary/volume_pump{
- name = "Input to Fuel"
- },
/obj/effect/turf_decal/industrial/shutoff{
dir = 8
},
+/obj/machinery/atmospherics/components/trinary/mixer/flipped{
+ dir = 1
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"wJ" = (
@@ -4006,9 +4009,6 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/dorm)
"MO" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/plasma/reinforced/spawner{
dir = 8
},
@@ -4020,6 +4020,9 @@
/obj/machinery/door/window/eastleft{
name = "Engine Access"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"MV" = (
@@ -4248,9 +4251,6 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Pt" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
/obj/structure/window/plasma/reinforced/spawner{
dir = 8
},
@@ -4262,6 +4262,9 @@
id = "warship_engines";
name = "Thruster Blast Door"
},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ship/engineering)
"PA" = (
@@ -4472,10 +4475,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 6
- },
/obj/effect/turf_decal/industrial/caution,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"Rf" = (
@@ -4859,13 +4862,14 @@
/obj/structure/railing{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/tank/toxins{
- dir = 8
- },
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
"Vq" = (
@@ -5233,7 +5237,7 @@
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"Yn" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
+/obj/machinery/power/shuttle/engine/fire{
dir = 4
},
/turf/open/floor/plating,
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 3057df12ab14..6e99bc182e61 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -214,8 +214,10 @@
#define ATMOS_TANK_PLASMA "plasma=70000;TEMP=293.15"
#define ATMOS_TANK_O2 "o2=100000;TEMP=293.15"
#define ATMOS_TANK_N2 "n2=100000;TEMP=293.15"
+#define ATMOS_TANK_HYDROGEN "h2=100000;TEMP=293.15"
#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15"
#define ATMOS_TANK_FUEL "o2=33000;plasma=66000;TEMP=293.15"
+#define ATMOS_TANK_HYDROGEN_FUEL "o2=33000;h2=66000;TEMP=293.15"
//PLANETARY
/// what pressure you have to be under to increase the effect of equipment meant for lavaland
@@ -328,6 +330,7 @@
#define GAS_STIMULUM "stim"
#define GAS_PLUOXIUM "pluox"
#define GAS_FREON "freon"
+#define GAS_HYDROGEN "h2"
#define GAS_FLAG_DANGEROUS (1<<0)
#define GAS_FLAG_BREATH_PROC (1<<1)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 2ba7553f823c..241136c297b9 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -176,6 +176,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isidcard(I) (istype(I, /obj/item/card/id))
+#define isbankcard(I) (istype(I, /obj/item/card/bank))
+
#define isstructure(A) (istype(A, /obj/structure))
#define ismachinery(A) (istype(A, /obj/machinery))
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 3386e9952eeb..d6c720380f46 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -11,6 +11,9 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
GLOBAL_VAR_INIT(CELLRATE, 0.002) // conversion ratio between a watt-tick and kilojoule
GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
+GLOBAL_VAR_INIT(total_merits_exchanged, 0)
+GLOBAL_VAR_INIT(hydrogen_stored, 0) // can be -/+, + meaning surplus
+
GLOBAL_LIST_EMPTY(powernets)
GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes
diff --git a/code/datums/components/crafting/recipes/tribal.dm b/code/datums/components/crafting/recipes/tribal.dm
index 83e5c03722bc..c831b85d7878 100644
--- a/code/datums/components/crafting/recipes/tribal.dm
+++ b/code/datums/components/crafting/recipes/tribal.dm
@@ -1,18 +1,16 @@
-/datum/crafting_recipe/bonetalisman
- name = "Bone Talisman"
- result = /obj/item/clothing/accessory/talisman
+/datum/crafting_recipe/bonearmlet
+ name = "Bone Armlet"
+ result = /obj/item/clothing/accessory/bonearmlet
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
-/datum/crafting_recipe/bonenecklace
- name = "Hunter's Necklace"
- result = /obj/item/clothing/accessory/wolftalisman
- time = 35
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/stack/sheet/sinew = 3,
- /obj/item/mob_trophy/wolf_ear = 2,
+/datum/crafting_recipe/fangnecklace
+ name = "Wolf Fang Necklace"
+ result = /obj/item/clothing/neck/fangnecklace
+ time = 20
+ reqs = list(/obj/item/stack/sheet/sinew = 2,
/obj/item/mob_trophy/fang = 1)
category = CAT_PRIMAL
diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index 34771af91ed2..15a580a89328 100644
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -50,9 +50,13 @@
/// Type path of item to go in the glasses slot
var/glasses = null
+ var/wallet = null
+
/// Type path of item to go in the idcard slot
var/id = null
+ var/bank_card = null
+
/// Type path of item for left pocket slot
var/l_pocket = null
@@ -180,8 +184,13 @@
H.equip_to_slot_or_del(new ears(H),ITEM_SLOT_EARS, TRUE)
if(glasses)
H.equip_to_slot_or_del(new glasses(H),ITEM_SLOT_EYES, TRUE)
- if(id)
- H.equip_to_slot_or_del(new id(H),ITEM_SLOT_ID, TRUE)
+ if(!visualsOnly)
+ if(wallet)
+ H.equip_to_slot_or_del(new wallet(H),ITEM_SLOT_ID, TRUE)
+ if(id)
+ H.equip_to_slot_or_del(new id(H),ITEM_SLOT_ID, TRUE)
+ if(bank_card)
+ H.equip_to_slot_or_del(new bank_card(H),ITEM_SLOT_ID, TRUE)
if(suit_store)
H.equip_to_slot_or_del(new suit_store(H),ITEM_SLOT_SUITSTORE, TRUE)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 4cddf93b2478..3e3939620f3c 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -436,6 +436,7 @@ Class Procs:
for(var/obj/item/I in component_parts)
I.forceMove(loc)
component_parts.Cut()
+ SEND_SIGNAL(src, COMSIG_OBJ_DECONSTRUCT, disassembled)
qdel(src)
/**
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/beacon.dm
similarity index 100%
rename from code/game/machinery/Beacon.dm
rename to code/game/machinery/beacon.dm
diff --git a/code/game/machinery/bounty_board.dm b/code/game/machinery/bounty_board.dm
index b0991110e80d..4cc3413fe9d9 100644
--- a/code/game/machinery/bounty_board.dm
+++ b/code/game/machinery/bounty_board.dm
@@ -33,8 +33,8 @@ GLOBAL_LIST_EMPTY(request_list)
/obj/machinery/bounty_board/attackby(obj/item/I, mob/living/user, params)
. = ..()
- if(istype(I,/obj/item/card/id))
- var/obj/item/card/id/current_card = I
+ if(istype(I,/obj/item/card/bank))
+ var/obj/item/card/bank/current_card = I
if(current_card.registered_account)
current_user = current_card.registered_account
return TRUE
@@ -72,9 +72,9 @@ GLOBAL_LIST_EMPTY(request_list)
if(request.applicants)
for(var/datum/bank_account/j in request.applicants)
formatted_applicants += list(list("name" = j.account_holder, "request_id" = request.owner_account.account_id, "requestee_id" = j.account_id))
- var/obj/item/card/id/id_card = user.get_idcard()
- if(id_card?.registered_account)
- current_user = id_card.registered_account
+ var/obj/item/card/bank/bank_card = user.get_bankcard()
+ if(bank_card?.registered_account)
+ current_user = bank_card.registered_account
if(current_user)
data["accountName"] = current_user.account_holder
data["requests"] = formatted_requests
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 0fe059653d5c..3916ad0d4b00 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -534,9 +534,7 @@
if(ishuman(mob_occupant))
dna = C.has_dna()
- var/obj/item/card/id/I = C.get_idcard(TRUE)
- if(I)
- has_bank_account = I.registered_account
+ has_bank_account = C.get_bank_account()
if(isbrain(mob_occupant))
dna = B.stored_dna
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/drone_dispenser.dm
similarity index 100%
rename from code/game/machinery/droneDispenser.dm
rename to code/game/machinery/drone_dispenser.dm
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 60ded054842a..0e6bc6ed6a6d 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -451,11 +451,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/holopad/proc/SetLightsAndPower()
var/total_users = LAZYLEN(masters) + LAZYLEN(holo_calls)
- if(total_users > 0)
- set_active_power()
- else
- set_idle_power()
- active_power_usage = initial(active_power_usage) * total_users
+ //active_power_usage = initial(active_power_usage) * total_users
if(total_users || replay_mode)
set_light(2)
else
diff --git a/code/game/machinery/outpost_electrolyzer.dm b/code/game/machinery/outpost_electrolyzer.dm
new file mode 100644
index 000000000000..29a37c4f95e8
--- /dev/null
+++ b/code/game/machinery/outpost_electrolyzer.dm
@@ -0,0 +1,536 @@
+//allows production of hydrogen from ice chunks
+#define MOLS_PER_ICE 50 //1 ice = 50 mols
+#define MOLS_PER_MERIT 10 //10 mols = 1 merit
+#define MERITS_PER_ICE MOLS_PER_ICE / MOLS_PER_MERIT //1 ice = 5 merits
+#define MERITS_USED_PER_TICK 2
+#define H2_PUMP_SHUTOFF_PRESSURE 4000
+#define CREDITS_TO_MERITS 4 // currently 2:5 credits to mols hydrogen. # of credits per merit
+#define OUTPOST_HYDROGEN_CUT 0.8
+#define HYDROGEN_IDEAL 45000 //used for high and low end of merit multiplier
+#define MERIT_EXPONENT 0.95 //used for diminishing returns, values closer to 1 increase returns, lower decrease.
+
+/obj/machinery/mineral/electrolyzer_unloader
+ name = "ice unloading machine"
+ icon = 'icons/obj/machines/mining_machines.dmi'
+ icon_state = "unloader"
+ density = TRUE
+ input_dir = WEST
+ output_dir = EAST
+ needs_item_input = TRUE
+ processing_flags = START_PROCESSING_MANUALLY
+
+/obj/machinery/mineral/electrolyzer_unloader/pickup_item(datum/source, atom/movable/target, atom/oldLoc)
+ if(istype(target, /obj/structure/ore_box))
+ var/obj/structure/ore_box/box = target
+ for(var/obj/item/stack/ore/ice/chunk in box)
+ unload_mineral(chunk)
+ else if(istype(target, /obj/item/stack/ore/ice))
+ var/obj/item/stack/ore/chunk = target
+ unload_mineral(chunk)
+
+// electrolyzer + console
+
+/obj/machinery/computer/electrolyzer_console
+ name = "electrolyzer console"
+ desc = "Deposits hydrogen merits, with 20% going to outpost upkeep."
+ icon = 'icons/obj/machines/mining_machines.dmi'
+ icon_state = "console"
+
+ var/obj/machinery/mineral/electrolyzer/linked_electrolyzer
+
+/obj/machinery/computer/electrolyzer_console/Initialize()
+ . = ..()
+ find_electrolyzer()
+
+/obj/machinery/computer/electrolyzer_console/proc/find_electrolyzer()
+ for(var/obj/machinery/mineral/electrolyzer/potential in oview(3,src))
+ if(linked_electrolyzer == null)
+ linked_electrolyzer = potential
+ potential.linked_console = src
+
+/obj/machinery/computer/electrolyzer_console/proc/electrolyze_item(obj/item/I)
+ var/obj/item/stack/ore/ice/S = I
+ var/meritval = round(S.get_amount() * MERITS_PER_ICE * OUTPOST_HYDROGEN_CUT,1) // causes a bit of surplus in the "outpost" supply, even if they use all of these merits for hydrogen.
+ GLOB.hydrogen_stored += S.get_amount() * MOLS_PER_ICE
+ new /obj/item/merit/bundle(drop_location(), meritval)
+ qdel(I)
+ playsound(src, 'sound/items/poster_being_created.ogg', 20, FALSE)
+
+/obj/machinery/computer/electrolyzer_console/attackby(item,mob/user)
+ if(istype(item, /obj/item/multitool))
+ var/obj/item/multitool/multi = item
+ if(istype(multi.buffer, /obj/machinery/mineral/electrolyzer))
+ linked_electrolyzer = multi.buffer
+ visible_message("Linked to [linked_electrolyzer]!")
+ return
+ return ..()
+
+/obj/machinery/mineral/electrolyzer
+ name = "ice crusher"
+ desc = "Breaks down ice into hydrogen and oxygen."
+ icon = 'icons/obj/recycling.dmi'
+ icon_state = "grinder-o1"
+ input_dir = WEST
+ density = TRUE
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 50
+ active_power_usage = 1000
+ max_integrity = 500
+ var/crush_damage = 1000
+ var/obj/machinery/computer/electrolyzer_console/linked_console
+ var/datum/weakref/attached_output
+
+/obj/machinery/mineral/electrolyzer/Initialize()
+ . = ..()
+ update_appearance()
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/machinery/computer/electrolyzer_console/attackby(item,mob/user)
+ if(istype(item, /obj/item/multitool))
+ var/obj/item/multitool/multi = item
+ multi.buffer = src
+ to_chat(user, "[src] stored in [multi].")
+ return
+ return ..()
+
+/obj/machinery/mineral/electrolyzer/CanAllowThrough(atom/movable/mover, border_dir)
+ . = ..()
+ if(!anchored)
+ return
+ if(border_dir == input_dir)
+ return TRUE
+
+/obj/machinery/mineral/electrolyzer/proc/on_entered(datum/source, atom/movable/AM)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(electrolyze), AM)
+
+/obj/machinery/mineral/electrolyzer/proc/electrolyze(atom/movable/electrolyze_target, sound=TRUE)
+ if(istype(electrolyze_target, /obj/effect) || !linked_console || !isturf(electrolyze_target.loc) || (machine_stat & (BROKEN|NOPOWER)))
+ return
+ if(!istype(electrolyze_target, /obj/item/stack/ore/ice))
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE, 1)
+ if(isliving(electrolyze_target))
+ crush_living(electrolyze_target)
+ return
+ if(!ismob(electrolyze_target)) //MULCH IT IF IT AINT ICE
+ qdel(electrolyze_target)
+ return
+ else
+ linked_console.electrolyze_item(electrolyze_target)
+
+/obj/machinery/mineral/electrolyzer/proc/crush_living(mob/living/L)
+
+ L.forceMove(loc)
+
+ if(issilicon(L))
+ playsound(src, 'sound/items/welder.ogg', 50, TRUE)
+ else
+ playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
+
+ if(iscarbon(L) && L.stat == CONSCIOUS)
+ L.emote("scream")
+
+ // Instantly lie down, also go unconscious from the pain, before you die.
+ L.Unconscious(100)
+ L.adjustBruteLoss(crush_damage)
+
+//Hydrogen pump stuff
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump
+ name = "hydrogen pump"
+ desc = "Lets you use merits to buy hydrogen."
+ icon = 'icons/obj/atmos.dmi'
+ icon_state = "hydrogen_pump"
+
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 50
+ active_power_usage = 1000
+
+ density = TRUE
+ max_integrity = 400
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 30)
+ layer = OBJ_LAYER
+ showpipe = TRUE
+ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
+ var/not_processing_bug = TRUE//remove when fixed
+ var/merit
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump/examine(mob/user)
+ . = ..()
+ if(merit)
+ . += "[src] has [merit] merits, equaling [merit * MOLS_PER_MERIT] mols of hydrogen."
+ else
+ . += "[src] has no merits, get some from the electrolyzer or buy them to get hydrogen!"
+ . += "[src] is currently [on ? "on" : "off"], and shuts off above [H2_PUMP_SHUTOFF_PRESSURE] kPa."
+ . += "[src] can be Alt-Clicked to eject merits."
+ if(not_processing_bug == TRUE)
+ . += "[src] is temporarily disabled. Check back later!"
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump/process_atmos()
+ ..()
+ var/datum/gas_mixture/air = airs[1] //hydrogen out
+ not_processing_bug = FALSE
+ if(!on)
+ return
+ if(!merit || air.return_pressure() > H2_PUMP_SHUTOFF_PRESSURE)
+ on = FALSE
+ visible_message("[src] shuts off!")
+ playsound(src, 'sound/machines/switch2.ogg', 10, FALSE)
+ return
+ var/meritused
+ if(merit >= MERITS_USED_PER_TICK)
+ merit -= MERITS_USED_PER_TICK
+ meritused = MERITS_USED_PER_TICK
+ else
+ meritused = merit
+ merit = 0
+ on = FALSE
+ air.adjust_moles(GAS_HYDROGEN, meritused * MOLS_PER_MERIT)
+ GLOB.hydrogen_stored -= meritused * MOLS_PER_MERIT
+ air.set_temperature(T20C) //hydrogen from adjust_mols takes the temp of the container, and if the container is empty it defaults to 0K. this works for now
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump/attackby(obj/item/I, mob/user)
+ if(istype(I, /obj/item/merit/bundle))
+ var/obj/item/merit/bundle/C = I
+ merit += C.value
+ to_chat(user, "You deposit [I], for a total of [merit] merits.")
+ qdel(I)
+ return
+ return ..()
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump/attack_hand(mob/user)
+ if(..())
+ return
+ on = !on
+ if(on)
+ SSair.start_processing_machine(src)
+ playsound(src, 'sound/machines/switch3.ogg', 10, FALSE)
+ to_chat(user, "You toggle the pump [on ? "on" : "off"].")
+ investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS)
+ update_appearance()
+
+/obj/machinery/atmospherics/components/unary/hydrogen_pump/AltClick(mob/user)
+ if(merit)
+ new /obj/item/merit/bundle(drop_location(), merit)
+ merit = FALSE
+ playsound(src, 'sound/items/poster_being_created.ogg', 10, FALSE)
+ to_chat(user, "You retrieve the hydrogen merits.")
+ else
+ to_chat(user, "There were no merits left to retrieve.")
+
+
+//Hydrogen exchange
+
+/obj/machinery/computer/hydrogen_exchange
+ name = "Hydrogen Exchange"
+ desc = "Credits to Merits at reasonable rates!"
+ icon_screen = "exchange"
+ icon_keyboard = "power_key"
+
+ //GLOB.total_merits_exchanged starts at 0
+ var/merits = NONE
+ var/credits = NONE
+
+/obj/machinery/computer/hydrogen_exchange/attackby(obj/item/I, mob/user)
+ var/value = 0
+ if(istype(I, /obj/item/spacecash/bundle))
+ var/obj/item/spacecash/bundle/C = I
+ value = C.value
+ else if(istype(I, /obj/item/holochip))
+ var/obj/item/holochip/H = I
+ value = H.credits
+ if(value)
+ credits += value
+ to_chat(user, "You deposit [I], for a total of [credits] credits.")
+ qdel(I)
+ return
+ if(istype(I, /obj/item/merit/bundle))
+ var/obj/item/merit/bundle/C = I
+ merits += C.value
+ to_chat(user, "You deposit [I], for a total of [merits] merits.")
+ qdel(I)
+ return
+ return ..()
+
+/obj/machinery/computer/hydrogen_exchange/proc/meritmultiplier()
+ var/extra = clamp(((GLOB.hydrogen_stored / HYDROGEN_IDEAL) + 1), 0, 2) * 0.3 //results in a number between 0 and .6
+ var/actual = round((0.4 + extra), 0.01) //.4 on low end, 1 on high end
+ return actual
+
+/obj/machinery/computer/hydrogen_exchange/proc/dispense_funds()
+ var/makenoise
+ if(merits)
+ new /obj/item/merit/bundle(drop_location(), merits)
+ merits = 0
+ makenoise = TRUE
+ if(credits)
+ new /obj/item/spacecash/bundle(drop_location(), credits)
+ credits = 0
+ makenoise = TRUE
+ if(makenoise)
+ playsound(src, 'sound/machines/coindrop.ogg', 20, FALSE)
+
+/obj/machinery/computer/hydrogen_exchange/proc/resetmerits() //debug proc
+ GLOB.total_merits_exchanged = 0
+
+/obj/machinery/computer/hydrogen_exchange/proc/convert_to_credits()
+ if(merits)
+ playsound(src, 'sound/machines/pda_button1.ogg', 20, FALSE)
+ var/oldtotal = GLOB.total_merits_exchanged ** MERIT_EXPONENT
+ var/newtotal = (GLOB.total_merits_exchanged + merits) ** MERIT_EXPONENT
+ var/reducedmerits = newtotal - oldtotal
+ GLOB.total_merits_exchanged += merits
+ credits += round(reducedmerits * CREDITS_TO_MERITS, 1)
+ merits = 0
+ else
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 20, FALSE)
+
+/obj/machinery/computer/hydrogen_exchange/proc/convert_to_merits()
+ if(credits)
+ playsound(src, 'sound/machines/pda_button1.ogg', 20, FALSE)
+ merits += round(credits * meritmultiplier() / CREDITS_TO_MERITS, 1)
+ credits = 0
+ else
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 20, FALSE)
+
+/obj/machinery/computer/hydrogen_exchange/AltClick(mob/user)
+ dispense_funds()
+ to_chat(user, "You force the credits and merits out of the machine.")
+
+/obj/machinery/computer/hydrogen_exchange/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "HydrogenExchange", name)
+ ui.open()
+
+/obj/machinery/computer/hydrogen_exchange/ui_data(mob/user)
+ var/next_merit_rate
+ if(GLOB.total_merits_exchanged)
+ next_merit_rate = round((GLOB.total_merits_exchanged ** MERIT_EXPONENT) / GLOB.total_merits_exchanged * CREDITS_TO_MERITS, 0.01)
+ else
+ next_merit_rate = CREDITS_TO_MERITS
+ var/list/data = list()
+ data["credits"] = credits
+ data["merits"] = merits
+ data["next_merit_rate"] = next_merit_rate
+ data["credits_to_merits"] = CREDITS_TO_MERITS
+ data["credit_tax"] = (1 - meritmultiplier()) * 100
+ return data
+
+/obj/machinery/computer/hydrogen_exchange/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("convert_to_credits")
+ convert_to_credits()
+ . = TRUE
+ if("convert_to_merits")
+ convert_to_merits()
+ . = TRUE
+ if("dispense")
+ dispense_funds()
+ . = TRUE
+
+//SCRIP!
+
+/obj/item/merit
+ name = "hydrogen?"
+ desc = "If you can see this, please make a bug report. If you're a mapper, use the bundle subtype!"
+ icon = 'icons/obj/economy.dmi'
+ icon_state = "merit0"
+ throwforce = 1
+ throw_speed = 2
+ throw_range = 2
+ w_class = WEIGHT_CLASS_TINY
+ var/value = 0
+ grind_results = list(/datum/reagent/iron = 10)
+
+/obj/item/merit/Initialize(mapload, amount)
+ . = ..()
+ if(amount)
+ value = amount
+ update_appearance()
+
+/obj/item/merit/attackby(obj/item/I, mob/user)
+ if(!istype(I, /obj/item/merit))
+ return
+ var/obj/item/merit/bundle/bundle
+ if(istype(I, /obj/item/merit/bundle))
+ bundle = I
+ else
+ var/obj/item/merit/cash = I
+ bundle = new (loc)
+ bundle.value = cash.value
+ user.dropItemToGround(cash)
+ qdel(cash)
+
+ bundle.value += value
+ bundle.update_appearance()
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.dropItemToGround(src)
+ H.dropItemToGround(bundle)
+ H.put_in_hands(bundle)
+ to_chat(user, "You add [value] merits worth of money to the bundle.
It now holds [bundle.value] merits.")
+ qdel(src)
+
+/obj/item/merit/Destroy()
+ . = ..()
+ value = 0 // Prevents money from be duplicated anytime.//I'll trust eris on this one
+
+/obj/item/merit/bundle
+ icon_state = "merit16"
+
+/obj/item/merit/bundle/Initialize()
+ . = ..()
+ update_appearance()
+
+/obj/item/merit/bundle/update_appearance()
+ icon_state = "nothing"
+ cut_overlays()
+ var/remaining_value = value
+ var/iteration = 0
+ var/coins_only = TRUE
+ var/list/coin_denominations = list(16, 4, 1)
+ var/list/banknote_denominations = list(4096, 1024, 256, 64)
+ for(var/i in banknote_denominations)
+ while(remaining_value >= i && iteration < 50)
+ remaining_value -= i
+ iteration++
+ var/image/banknote = image('icons/obj/economy.dmi', "merit[i]")
+ var/matrix/M = matrix()
+ M.Translate(rand(-6, 6), rand(-4, 8))
+ banknote.transform = M
+ overlays += banknote
+ coins_only = FALSE
+
+ if(remaining_value)
+ for(var/i in coin_denominations)
+ while(remaining_value >= i && iteration < 50)
+ remaining_value -= i
+ iteration++
+ var/image/coin = image('icons/obj/economy.dmi', "merit[i]")
+ var/matrix/M = matrix()
+ M.Translate(rand(-6, 6), rand(-4, 8))
+ coin.transform = M
+ overlays += coin
+
+ if(coins_only)
+ if(value == 1)
+ name = "one hydrogen merit"
+ desc = "Heavier then it looks."
+ drop_sound = 'sound/items/handling/coin_drop.ogg'
+ pickup_sound = 'sound/items/handling/coin_pickup.ogg'
+ else
+ name = "[value] hydrogen merits"
+ desc = "Heavier than they look."
+ gender = PLURAL
+ drop_sound = 'sound/items/handling/coin_drop.ogg'
+ pickup_sound = 'sound/items/handling/coin_pickup.ogg'
+ else
+ if(value <= 3000)
+ name = "[value] hydrogen merits"
+ gender = NEUTER
+ desc = "Some cold, hard cash."
+ drop_sound = 'sound/items/handling/dosh_drop.ogg'
+ pickup_sound = 'sound/items/handling/dosh_pickup.ogg'
+ else
+ name = "[value] hydrogen merit"
+ gender = NEUTER
+ desc = "That's a lot of dosh."
+ drop_sound = 'sound/items/handling/dosh_drop.ogg'
+ pickup_sound = 'sound/items/handling/dosh_pickup.ogg'
+ return ..()
+
+/obj/item/merit/bundle/attack_self(mob/user)
+ var/cashamount = input(user, "How many merits do you want to take? (0 to [value])", "Take Merits", 20) as num
+ cashamount = round(clamp(cashamount, 0, value))
+ if(!cashamount)
+ return
+
+ if(!Adjacent(user))
+ to_chat(user, "You need to be in arm's reach for that!")
+ return
+
+ value -= cashamount
+ if(!value)
+ user.dropItemToGround(src)
+ qdel(src)
+
+ var/obj/item/merit/bundle/bundle = new (user.loc)
+ bundle.value = cashamount
+ update_appearance()
+
+/obj/item/merit/bundle/AltClick(mob/living/user)
+ var/cashamount = input(user, "How many merits do you want to take? (0 to [value])", "Take Merits", 20) as num
+ cashamount = round(clamp(cashamount, 0, value))
+ if(!cashamount)
+ return
+
+ else if(!Adjacent(user))
+ to_chat(user, "You need to be in arm's reach for that!")
+ return
+
+ value -= cashamount
+ if(!value)
+ user.dropItemToGround(src)
+ qdel(src)
+
+ var/obj/item/merit/bundle/bundle = new (user.loc)
+ bundle.value = cashamount
+ bundle.update_appearance()
+ user.put_in_hands(bundle)
+ update_appearance()
+
+/obj/item/merit/bundle/attack_hand(mob/user)
+ if(user.get_inactive_held_item() != src)
+ return ..()
+ if(value == 0)//may prevent any edge case duping
+ qdel(src)
+ return
+ value--
+ user.put_in_hands(new /obj/item/merit/bundle(loc, 1))
+ update_appearance()
+
+//bundles for mapping + testing
+
+/obj/item/merit/bundle/m1
+ value = 1
+ icon_state = "merit1"
+
+/obj/item/merit/bundle/m4
+ value = 4
+ icon_state = "merit4"
+
+/obj/item/merit/bundle/m16
+ value = 16
+ icon_state = "merit16"
+
+/obj/item/merit/bundle/m64
+ value = 64
+ icon_state = "merit64"
+
+/obj/item/merit/bundle/m256
+ value = 256
+ icon_state = "merit256"
+
+/obj/item/merit/bundle/m1024
+ value = 1024
+ icon_state = "merit1024"
+
+/obj/item/merit/bundle/m4096
+ value = 4096
+ icon_state = "merit4096"
+
+#undef MOLS_PER_ICE
+#undef MOLS_PER_MERIT
+#undef MERITS_PER_ICE
+#undef MERITS_USED_PER_TICK
+#undef H2_PUMP_SHUTOFF_PRESSURE
+#undef CREDITS_TO_MERITS
+#undef MERIT_EXPONENT
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index 351f1c42ae5e..a36bf79a41b3 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -39,7 +39,7 @@
var/chosen_bet_type = "0"
var/last_anti_spam = 0
var/anti_spam_cooldown = 20
- var/obj/item/card/id/my_card
+ var/obj/item/card/bank/my_card
var/playing = FALSE
var/locked = FALSE
var/drop_dir = SOUTH
@@ -81,7 +81,7 @@
data["Spinning"] = playing
if(ishuman(user))
var/mob/living/carbon/human/H = user
- var/obj/item/card/id/C = H.get_idcard(TRUE)
+ var/obj/item/card/bank/C = H.get_bankcard()
if(C)
data["AccountBalance"] = C.registered_account.account_balance
else
@@ -114,7 +114,7 @@
return
if(playing)
return ..()
- if(istype(W, /obj/item/card/id))
+ if(istype(W, /obj/item/card/bank))
playsound(src, 'sound/machines/card_slide.ogg', 50, TRUE)
if(machine_stat & MAINT || !on || locked)
@@ -122,7 +122,7 @@
return FALSE
if(my_card)
- var/obj/item/card/id/player_card = W
+ var/obj/item/card/bank/player_card = W
if(player_card.registered_account.account_balance < chosen_bet_amount) //Does the player have enough funds
audible_message("You do not have the funds to play! Lower your bet or get more money.")
playsound(src, 'sound/machines/buzz-two.ogg', 30, TRUE)
@@ -167,7 +167,7 @@
addtimer(CALLBACK(src, PROC_REF(play), user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first
return TRUE
else
- var/obj/item/card/id/new_card = W
+ var/obj/item/card/bank/new_card = W
if(new_card.registered_account)
var/msg = stripped_input(user, "Name of your roulette wheel:", "Roulette Naming", "Roulette Machine")
if(!msg)
@@ -181,7 +181,7 @@
return ..()
///Proc called when player is going to try and play
-/obj/machinery/roulette/proc/play(mob/user, obj/item/card/id/player_id, bet_type, bet_amount, potential_payout)
+/obj/machinery/roulette/proc/play(mob/user, obj/item/card/bank/player_id, bet_type, bet_amount, potential_payout)
var/payout = potential_payout
@@ -203,7 +203,7 @@
playsound(src, 'sound/machines/piston_lower.ogg', 70)
///Ran after a while to check if the player won or not.
-/obj/machinery/roulette/proc/finish_play(obj/item/card/id/player_id, bet_type, bet_amount, potential_payout, rolled_number)
+/obj/machinery/roulette/proc/finish_play(obj/item/card/bank/player_id, bet_type, bet_amount, potential_payout, rolled_number)
last_spin = rolled_number
var/is_winner = check_win(bet_type, bet_amount, rolled_number) //Predetermine if we won
diff --git a/code/game/machinery/shuttle/shuttle_engine.dm b/code/game/machinery/shuttle/shuttle_engine.dm
index c4fd424d4076..d816b16ca7ff 100644
--- a/code/game/machinery/shuttle/shuttle_engine.dm
+++ b/code/game/machinery/shuttle/shuttle_engine.dm
@@ -8,6 +8,7 @@
desc = "A thruster for shuttles."
circuit = /obj/item/circuitboard/machine/shuttle/engine
CanAtmosPass = FALSE //so people can actually tend to their engines
+ dir = EAST //most ships face east
///Whether or not the engine is enabled and can be used. Controlled from helm consoles and by hitting with a multitool.
var/enabled = TRUE
///How much thrust this engine generates when burned fully.
diff --git a/code/game/machinery/shuttle/shuttle_engine_types.dm b/code/game/machinery/shuttle/shuttle_engine_types.dm
index de9992e106d1..47711bdda3bc 100644
--- a/code/game/machinery/shuttle/shuttle_engine_types.dm
+++ b/code/game/machinery/shuttle/shuttle_engine_types.dm
@@ -82,9 +82,16 @@
if(!found.anchored)
continue
attached_heater = WEAKREF(found)
+ var/obj/machinery/atmospherics/components/unary/shuttle/heater/resolved_heater = attached_heater?.resolve()
+ RegisterSignal(resolved_heater, COMSIG_OBJ_DECONSTRUCT, PROC_REF(remove_heater))
update_icon_state()
return TRUE
+/obj/machinery/power/shuttle/engine/fueled/proc/remove_heater(datum/source, disassembled)
+ SIGNAL_HANDLER
+
+ attached_heater = null
+
/obj/machinery/power/shuttle/engine/fueled/plasma
name = "plasma thruster"
desc = "A thruster that burns plasma from an adjacent heater to create thrust."
@@ -101,6 +108,90 @@
thrust = 15
//All fuel code already handled
+/**
+ * ### Combustion/Fire engines
+ * Engines that use oxidizer and fuel to output thrust. Theoretically works with any mix of fuels and oxiders. Wish me luck.
+*/
+
+/obj/machinery/power/shuttle/engine/fire
+ name = "combustion thruster"
+ desc = "A thruster that burns fuel with oxider that is stored in an adjacent heater."
+ icon_state = "burst_plasma"
+ icon_state_off = "burst_plasma_off"
+ circuit = /obj/item/circuitboard/machine/shuttle/engine/fire
+
+ idle_power_usage = 0
+ ///what portion of the mols in the attached heater to "burn"
+ var/fuel_consumption = 0.0125
+ //multiplier for thrust
+ thrust = 3
+ //used by stockparts, efficiency_multiplier
+ var/consumption_multiplier = 1
+ //If this engine should create heat when burned.
+ var/heat_creation = FALSE
+ //A weakref of the connected engine heater with fuel.
+ var/datum/weakref/attached_heater
+
+
+/obj/machinery/power/shuttle/engine/fire/burn_engine(percentage = 100, deltatime)
+ . = ..()
+ var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/resolved_heater = attached_heater?.resolve()
+ if(!resolved_heater)
+ return
+ if(heat_creation)
+ heat_engine()
+ var/actual_consumption = fuel_consumption * (percentage / 100) * deltatime * consumption_multiplier
+ return resolved_heater.consume_fuel(actual_consumption) * thrust //this proc returns the min of the fuel/oxy possible burns, multiply by our thrust value
+
+/obj/machinery/power/shuttle/engine/fire/return_fuel()
+ . = ..()
+ var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/resolved_heater = attached_heater?.resolve()
+ return resolved_heater?.return_gas()
+
+/obj/machinery/power/shuttle/engine/fire/return_fuel_cap()
+ . = ..()
+ var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/resolved_heater = attached_heater?.resolve()
+ return resolved_heater?.return_gas_capacity()
+
+/obj/machinery/power/shuttle/engine/fire/screwdriver_act(mob/living/user, obj/item/I)
+ . = ..()
+ update_icon_state()
+
+/obj/machinery/power/shuttle/engine/fire/update_engine()
+ if(!..())
+ return
+ if(!attached_heater && !set_heater())
+ thruster_active = FALSE
+ return FALSE
+
+/obj/machinery/power/shuttle/engine/fire/proc/set_heater()
+ for(var/direction in GLOB.cardinals)
+ for(var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/found in get_step(get_turf(src), direction))
+ if(found.dir != dir)
+ continue
+ if(found.panel_open)
+ continue
+ if(!found.anchored)
+ continue
+ attached_heater = WEAKREF(found)
+ var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/resolved_heater = attached_heater?.resolve()
+ RegisterSignal(resolved_heater, COMSIG_OBJ_DECONSTRUCT, PROC_REF(remove_heater))
+ update_icon_state()
+ return TRUE
+
+/obj/machinery/power/shuttle/engine/fire/proc/remove_heater(datum/source, disassembled)
+ SIGNAL_HANDLER
+
+ var/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/resolved_heater = attached_heater?.resolve()
+ UnregisterSignal(resolved_heater, COMSIG_OBJ_DECONSTRUCT)
+ attached_heater = null
+
+/obj/machinery/power/shuttle/engine/fire/RefreshParts()
+ var/laz = 0
+ for(var/obj/item/stock_parts/micro_laser/L in component_parts)
+ laz += L.rating
+ consumption_multiplier = laz
+
/**
* ### Ion Engines
* Engines that convert electricity to thrust. Yes, I know that's not how it works, it needs a propellant, but this is a video game.
@@ -133,6 +224,7 @@
name = "electric engine precharger"
desc = "A medium-capacity, high transfer superconducting magnetic energy storage unit specially made for use with shuttle engines."
icon = 'icons/obj/shuttle.dmi'
+ dir = EAST
input_level = 5000
input_level_max = 50000
output_level = 50000
diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm
index 8578e3fb5a23..2b440f926c32 100644
--- a/code/game/machinery/shuttle/shuttle_heater.dm
+++ b/code/game/machinery/shuttle/shuttle_heater.dm
@@ -4,11 +4,32 @@
//but instead of changing temp, it stores plasma and uses
//it for the engine.
//-----------------------------------------------
+
+#define O2_OXIDATION_VALUE 1
+#define NITRYL_OXIDATION_VALUE 1
+#define NITROUS_OXIDATION_VALUE 3
+
+#define PLASMA_THRUSTER_VALUE 1
+#define TRITRIUM_THRUSTER_VALUE 3
+#define HYDROGEN_THRUSTER_VALUE 0.5
+
+#define NITROUS_COOLING_MULTIPIER 500
+#define NITROUS_COOLING_MIN 173
+
+#define DAMAGE_NONE 0
+#define DAMAGE_LOW 1
+#define DAMAGE_MED 2
+#define DAMAGE_HIGH 3
+
+#define PRESSURE_LIMIT 1010 //in kpa
+#define PRESSURE_DAMAGE_MAX 1200 //gives 10 minutes per stage at the pressure limit
+
/obj/machinery/atmospherics/components/unary/shuttle
name = "shuttle atmospherics device"
desc = "This does something to do with shuttle atmospherics"
icon_state = "heater"
icon = 'icons/obj/shuttle.dmi'
+ dir = EAST
/obj/machinery/atmospherics/components/unary/shuttle/heater
name = "engine heater"
@@ -180,3 +201,262 @@
. = ..()
fuel_tank = new /obj/item/tank/internals/plasma/full(src)
use_tank = TRUE
+
+//combustion heater
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater
+ name = "combustion engine heater"
+ desc = "Directs fuel mix into an attached combustion thruster."
+ icon_state = "heater_pipe"
+ var/icon_state_closed = "heater_pipe"
+ var/icon_state_open = "heater_pipe_open"
+ var/gas_amount = 0 //amount of gas used in calculations
+ var/gas_capacity = 0
+ var/efficiency_multiplier = 1
+ var/pressure_damage = 0
+ var/damage_state = 0
+ var/metal_repair = FALSE //used to see if metal's been added during repair step
+ idle_power_usage = 50
+ circuit = /obj/item/circuitboard/machine/shuttle/fire_heater
+
+ density = TRUE
+ max_integrity = 400
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 30)
+ layer = OBJ_LAYER
+ showpipe = TRUE
+
+ pipe_flags = PIPING_ONE_PER_TURF
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/on_construction(obj_color, set_layer)
+ var/obj/item/circuitboard/machine/shuttle/fire_heater/board = circuit
+ if(board)
+ piping_layer = board.pipe_layer
+ set_layer = piping_layer
+ ..()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/New()
+ . = ..()
+ SetInitDirections()
+ update_adjacent_engines()
+ update_gas_stats()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/Destroy()
+ . = ..()
+ update_adjacent_engines()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/on_construction()
+ ..(dir, dir)
+ SetInitDirections()
+ update_adjacent_engines()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/process_atmos()
+ var/datum/gas_mixture/air_contents = airs[1]
+ var/pressure = air_contents.return_pressure()
+ if(pressure > PRESSURE_LIMIT)
+ pressure_damage += pressure / PRESSURE_LIMIT //always more than 1
+ if(rand(1, 48) == 48) //process_atmos() calls around twice a second, so this'll go off on average every 24 seconds.
+ playsound(loc, "hull_creaking", 60, TRUE, 20, pressure_affected = FALSE) // the ship is Not happy
+ if(pressure_damage >= PRESSURE_DAMAGE_MAX)
+ damage_state += 1 //damage state starts at 0, 1 causes temp leak, 2 causes gas leak, 3 causes explosion
+ pressure_damage = 0 // reset our counter here
+ playsound(loc, 'sound/effects/bang.ogg', 240, TRUE, 5)
+ if(damage_state >= DAMAGE_LOW)
+ var/loc_air = loc.return_air()
+ air_contents.temperature_share(loc_air, 0.4) //equalizes temp with its turf
+ if(damage_state >= DAMAGE_MED)
+ assume_air_ratio(air_contents, 0.01) //leaks a bit of its tank
+ if(damage_state >= DAMAGE_HIGH)
+ var/epicenter = loc
+ explosion(epicenter, 2, 2, 3, 3, TRUE, TRUE) //boom
+ update_parents()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/default_change_direction_wrench(mob/user, obj/item/I)
+ if(!..())
+ return FALSE
+ SetInitDirections()
+ var/obj/machinery/atmospherics/node = nodes[1]
+ if(node)
+ node.disconnect(src)
+ nodes[1] = null
+ if(!parents[1])
+ return
+ nullifyPipenet(parents[1])
+
+ atmosinit()
+ node = nodes[1]
+ if(node)
+ node.atmosinit()
+ node.addMember(src)
+ SSair.add_to_rebuild_queue(src)
+ return TRUE
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/RefreshParts()
+ var/cap = 0
+ var/eff = 0
+ for(var/obj/item/stock_parts/matter_bin/M in component_parts)
+ cap += M.rating
+ for(var/obj/item/stock_parts/micro_laser/L in component_parts)
+ eff += L.rating
+ gas_capacity = 5000 * ((cap - 1) ** 2) + 1000
+ efficiency_multiplier = round(sqrt(eff), 0.1)
+ update_gas_stats()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/examine(mob/user)
+ . = ..()
+ . += "The engine heater's gas dial reads [return_gas()] kPa."
+ . += "A lightly burnt hazard sticker reports a safe pressure of [PRESSURE_LIMIT] kPa. "
+ if(damage_state == DAMAGE_MED && metal_repair == FALSE)
+ . += "The engine heater's plating could be repaired with metal."
+ if(damage_state == DAMAGE_MED && metal_repair == TRUE)
+ . += "The engine heater's plating is ready to be bolted down."
+ if(damage_state == DAMAGE_LOW)
+ . += "The engine heater's insulation layer could be pried back into place."
+ if(damage_state == DAMAGE_NONE && pressure_damage >= PRESSURE_DAMAGE_MAX / 2)
+ . += "The engine heater's screws seem loose."
+ if(damage_state == DAMAGE_NONE && pressure_damage < PRESSURE_DAMAGE_MAX / 2)
+ . += "The engine heater is in good condition."
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/return_gas()
+ var/datum/gas_mixture/air_contents = airs[1]
+ return air_contents?.return_pressure()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/return_gas_capacity()
+ var/datum/gas_mixture/air_contents = airs[1]
+ return air_contents?.return_volume()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/update_gas_stats()
+ var/datum/gas_mixture/air_contents = airs[1]
+ if(!air_contents)
+ return
+ air_contents.set_volume(gas_capacity)
+ air_contents.set_temperature(T20C)
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/has_fuel(required, datum/gas/gas_type)
+ var/datum/gas_mixture/air_contents = airs[1]
+ if(!air_contents)
+ return
+ return air_contents.get_moles(gas_type) >= required
+
+/**
+ * consumes a portion of the mols and checks how much could combust to make thrust.
+ * oxidation_power is the total value of all the oxidizers
+ * fuel_power is ^ but for fuel
+ */
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/consume_fuel(gas_consumed)
+ var/datum/gas_mixture/air_contents = airs[1]
+ if(!air_contents)
+ return
+
+ else
+ var/oxidation_power = 0
+ var/fuel_power = 0
+ var/thrust_power = 0
+ var/gas_amount = 0
+
+ for(var/id in air_contents.get_gases())
+ gas_amount = air_contents.get_moles(id) * gas_consumed //this takes a percent (set by gas_consumed) and multiplies it by the total gas to get the amount of gas used by the calculation.
+
+ switch(id)
+ // adds each oxidizer's power to the total oxidation max
+ if(GAS_O2)
+ oxidation_power += O2_OXIDATION_VALUE * gas_amount
+ if(GAS_NITRYL)
+ oxidation_power += NITRYL_OXIDATION_VALUE * gas_amount
+ if(GAS_NITROUS) //burning nitrous cools down the heater's main tank, just like it cools the intake on real cars.
+ oxidation_power += NITROUS_OXIDATION_VALUE * gas_amount
+ var/heat_capacity = gas_amount * NITROUS_COOLING_MULTIPIER
+ var/air_heat_capacity = air_contents.heat_capacity()
+ var/combined_heat_capacity = heat_capacity + air_heat_capacity
+ if(combined_heat_capacity > 0)
+ var/combined_energy = heat_capacity * NITROUS_COOLING_MIN + air_heat_capacity * air_contents.return_temperature()
+ air_contents.set_temperature(combined_energy / combined_heat_capacity)
+ // adds each fuel gas's power to the fuel max (air.get_fuel_amount is busted, and trit should be Better anyways.)
+ if(GAS_PLASMA)
+ fuel_power += PLASMA_THRUSTER_VALUE * gas_amount
+ if(GAS_TRITIUM)
+ fuel_power += TRITRIUM_THRUSTER_VALUE * gas_amount
+ if(GAS_HYDROGEN)
+ fuel_power += HYDROGEN_THRUSTER_VALUE * gas_amount
+
+ air_contents.adjust_moles(id, -gas_amount)
+ thrust_power = min(oxidation_power, fuel_power) * efficiency_multiplier //"simulates" how much possible thrust either oxidizer or fuel could make, and takes the min
+ return thrust_power
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/attackby(obj/item/I, mob/living/user, params)
+ update_adjacent_engines()
+ if(damage_state == DAMAGE_MED && istype(I, /obj/item/stack/sheet/metal) && metal_repair == FALSE) //fix med damage with metal
+ var/obj/item/stack/sheet/metal/S = I
+ if(S.get_amount() < 2)
+ to_chat(user, "You need at least 2 metal sheets to repair [src].")
+ return
+ to_chat(user, "You start adding new plating.")
+ if(do_after(user, 40, src, TRUE))
+ if(!I.use(2))
+ return
+ to_chat(user, "You add new plating.")
+ I.use(1, FALSE, TRUE)
+ metal_repair = TRUE
+ pressure_damage = 0 //lets be nice and not let them explode while fixing this
+ playsound(loc, 'sound/items/deconstruct.ogg', 50)
+ return
+ return
+
+ if(damage_state == DAMAGE_MED && I.tool_behaviour == TOOL_WRENCH && metal_repair == TRUE)
+ to_chat(user, "You start wrenching down the new plating.")
+ if(I.use_tool(src, user, 60, volume=75))
+ metal_repair = FALSE
+ damage_state = DAMAGE_LOW
+ pressure_damage = 0
+ to_chat(user, "You secure the new plating.")
+ return
+ return
+
+ if(damage_state == DAMAGE_LOW && I.tool_behaviour == TOOL_CROWBAR) //fix low damage with screwdriver
+ to_chat(user, "You start prying in the insulation layer.")
+ if(I.use_tool(src, user, 60, volume=75))
+ damage_state = DAMAGE_NONE
+ pressure_damage = 0
+ to_chat(user, "You secure the insulation layer.")
+ return
+ return
+
+ if(damage_state == DAMAGE_NONE && I.tool_behaviour == TOOL_SCREWDRIVER && pressure_damage >= PRESSURE_DAMAGE_MAX / 2) //lets you fix pressure damage before it increases damage state
+ to_chat(user, "You start tightening loose screws.")
+ if(I.use_tool(src, user, 60, volume=75))
+ pressure_damage = 0
+ to_chat(user, "You tighten the screws.")
+ return
+ return
+
+ if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_closed, I))
+ return
+ if(default_pry_open(I))
+ return
+ if(panel_open)
+ if(default_change_direction_wrench(user, I))
+ return
+ if(default_deconstruction_crowbar(I))
+ return
+ return ..()
+
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater/proc/update_adjacent_engines()
+ var/engine_turf = get_step(src, dir)
+ if(!isturf(engine_turf))
+ return
+ for(var/obj/machinery/power/shuttle/engine/E in engine_turf)
+ E.update_icon_state()
+
+/obj/item/paper/guides/jobs/engi/combustion_thruster
+ name = "paper- 'Combustion Thruster Safety Instructions'"
+ default_raw_text = {"Combustion Thruster Basics
+ Firstly, combustion thrusters are delicate machines due to their unique function, and therefore come with certain limits to said function.
+ The specific limit to remember is 1000 kPa, above which your warranty will expire and the combustion heater will begin to take damage, with catastrophic failure inevitable after long periods of high pressure.
+ The second thing to keep in mind is the fuel mix you are using. If you put in the wrong ratio, the thruster will waste the excess and you'll get less thrust.
+ The most notable mixes are a 2:1 ratio of hydrogen to oxygen and a 1:1 ratio of plasma to oxygen.
+ Additionally, nitrous oxide has been known to provide beneficial properties on top of being a potent oxidizer.
+
+ It's making scary noises and leaking!
+ Set your internals, pull a fire alarm, grab a fire suit, and continue with the following steps. Ensure you disable all sources of ignition!
+ - Place two metal sheets over the leak in the heater.
+ - Wrench the new sheets of metal into place to stop the leak.
+ - Pry the insulation layer into place with a crowbar to stop the heat transfer.
+ - For minor damages, tighten loosened screws.
"}
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/sleeper.dm
similarity index 100%
rename from code/game/machinery/Sleeper.dm
rename to code/game/machinery/sleeper.dm
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index d763c46e84e9..08d1514f7bbe 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -468,12 +468,18 @@
/obj/structure/salvageable/destructive_analyzer
)
+/obj/effect/spawner/lootdrop/ripley
+ name = "25% mech 75% wreckage ripley spawner"
+ loot = list(/obj/mecha/working/ripley/mining = 1,
+ /obj/structure/mecha_wreckage/ripley = 5)
+ lootdoubles = FALSE
+
/obj/effect/spawner/lootdrop/salvage_50
name = "50% salvage spawner"
loot = list(
/obj/effect/spawner/lootdrop/maintenance = 13,
/obj/effect/spawner/lootdrop/salvage_machine = 12,
- /obj/effect/spawner/lootdrop/whiteship_cere_ripley = 12,
+ /obj/effect/spawner/lootdrop/ripley = 12,
/obj/structure/closet/crate/secure/loot = 13,
"" = 50
)
diff --git a/code/game/objects/items/bank_card.dm b/code/game/objects/items/bank_card.dm
new file mode 100644
index 000000000000..4a7f2f9d2f21
--- /dev/null
+++ b/code/game/objects/items/bank_card.dm
@@ -0,0 +1,160 @@
+/obj/item/card/bank
+ name = "cash card"
+ desc = "Managed by a bank outside the sector."
+ icon_state = "data_1"
+ var/mining_points = 0 //For redeeming at mining equipment vendors
+
+ var/registered_name = null // The name registered_name on the card
+ var/datum/bank_account/registered_account
+ var/obj/machinery/paystand/my_store
+
+/obj/item/card/bank/Destroy()
+ if (registered_account)
+ registered_account.bank_cards -= src
+ if (my_store && my_store.my_card == src)
+ my_store.my_card = null
+ return ..()
+
+/obj/item/card/bank/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/holochip))
+ insert_money(W, user)
+ return
+ else if(istype(W, /obj/item/spacecash/bundle))
+ insert_money(W, user, TRUE)
+ return
+ else if(istype(W, /obj/item/coin))
+ insert_money(W, user, TRUE)
+ return
+ else if(istype(W, /obj/item/storage/bag/money))
+ var/obj/item/storage/bag/money/money_bag = W
+ var/list/money_contained = money_bag.contents
+
+ var/money_added = mass_insert_money(money_contained, user)
+
+ if (money_added)
+ to_chat(user, "You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")
+ return
+ else
+ return ..()
+
+/obj/item/card/bank/proc/insert_money(obj/item/I, mob/user, physical_currency)
+ var/cash_money = I.get_item_credit_value()
+ if(!cash_money)
+ to_chat(user, "[I] doesn't seem to be worth anything!")
+ return
+
+ if(!registered_account)
+ to_chat(user, "[src] doesn't have a linked account to deposit [I] into!")
+ return
+
+ registered_account.adjust_money(cash_money)
+ SSblackbox.record_feedback("amount", "credits_inserted", cash_money)
+ log_econ("[cash_money] credits were inserted into [src] owned by [src.registered_name]")
+ if(physical_currency)
+ to_chat(user, "You stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.")
+ else
+ to_chat(user, "You insert [I] into [src], adding [cash_money] credits to the linked account.")
+
+ to_chat(user, "The linked account now reports a balance of [registered_account.account_balance] cr.")
+ qdel(I)
+
+/obj/item/card/bank/proc/mass_insert_money(list/money, mob/user)
+ if (!money || !money.len)
+ return FALSE
+
+ var/total = 0
+
+ for (var/obj/item/physical_money in money)
+ var/cash_money = physical_money.get_item_credit_value()
+
+ total += cash_money
+
+ registered_account.adjust_money(cash_money)
+ SSblackbox.record_feedback("amount", "credits_inserted", total)
+ log_econ("[total] credits were inserted into [src] owned by [src.registered_name]")
+ QDEL_LIST(money)
+
+ return total
+
+/obj/item/card/bank/proc/alt_click_can_use_id(mob/living/user)
+ if(!isliving(user))
+ return
+ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+
+ return TRUE
+
+// Returns true if new account was set.
+/obj/item/card/bank/proc/set_new_account(mob/living/user)
+ . = FALSE
+ var/datum/bank_account/old_account = registered_account
+
+ var/new_bank_id = input(user, "Enter your account ID number.", "Account Reclamation", 111111) as num | null
+
+ if (isnull(new_bank_id))
+ return
+
+ if(!alt_click_can_use_id(user))
+ return
+ if(!new_bank_id || new_bank_id < 111111 || new_bank_id > 999999)
+ to_chat(user, "The account ID number needs to be between 111111 and 999999.")
+ return
+ if (registered_account && registered_account.account_id == new_bank_id)
+ to_chat(user, "The account ID was already assigned to this card.")
+ return
+
+ for(var/A in SSeconomy.bank_accounts)
+ var/datum/bank_account/B = A
+ if(B.account_id == new_bank_id)
+ if (old_account)
+ old_account.bank_cards -= src
+
+ B.bank_cards += src
+ registered_account = B
+ to_chat(user, "The provided account has been linked to this ID card.")
+
+ return TRUE
+
+ to_chat(user, "The account ID number provided is invalid.")
+ return
+
+/obj/item/card/bank/AltClick(mob/living/user)
+ if(!alt_click_can_use_id(user))
+ return
+
+ if(!registered_account)
+ set_new_account(user)
+ return
+
+ var/amount_to_remove = FLOOR(input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num|null, 1)
+
+ if(!amount_to_remove || amount_to_remove < 0)
+ return
+ if(!alt_click_can_use_id(user))
+ return
+ if(registered_account.adjust_money(-amount_to_remove))
+ var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
+ user.put_in_hands(holochip)
+ to_chat(user, "You withdraw [amount_to_remove] credits into a holochip.")
+ SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
+ log_econ("[amount_to_remove] credits were removed from [src] owned by [registered_account.account_holder]")
+ return
+ else
+ var/difference = amount_to_remove - registered_account.account_balance
+ registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal.", TRUE)
+
+/obj/item/card/bank/examine(mob/user)
+ . = ..()
+ if(registered_account)
+ . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+ . += "The card indicates that the holder is [registered_account.holder_age] years old. [(registered_account.holder_age < AGE_MINOR) ? "There's a holographic stripe that reads 'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO' along the bottom of the card." : ""]"
+ . += "Alt-Click the ID to pull money from the linked account in the form of holochips."
+ . += "You can insert credits into the linked account by pressing holochips, cash, or coins against the ID."
+ . += "If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number."
+ else
+ . += "There is no registered account linked to this card. Alt-Click to add one."
+ if(mining_points)
+ . += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
+
+/obj/item/card/bank/GetBankCard()
+ return src
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 110121dc08e2..ae7aa27cdc3f 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -149,14 +149,12 @@
slot_flags = ITEM_SLOT_ID
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
- var/mining_points = 0 //For redeeming at mining equipment vendors
var/list/access = list()
var/list/ship_access = list()
var/registered_name = null // The name registered_name on the card
var/assignment = null
var/access_txt // mapping aid
- var/datum/bank_account/registered_account
- var/obj/machinery/paystand/my_store
+ //var/datum/bank_account/registered_account
var/uses_overlays = TRUE
var/icon/cached_flat_icon
var/registered_age = 18 // default age for ss13 players
@@ -171,13 +169,6 @@
update_appearance()
RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet))
-/obj/item/card/id/Destroy()
- if (registered_account)
- registered_account.bank_cards -= src
- if (my_store && my_store.my_card == src)
- my_store.my_card = null
- return ..()
-
/obj/item/card/id/attack_self(mob/user)
if(Adjacent(user))
var/id_message = "\the [initial(name)] "
@@ -201,173 +192,29 @@
if(NAMEOF(src, assignment),NAMEOF(src, registered_name),NAMEOF(src, registered_age))
update_label()
-/obj/item/card/id/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/holochip))
- insert_money(W, user)
- return
- else if(istype(W, /obj/item/spacecash/bundle))
- insert_money(W, user, TRUE)
- return
- else if(istype(W, /obj/item/coin))
- insert_money(W, user, TRUE)
- return
- else if(istype(W, /obj/item/storage/bag/money))
- var/obj/item/storage/bag/money/money_bag = W
- var/list/money_contained = money_bag.contents
-
- var/money_added = mass_insert_money(money_contained, user)
-
- if (money_added)
- to_chat(user, "You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")
- return
- else
- return ..()
-
-/obj/item/card/id/proc/insert_money(obj/item/I, mob/user, physical_currency)
- var/cash_money = I.get_item_credit_value()
- if(!cash_money)
- to_chat(user, "[I] doesn't seem to be worth anything!")
- return
-
- if(!registered_account)
- to_chat(user, "[src] doesn't have a linked account to deposit [I] into!")
- return
-
- registered_account.adjust_money(cash_money)
- SSblackbox.record_feedback("amount", "credits_inserted", cash_money)
- log_econ("[cash_money] credits were inserted into [src] owned by [src.registered_name]")
- if(physical_currency)
- to_chat(user, "You stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.")
- else
- to_chat(user, "You insert [I] into [src], adding [cash_money] credits to the linked account.")
-
- to_chat(user, "The linked account now reports a balance of [registered_account.account_balance] cr.")
- qdel(I)
-
-/obj/item/card/id/proc/mass_insert_money(list/money, mob/user)
- if (!money || !money.len)
- return FALSE
-
- var/total = 0
-
- for (var/obj/item/physical_money in money)
- var/cash_money = physical_money.get_item_credit_value()
-
- total += cash_money
-
- registered_account.adjust_money(cash_money)
- SSblackbox.record_feedback("amount", "credits_inserted", total)
- log_econ("[total] credits were inserted into [src] owned by [src.registered_name]")
- QDEL_LIST(money)
-
- return total
-
-/obj/item/card/id/proc/alt_click_can_use_id(mob/living/user)
- if(!isliving(user))
- return
- if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
-
- return TRUE
-
-// Returns true if new account was set.
-/obj/item/card/id/proc/set_new_account(mob/living/user)
- . = FALSE
- var/datum/bank_account/old_account = registered_account
-
- var/new_bank_id = input(user, "Enter your account ID number.", "Account Reclamation", 111111) as num | null
-
- if (isnull(new_bank_id))
- return
-
- if(!alt_click_can_use_id(user))
- return
- if(!new_bank_id || new_bank_id < 111111 || new_bank_id > 999999)
- to_chat(user, "The account ID number needs to be between 111111 and 999999.")
- return
- if (registered_account && registered_account.account_id == new_bank_id)
- to_chat(user, "The account ID was already assigned to this card.")
- return
-
- for(var/A in SSeconomy.bank_accounts)
- var/datum/bank_account/B = A
- if(B.account_id == new_bank_id)
- if (old_account)
- old_account.bank_cards -= src
-
- B.bank_cards += src
- registered_account = B
- to_chat(user, "The provided account has been linked to this ID card.")
-
- return TRUE
-
- to_chat(user, "The account ID number provided is invalid.")
- return
-
-/obj/item/card/id/AltClick(mob/living/user)
- if(!alt_click_can_use_id(user))
- return
-
- if(!registered_account)
- set_new_account(user)
- return
-
- var/amount_to_remove = FLOOR(input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num|null, 1)
-
- if(!amount_to_remove || amount_to_remove < 0)
- return
- if(!alt_click_can_use_id(user))
- return
- if(registered_account.adjust_money(-amount_to_remove))
- var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
- user.put_in_hands(holochip)
- to_chat(user, "You withdraw [amount_to_remove] credits into a holochip.")
- SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
- log_econ("[amount_to_remove] credits were removed from [src] owned by [src.registered_name]")
- return
- else
- var/difference = amount_to_remove - registered_account.account_balance
- registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal.", TRUE)
-
/obj/item/card/id/examine(mob/user)
. = ..()
- . += "There's more information below, you can look again to take a closer look..."
-
-/obj/item/card/id/examine_more(mob/user)
- var/list/msg = list("You examine [src] closer, and note the following...")
-
+ . += "
CARD INFO:"
if(registered_name)
- msg += "NAME:"
- msg += "[registered_name]"
+ . += "NAME:"
+ . += "[registered_name]"
if(registered_age)
- msg += "AGE:"
- msg += "[registered_age] years old [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads 'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO' along the bottom of the card." : ""]"
+ . += "AGE:"
+ . += "[registered_age] years old [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads 'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO' along the bottom of the card." : ""]"
if(length(ship_access))
- msg += "SHIP ACCESS:"
+ . += "SHIP ACCESS:"
var/list/ship_factions = list()
for(var/datum/overmap/ship/controlled/ship in ship_access)
var/faction = ship.get_faction()
if(!(faction in ship_factions))
ship_factions += faction
- msg += "[ship_factions.Join(", ")]"
+ . += "[ship_factions.Join(", ")]"
var/list/ship_names = list()
for(var/datum/overmap/ship/controlled/ship in ship_access)
ship_names += ship.name
- msg += "[ship_names.Join(", ")]"
-
- if(registered_account)
- msg += "ACCOUNT:"
- msg += "LINKED ACCOUNT HOLDER: '[registered_account.account_holder]'"
- msg += "BALANCE: [registered_account.account_balance] cr."
- msg += "Alt-click the ID to pull money from the account in the form of holochips."
- msg += "You can insert credits into the account by pressing holochips, cash, or coins against the ID."
- if(registered_account.account_holder == user.real_name)
- msg += "If you lose this ID card, you can reclaim your account by Alt-click a blank ID card and entering your account ID number."
- else
- msg += "There is no registered account. Alt-click to add one."
- return msg
+ . += "[ship_names.Join(", ")]"
/obj/item/card/id/GetAccess()
return access
@@ -483,7 +330,7 @@ update_label()
else
return ..()
- var/popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset", "Change Account ID")
+ var/popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset")
if(user.incapacitated())
return
if(popup_input == "Forge/Reset" && !forged)
@@ -513,17 +360,6 @@ update_label()
to_chat(user, "You successfully forge the ID card.")
log_game("[key_name(user)] has forged \the [initial(name)] with name \"[registered_name]\" and occupation \"[assignment]\".")
- // First time use automatically sets the account id to the user.
- if (first_use && !registered_account)
- if(ishuman(user))
- var/mob/living/carbon/human/accountowner = user
-
- for(var/bank_account in SSeconomy.bank_accounts)
- var/datum/bank_account/account = bank_account
- if(account.account_id == accountowner.account_id)
- account.bank_cards += src
- registered_account = account
- to_chat(user, "Your account number has been automatically assigned.")
return
else if (popup_input == "Forge/Reset" && forged)
registered_name = initial(registered_name)
@@ -535,9 +371,6 @@ update_label()
forged = FALSE
to_chat(user, "You successfully reset the ID card.")
return
- else if (popup_input == "Change Account ID")
- set_new_account(user)
- return
return ..()
/obj/item/card/id/syndicate/anyone
@@ -552,7 +385,6 @@ update_label()
icon_state = "syndie"
access = list(ACCESS_SYNDICATE)
uses_overlays = FALSE
- registered_age = null
/obj/item/card/id/syndicate_command/crew_id
assignment = "Operative"
@@ -740,11 +572,6 @@ update_label()
registered_name = "Prisoner #13-007"
icon_state = "prisoner_007"
-/obj/item/card/id/mining
- name = "mining ID"
- access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MECH_MINING, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
- custom_price = 250
-
/obj/item/card/id/away
name = "\proper a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 4fbe06343ae5..0a3a6f14d097 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -1442,6 +1442,15 @@
/obj/item/stack/cable_coil = 5,
/obj/item/stock_parts/micro_laser = 1)
+/obj/item/circuitboard/machine/shuttle/engine/fire
+ name = "Combustion Thruster (Machine Board)"
+ build_path = /obj/machinery/power/shuttle/engine/fire
+ req_components = list(
+ /obj/item/stock_parts/micro_laser = 1,
+ /obj/item/assembly/igniter = 1,
+ /obj/item/stack/sheet/plasteel = 2
+ )
+
/obj/item/circuitboard/machine/shuttle/engine/electric
name = "Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric
@@ -1497,6 +1506,26 @@
. = ..()
. += "It is set to layer [pipe_layer]."
+/obj/item/circuitboard/machine/shuttle/fire_heater
+ name = "Combustion Engine Heater (Machine Board)"
+ desc = "You can use mulitool to switch pipe layers"
+ var/pipe_layer = PIPING_LAYER_DEFAULT
+ build_path = /obj/machinery/atmospherics/components/unary/shuttle/fire_heater
+ req_components = list(
+ /obj/item/stock_parts/micro_laser = 1,
+ /obj/item/stock_parts/matter_bin = 1
+ )
+
+/obj/item/circuitboard/machine/shuttle/fire_heater/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_MULTITOOL)
+ pipe_layer = (pipe_layer >= PIPING_LAYER_MAX) ? PIPING_LAYER_MIN : (pipe_layer + 1)
+ to_chat(user, "You change the circuitboard to layer [pipe_layer].")
+ return
+
+/obj/item/circuitboard/machine/shuttle/fire_heater/examine()
+ . = ..()
+ . += "It is set to layer [pipe_layer]."
+
/obj/item/circuitboard/machine/shuttle/smes
name = "Electric Engine Precharger (Machine Board)"
build_path = /obj/machinery/power/smes/shuttle
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 91f47f56cdd5..c031e998cdcc 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -117,6 +117,11 @@
else
return ..()
+/obj/item/storage/wallet/GetBankCard()
+ for(var/obj/item/card/I in contents)
+ if(istype(I, /obj/item/card/bank))
+ return I
+
/obj/item/storage/wallet/random
icon_state = "random_wallet"
diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm
index cdd98f22196f..77d75164b185 100644
--- a/code/game/objects/structures/crates_lockers/crates/secure.dm
+++ b/code/game/objects/structures/crates_lockers/crates/secure.dm
@@ -83,10 +83,10 @@
/obj/structure/closet/crate/secure/owned/togglelock(mob/living/user, silent)
if(privacy_lock)
if(!broken)
- var/obj/item/card/id/id_card = user.get_idcard(TRUE)
- if(id_card)
- if(id_card.registered_account)
- if(id_card.registered_account == buyer_account)
+ var/obj/item/card/bank/bank_card = user.get_bankcard()
+ if(bank_card)
+ if(bank_card.registered_account)
+ if(bank_card.registered_account == buyer_account)
if(iscarbon(user))
add_fingerprint(user)
locked = !locked
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 37c816335977..4e95b5558842 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -422,7 +422,7 @@
. = ..()
if(.)
return
- var/obj/item/card/id/potential_acc = usr.get_idcard(hand_first = TRUE)
+ var/obj/item/card/bank/potential_acc = usr.get_bankcard()
switch(action)
if("Buy")
if(!showpiece)
@@ -497,9 +497,9 @@
return TRUE
. = TRUE
/obj/structure/displaycase/forsale/attackby(obj/item/I, mob/living/user, params)
- if(isidcard(I))
+ if(isbankcard(I))
//Card Registration
- var/obj/item/card/id/potential_acc = I
+ var/obj/item/card/bank/potential_acc = I
if(!potential_acc.registered_account)
to_chat(user, "This ID card has no account registered!")
return
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index a7ebeaf57582..33fcf315fc52 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -268,6 +268,7 @@
opacity = FALSE
light_range = 2
light_power = 1
+ mineralType = /obj/item/stack/ore/ice
/turf/closed/mineral/random/snow/underground
baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index a164b159d6f6..7fb94e541bda 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -133,6 +133,13 @@
name = "fuel mix floor"
initial_gas_mix = ATMOS_TANK_FUEL
+/turf/open/floor/engine/hydrogen
+ name = "\improper hydrogen floor"
+ initial_gas_mix = ATMOS_TANK_HYDROGEN
+
+/turf/open/floor/engine/hydrogen_fuel
+ name = "hydrogen mix floor"
+ initial_gas_mix = ATMOS_TANK_HYDROGEN_FUEL
/turf/open/floor/engine/cult
name = "engraved floor"
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index a6edcb075361..d6bbba359303 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -143,10 +143,10 @@
// Pay contractor their portion of ransom
if (status == CONTRACT_STATUS_COMPLETE)
var/mob/living/carbon/human/H
- var/obj/item/card/id/C
+ var/obj/item/card/bank/C
if(ishuman(contract.owner.current))
H = contract.owner.current
- C = H.get_idcard(TRUE)
+ C = H.get_bankcard()
if(C && C.registered_account)
C.registered_account.adjust_money(ransom * 0.35, "syndicate_contract")
diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm
index e128623f9cb8..fb0d7026a6d1 100644
--- a/code/modules/atmospherics/auxgm/gas_types.dm
+++ b/code/modules/atmospherics/auxgm/gas_types.dm
@@ -155,3 +155,15 @@
gas_overlay = "freon"
moles_visible = MOLES_GAS_VISIBLE *30
fusion_power = -5
+
+/datum/gas/hydrogen
+ id = GAS_HYDROGEN
+ specific_heat = 10
+ name = "Hydrogen"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE
+ color = "#ffe"
+ fusion_power = 0
+ fire_products = list(GAS_H2O = 1)
+ fire_burn_rate = 2
+ fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 895bfdc96cf4..e5a1be0294d6 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -121,7 +121,8 @@
GAS_STIMULUM = new/datum/tlv/dangerous,
GAS_NITRYL = new/datum/tlv/dangerous,
GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
- GAS_FREON = new/datum/tlv/dangerous
+ GAS_FREON = new/datum/tlv/dangerous,
+ GAS_HYDROGEN = new/datum/tlv/dangerous
)
/obj/machinery/airalarm/server // No checks here.
@@ -140,7 +141,8 @@
GAS_STIMULUM = new/datum/tlv/no_checks,
GAS_NITRYL = new/datum/tlv/no_checks,
GAS_PLUOXIUM = new/datum/tlv/no_checks,
- GAS_FREON = new/datum/tlv/no_checks
+ GAS_FREON = new/datum/tlv/no_checks,
+ GAS_HYDROGEN = new/datum/tlv/no_checks
)
heating_manage = FALSE
@@ -160,7 +162,8 @@
GAS_STIMULUM = new/datum/tlv/dangerous,
GAS_NITRYL = new/datum/tlv/dangerous,
GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
- GAS_FREON = new/datum/tlv/dangerous
+ GAS_FREON = new/datum/tlv/dangerous,
+ GAS_HYDROGEN = new/datum/tlv/dangerous
)
heating_manage = FALSE
@@ -564,7 +567,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
GAS_BZ,
GAS_STIMULUM,
GAS_PLUOXIUM,
- GAS_FREON
+ GAS_FREON,
+ GAS_HYDROGEN
),
"scrubbing" = 1,
"widenet" = 1
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index c32a750848da..7416014ee463 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -204,18 +204,18 @@
piping_layer = 2
icon_state = "volpump_map-2"
-/obj/machinery/atmospherics/components/binary/volume_pump/layer2
- piping_layer = 2
- icon_state = "volpump_map-2"
+/obj/machinery/atmospherics/components/binary/volume_pump/layer4
+ piping_layer = 4
+ icon_state = "volpump_map-4"
/obj/machinery/atmospherics/components/binary/volume_pump/on
on = TRUE
- icon_state = "volpump_map-2"
+ icon_state = "volpump_on_map-3"
/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2
piping_layer = 2
- icon_state = "volpump_map-2"
+ icon_state = "volpump_on_map-2"
/obj/machinery/atmospherics/components/binary/volume_pump/on/layer4
piping_layer = 4
- icon_state = "volpump_map-4"
+ icon_state = "volpump_on_map-4"
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index ca85e9cc5569..9f5a6a9aa6db 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -178,3 +178,8 @@
name = "\improper Water Vapor Gas Miner"
overlay_color = "#99928E"
spawn_id = GAS_H2O
+
+/obj/machinery/atmospherics/miner/hydrogen
+ name = "\improper Hydrogen Gas Miner"
+ overlay_color = "#ffffffda"
+ spawn_id = GAS_HYDROGEN
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 6b0f025b6b89..f2e563c07b5e 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -52,7 +52,9 @@
"stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
"pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium,
"caution" = /obj/machinery/portable_atmospherics/canister,
- "freon" = /obj/machinery/portable_atmospherics/canister/freon
+ "freon" = /obj/machinery/portable_atmospherics/canister/freon,
+ "hydrogen" = /obj/machinery/portable_atmospherics/canister/hydrogen,
+ "fuel mix" = /obj/machinery/portable_atmospherics/canister/fuel
)
/obj/machinery/portable_atmospherics/canister/interact(mob/user)
@@ -147,6 +149,27 @@
gas_type = GAS_FREON
filled = 1
+/obj/machinery/portable_atmospherics/canister/hydrogen
+ name = "hydrogen canister"
+ desc = "Hydrogen. Used in thruster fuel."
+ icon_state = "orangews"
+ gas_type = GAS_HYDROGEN
+
+/obj/machinery/portable_atmospherics/canister/fuel
+ name = "fuel canister"
+ desc = "A highly volatile mix of hydrogen and oxygen."
+ icon_state = "orangewshaz"
+
+/obj/machinery/portable_atmospherics/canister/fuel_test
+ name = "test canister"
+ desc = "Hydrogen. Used in thruster fuel."
+ icon_state = "orangewshaz"
+
+/obj/machinery/portable_atmospherics/canister/fuel_test/create_gas()
+ air_contents.set_moles(GAS_O2, 500)
+ air_contents.set_moles(GAS_HYDROGEN, 1000)
+ air_contents.set_temperature(T20C)
+
/obj/machinery/portable_atmospherics/canister/fusion_test
name = "fusion test canister"
desc = "Don't be a badmin."
@@ -216,6 +239,11 @@
air_contents.set_moles(GAS_O2, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
air_contents.set_moles(GAS_N2, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
+/obj/machinery/portable_atmospherics/canister/fuel/create_gas()
+ air_contents.set_temperature(starter_temp)
+ air_contents.set_moles(GAS_HYDROGEN, (2/3 * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
+ air_contents.set_moles((GAS_O2), (1/3 * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
+
/obj/machinery/portable_atmospherics/canister/update_icon_state()
if(machine_stat & BROKEN)
icon_state = "[icon_state]-1"
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 8e71222ab4d4..7505d2b8789e 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -8,7 +8,7 @@
var/volume_rate = 1000
var/overpressure_m = 80
var/use_overlays = TRUE
- var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O, GAS_FREON)
+ var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O, GAS_FREON, GAS_HYDROGEN)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
var/turf/T = get_turf(src)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 11358938bd47..0bf0b74c715a 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -224,7 +224,7 @@
C.sensor_mode = NO_SENSORS
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
if(W)
if(H.age)
W.registered_age = H.age
@@ -437,7 +437,7 @@
/datum/outfit/spacebartender/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
if(H.age < AGE_MINOR)
W.registered_age = AGE_MINOR
to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!")
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index b2df34d8f964..4eb48b09c7cb 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -41,7 +41,7 @@
description = "Station 14's Research Director claims that pagan bone talismans protect their wearer. Ship them a few so they can start testing."
reward = 7500
required_count = 3
- wanted_types = list(/obj/item/clothing/accessory/talisman)
+ wanted_types = list(/obj/item/clothing/accessory/bonearmlet)
/datum/bounty/item/mining/bone_dagger
name = "Bone Daggers"
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 9507f883c10a..714bab059f54 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -18,10 +18,10 @@
contains = list(/obj/item/ammo_box/magazine/m45)
cost = 500
-/datum/supply_pack/ammo/m45_speedloader
- name = ".45 ACP Speedloader Crate"
- desc = "Contains a .45 ACP speedloader for the HP Montagne, containing six rounds."
- contains = list(/obj/item/ammo_box/c45_speedloader)
+/datum/supply_pack/ammo/a44roum_speedloader
+ name = ".44 Roumain Speedloader Crate"
+ desc = "Contains a .44 Roumain speedloader for the HP Montagne, containing six rounds."
+ contains = list(/obj/item/ammo_box/a44roum_speedloader)
cost = 400
/datum/supply_pack/ammo/c38_mag
@@ -370,3 +370,21 @@
desc = "Contains a fifty-round box for high-powered gauss guns such as the GAR assault rifle."
contains = list(/obj/item/ammo_box/ferrolancebox)
cost = 250
+
+/datum/supply_pack/ammo/a44roum
+ name = ".44 Roumain Ammo Box Crate"
+ desc = "Contains a fifty-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
+ contains = list(/obj/item/ammo_box/a44roum)
+ cost = 250
+
+/datum/supply_pack/ammo/a44roum_rubber
+ name = ".44 Roumain Rubber Ammo Box Crate"
+ desc = "Contains a fifty-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/ammo_box/a44roum/rubber)
+ cost = 250
+
+/datum/supply_pack/ammo/a44roum_hp
+ name = ".44 Roumain Hollow Point Ammo Box Crate"
+ desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/ammo_box/a44roum/hp)
+ cost = 500
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 3424b48b941a..7fe9e9aa8a11 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -52,7 +52,7 @@
/datum/supply_pack/gun/shadowrevolver
name = "Shadow Revolver Crate"
- desc = "Contains a concealable Shadow revolver, chambered in .45 ACP."
+ desc = "Contains a concealable Shadow revolver, chambered in .44 Roumain."
cost = 1000
contains = list(/obj/item/gun/ballistic/revolver/shadow)
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index 56ed7130738b..f25e4818329e 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -210,6 +210,15 @@
crate_name = "plasma thruster crate"
crate_type = /obj/structure/closet/crate/engineering
+/datum/supply_pack/machinery/combustion_thruster
+ name = "Combustion Thruster Crate"
+ desc = "A crate containing a combustion thruster and its heater's electronics. For when you need complicated thrust."
+ cost = 2000
+ contains = list(/obj/item/circuitboard/machine/shuttle/fire_heater,
+ /obj/item/circuitboard/machine/shuttle/engine/fire)
+ crate_name = "combustion thruster crate"
+ crate_type = /obj/structure/closet/crate/engineering
+
/datum/supply_pack/machinery/drill_crate
name = "Heavy duty laser mining drill"
desc = "An experimental laser-based mining drill that Nanotrasen is kindly allowing YOU, the customer, to opt into testing of."
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index b81588c8e72e..70225b60cc2e 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -50,6 +50,16 @@
display_name = "tie, recolorable"
path = /obj/item/clothing/neck/tie
+//Bone
+/datum/gear/accessory/fangnecklace
+ display_name = "wolf fang necklace"
+ path = /obj/item/clothing/neck/fangnecklace
+
+/datum/gear/accessory/bonearmlet
+ display_name = "bone armlet"
+ path = /obj/item/clothing/accessory/bonearmlet
+ slot = null
+
//Misc
/datum/gear/accessory/waistcoat
diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm
index 4c081a67e92f..6277a8a3a601 100644
--- a/code/modules/client/loadout/loadout_general.dm
+++ b/code/modules/client/loadout/loadout_general.dm
@@ -62,10 +62,6 @@
display_name = "toy, magic eight ball"
path = /obj/item/toy/eightball
-/datum/gear/wallet
- display_name = "wallet"
- path = /obj/item/storage/wallet
-
/datum/gear/pai
display_name = "personal AI device"
path = /obj/item/paicard
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 97eed2728fb6..ce87ea624d7a 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -163,6 +163,16 @@
supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE
+/obj/item/clothing/suit/armor/vest/clip_correspondent
+ name = "press armor vest"
+ desc = "A slim Type I armored vest that provides decent protection against most types of damage. The white letters on the front read \"PRESS\" in CLIP Kalixcian."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "armor_correspondant"
+ item_state = "armor_correspondant"
+
//spacesuits
/obj/item/clothing/suit/space/hardsuit/clip_patroller
name = "\improper CM-410 'Patroller' EVA Hardsuit"
@@ -309,6 +319,17 @@
. = ..()
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_HEAD))
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_correspondent
+ name = "CLIP War Correspondant M10 Helmet"
+ desc = "A light bulletproof helmet worn by War Correspondants of the CLIP."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+ vox_override_icon = 'icons/mob/clothing/faction/clip/vox.dmi'
+
+ icon_state = "clip_m10_correspondant"
+ item_state = "clip_m10_correspondant"
+
/obj/item/clothing/head/helmet/riot/clip
name = "\improper Minutemen riot helmet"
desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 8d5251e9e8c8..3f431df81ccb 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -433,3 +433,9 @@
playsound(src,"shatter", 70)
new /obj/effect/decal/cleanable/glass/strange(get_turf(src))
return ..()
+
+/obj/item/clothing/neck/fangnecklace
+ name = "wolf fang necklace"
+ desc = "A necklace made out of a wolf's fang and some sinew. According to a common Frontier superstition, it brings good luck to its wearer."
+ icon_state = "fang_necklace"
+ cuttable = FALSE
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index 24b3201573d3..db227c2903c7 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -6,8 +6,6 @@
box = /obj/item/storage/box/survival
id = /obj/item/card/id
- r_pocket = /obj/item/storage/wallet
-
// Assistant
/datum/outfit/job/independent/assistant
@@ -314,7 +312,6 @@
jobtype = /datum/job/engineer
belt = /obj/item/storage/belt/utility/full/engi
- l_pocket = /obj/item/storage/wallet
gloves = /obj/item/clothing/gloves/color/yellow
ears = /obj/item/radio/headset/headset_eng
uniform = /obj/item/clothing/under/rank/engineering/engineer
@@ -393,7 +390,6 @@
id = /obj/item/card/id/silver
belt = /obj/item/storage/belt/utility/chief/full
- l_pocket = /obj/item/storage/wallet
ears = /obj/item/radio/headset/headset_com
uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index a8ce0907a35a..1d12eb25c4e9 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -246,6 +246,21 @@
r_pocket = /obj/item/radio
+/datum/outfit/job/clip/correspondant
+ name = "CLIP - War Correspondent"
+ job_icon = "curator"
+ jobtype = /datum/job/curator
+
+ head = /obj/item/clothing/head/helmet/bulletproof/m10/clip_correspondent
+ uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ suit = /obj/item/clothing/suit/armor/vest/clip_correspondent
+ shoes = /obj/item/clothing/shoes/laceup
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+
+ r_pocket = /obj/item/radio
+
// Colonial League Minutemen
/datum/outfit/job/clip/minutemen
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index 93f1ee3a347c..e93c7b4b8e52 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -220,7 +220,6 @@
id = /obj/item/card/id/silver
belt = /obj/item/storage/belt/utility/chief/full
- l_pocket = /obj/item/storage/wallet
ears = /obj/item/radio/headset/headset_com
uniform = /obj/item/clothing/under/nanotrasen/engineering/director
dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index dc8a9c62db09..b425175cb853 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -22,10 +22,11 @@
//generates a codename and assigns syndicate access, used in the twinkleshine.
/datum/outfit/job/syndicate/proc/assign_codename(mob/living/carbon/human/H)
- var/obj/item/card/id/I = H.wear_id
- I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 12)) // squidquest real
- I.access |= list(ACCESS_SYNDICATE)
- I.update_label()
+ var/obj/item/card/id/I = H.get_idcard()
+ if(I)
+ I.registered_name = pick(GLOB.twinkle_names) + "-" + num2text(rand(1, 12)) // squidquest real
+ I.access |= list(ACCESS_SYNDICATE)
+ I.update_label()
//and now, for the Assistants
@@ -199,7 +200,7 @@
/datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
if(H.age < AGE_MINOR)
W.registered_age = AGE_MINOR
to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!")
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 76de51b173cd..f7710d52a12d 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -381,22 +381,13 @@
//OONGA BOONGA//
////////////////
-/obj/item/clothing/accessory/talisman
- name = "bone talisman"
- desc = "A hunter's talisman, some say the old gods smile on those who wear it."
- icon_state = "talisman"
- armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25)
+/obj/item/clothing/accessory/bonearmlet
+ name = "bone armlet"
+ desc = "An armlet made out of animal bone and sinew. According to a common Frontier superstition, it brings good luck to its wearer."
+ icon_state = "bone_armlet"
attachment_slot = ARMS
above_suit = TRUE
-/obj/item/clothing/accessory/wolftalisman
- name = "hunter's necklace"
- desc = "A thick necklace woven from sinew and bits of wolfhide, adorned with a carved fang. Slaying such beasts is rumoured to elate the gods of old, and such an item proves your worth."
- icon_state = "wolf_talisman"
- armor = list("melee" = 15 , "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 25, "acid" = 25)
- attachment_slot = CHEST
- above_suit = TRUE
-
/obj/item/clothing/accessory/skullcodpiece
name = "skull codpiece"
desc = "A legion skull fitted to a codpiece, intended to protect the important things in life."
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 64280475664a..4213ae91376b 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -1,21 +1,23 @@
/datum/bank_account
var/account_holder = "Rusty Venture"
var/account_balance = 0
+ var/holder_age = 18
var/list/bank_cards = list()
var/add_to_accounts = TRUE
var/account_id
-/datum/bank_account/New(newname, job)
+/datum/bank_account/New(newname, age)
if(add_to_accounts)
SSeconomy.bank_accounts += src
account_holder = newname
+ holder_age = age
account_id = rand(111111,999999)
/datum/bank_account/Destroy()
if(add_to_accounts)
SSeconomy.bank_accounts -= src
- for(var/obj/item/card/id/id_card as anything in bank_cards)
- id_card.registered_account = null
+ for(var/obj/item/card/bank/bank_card as anything in bank_cards)
+ bank_card.registered_account = null
SSeconomy.bank_money -= account_balance
return ..()
@@ -49,10 +51,6 @@
return
for(var/obj/A in bank_cards)
var/icon_source = A
- if(istype(A, /obj/item/card/id))
- var/obj/item/card/id/id_card = A
- if(id_card.uses_overlays)
- icon_source = id_card.get_cached_flat_icon()
var/mob/card_holder = recursive_loc_check(A, /mob)
if(ismob(card_holder)) //If on a mob
if(!card_holder.client || (!(card_holder.client.prefs.chat_toggles & CHAT_BANKCARD) && !force))
diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm
index af7d9be4b947..9382a03d062e 100644
--- a/code/modules/economy/pay_stand.dm
+++ b/code/modules/economy/pay_stand.dm
@@ -6,14 +6,14 @@
density = TRUE
anchored = TRUE
var/locked = FALSE
- var/obj/item/card/id/my_card
+ var/obj/item/card/bank/my_card
var/obj/item/assembly/signaler/signaler //attached signaler, let people attach signalers that get activated if the user's transaction limit is achieved.
var/signaler_threshold = 0 //signaler threshold amount
var/amount_deposited = 0 //keep track of the amount deposited over time so you can pay multiple times to reach the signaler threshold
var/force_fee = 0 //replaces the "pay whatever" functionality with a set amount when non-zero.
/obj/machinery/paystand/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/card/id))
+ if(istype(W, /obj/item/card/bank))
if(W == my_card)
if(user.a_intent == INTENT_DISARM)
var/rename_msg = stripped_input(user, "Rename the Paystand:", "Paystand Naming", name)
@@ -31,7 +31,7 @@
to_chat(user, "You [src.locked ? "lock" : "unlock"] the paystand, protecting the bolts from [anchored ? "loosening" : "tightening"].")
return
if(!my_card)
- var/obj/item/card/id/assistant_mains_need_to_die = W
+ var/obj/item/card/bank/assistant_mains_need_to_die = W
if(!assistant_mains_need_to_die.registered_account)
return
var/msg = stripped_input(user, "Name of pay stand:", "Paystand Naming", "[user]'s Awesome Paystand")
@@ -42,7 +42,7 @@
my_card = assistant_mains_need_to_die
to_chat(user, "You link the stand to your account.")
return
- var/obj/item/card/id/vbucks = W
+ var/obj/item/card/bank/vbucks = W
if(vbucks.registered_account)
var/momsdebitcard = 0
if(!force_fee)
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index cdd44cab9ae8..550e413f1a59 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -44,6 +44,9 @@
/obj/item/proc/InsertID()
return FALSE
+/obj/item/proc/GetBankCard()
+ return null
+
/obj/proc/text2access(access_text)
. = list()
if(!access_text)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 20ad6e089730..f850eded96d4 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -122,7 +122,7 @@
if(!H)
return FALSE
if(!visualsOnly)
- var/datum/bank_account/bank_account = new(H.real_name, src)
+ var/datum/bank_account/bank_account = new(H.real_name, H.age)
bank_account.adjust_money(officer ? 250 : 100, "starting_money") //just a little bit of money for you
H.account_id = bank_account.account_id
@@ -179,7 +179,9 @@
var/jobtype = null
uniform = /obj/item/clothing/under/color/grey
+ wallet = /obj/item/storage/wallet
id = /obj/item/card/id
+ bank_card = /obj/item/card/bank
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
box = /obj/item/storage/box/survival
@@ -268,7 +270,7 @@
if(!J)
J = GLOB.name_occupations[H.job]
- var/obj/item/card/id/C = H.wear_id
+ var/obj/item/card/id/C = H.get_idcard(TRUE)
if(istype(C))
C.access = J.get_access()
shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable
@@ -285,14 +287,17 @@
if(id_assignment)
C.assignment = id_assignment
C.update_label()
- for(var/A in SSeconomy.bank_accounts)
- var/datum/bank_account/B = A
- if(B.account_id == H.account_id)
- C.registered_account = B
- B.bank_cards += C
- break
H.sec_hud_set_ID()
+ var/obj/item/card/bank/bank_card = H.get_bankcard()
+ if(istype(bank_card))
+ for(var/account in SSeconomy.bank_accounts)
+ var/datum/bank_account/bank_account = account
+ if(bank_account.account_id == H.account_id)
+ bank_card.registered_account = bank_account
+ bank_account.bank_cards += bank_card
+ break
+
var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot)
if(istype(PDA))
PDA.owner = H.real_name
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 9c5d28e693e8..994f34404efc 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -27,7 +27,7 @@
/datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
if(H.age < AGE_MINOR)
W.registered_age = AGE_MINOR
to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!")
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index d0704887b4ea..2b3e379691c9 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -249,7 +249,7 @@
switch(action)
if("Claim")
var/mob/M = usr
- var/obj/item/card/id/I = M.get_idcard(TRUE)
+ var/obj/item/card/bank/I = M.get_bankcard()
if(points)
if(I)
I.mining_points += points
diff --git a/code/modules/mining/ore_veins.dm b/code/modules/mining/ore_veins.dm
index 0df6cd187d03..cfd908c23cbb 100644
--- a/code/modules/mining/ore_veins.dm
+++ b/code/modules/mining/ore_veins.dm
@@ -176,6 +176,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
/obj/item/stack/ore/titanium = 2,
/obj/item/stack/ore/gold = 1,
/obj/item/stack/ore/diamond = 1,
+ /obj/item/stack/ore/ice = 7,
)
/obj/structure/vein/ice/classtwo
@@ -190,6 +191,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
/obj/item/stack/ore/diamond = 2,
/obj/item/stack/ore/gold = 3,
/obj/item/stack/ore/bluespace_crystal = 1,
+ /obj/item/stack/ore/ice = 8,
)
max_mobs = 6
spawn_time = 100
@@ -206,6 +208,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
/obj/item/stack/ore/diamond = 4,
/obj/item/stack/ore/gold = 6,
/obj/item/stack/ore/bluespace_crystal = 4,
+ /obj/item/stack/ore/ice = 8,
)
max_mobs = 6
spawn_time = 80
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 1dfe590cac0a..55130b0a20d7 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -247,6 +247,17 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
item_state = "slag"
singular_name = "slag chunk"
+/obj/item/stack/ore/ice
+ name = "ice crystals"
+ desc = "Used in an electrolyzer to produce hydrogen and oxygen."
+ icon_state = "Ice ore"
+ item_state = "Ice ore"
+ singular_name = "ice chunk"
+ scan_state = "rock_Ice"
+ mine_experience = 2
+ grind_results = list(/datum/reagent/consumable/ice = 10)
+ spreadChance = 10
+
/obj/item/gibtonite
name = "gibtonite ore"
desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law."
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 11eeef8b4a8e..d692e36345cb 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -21,7 +21,6 @@
bubble_icon = "alien"
type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
- var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
var/has_fine_manipulation = FALSE
status_flags = CANUNCONSCIOUS|CANPUSH
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index a7dc41b307c4..8743fe33289e 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -27,6 +27,7 @@
var/obj/item/tank/internal = null
var/obj/item/clothing/head = null
+ var/obj/item/wear_id = null //only used by humans
var/obj/item/clothing/gloves = null ///only used by humans
var/obj/item/clothing/shoes/shoes = null ///only used by humans.
var/obj/item/clothing/glasses/glasses = null ///only used by humans.
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index ae867d518eb5..da75efa5265a 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -106,7 +106,7 @@
/datum/emote/living/carbon/human/tailthump/get_sound(mob/living/user)
if(!ishuman(user))
return
- if(islizard(user) || (isvox(user)))
+ if(!isnull(user.getorgan(/obj/item/organ/tail)) || (isvox(user)))
return 'sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/
/datum/emote/living/carbon/human/weh //lizard
@@ -346,6 +346,7 @@
key_third_person = "whistles"
message = "whistles!"
emote_type = EMOTE_AUDIBLE
+ vary = TRUE
/datum/emote/living/carbon/human/kepiwhistle/get_sound(mob/living/user)
if(!ishuman(user))
@@ -357,3 +358,4 @@
key = "woop"
key_third_person = "woops"
message = "woops!"
+ emote_type = EMOTE_AUDIBLE
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 6556335c2bdb..567523c11d79 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -54,7 +54,6 @@
var/obj/item/clothing/wear_suit = null
var/obj/item/clothing/w_uniform = null
var/obj/item/belt = null
- var/obj/item/wear_id = null
var/obj/item/r_store = null
var/obj/item/l_store = null
var/obj/item/s_store = null
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 5d8264c14ac3..9e2cfe4f1556 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -101,6 +101,22 @@
if(id_card)
return id_card
+/mob/living/carbon/human/get_bankcard()
+ //Check hands
+ var/list/items_to_check = list()
+ if(get_active_held_item())
+ items_to_check += get_active_held_item()
+ if(get_inactive_held_item())
+ items_to_check += get_inactive_held_item()
+ if(wear_id)
+ items_to_check += wear_id
+ if(belt)
+ items_to_check += belt
+ for(var/obj/item/i in items_to_check)
+ var/obj/item/card/bank/bank_card = i.GetBankCard()
+ if(bank_card)
+ return bank_card
+
/mob/living/carbon/human/get_id_in_hand()
var/obj/item/held_item = get_active_held_item()
if(!held_item)
@@ -137,10 +153,10 @@
to_chat(src, "You can't bring yourself to use a ranged weapon!")
return FALSE
-/mob/living/carbon/human/proc/get_bank_account()
+/mob/living/carbon/proc/get_bank_account()
RETURN_TYPE(/datum/bank_account)
var/datum/bank_account/account
- var/obj/item/card/id/I = get_idcard()
+ var/obj/item/card/bank/I = get_bankcard()
if(I && I.registered_account)
account = I.registered_account
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e061cd5c9793..e2a01d29540c 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1179,7 +1179,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
return equip_delay_self_check(I, H, bypass_equip_delay_self)
if(ITEM_SLOT_ID)
- if(H.wear_id && !swap)
+ if(H.wear_id)
+ if(SEND_SIGNAL(H.wear_id, COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE))
+ return TRUE
return FALSE
var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index 7a995dea28da..d5b97a942da2 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -84,6 +84,9 @@
if(ITEM_SLOT_BACKPACK)
if(!back || !SEND_SIGNAL(back, COMSIG_TRY_STORAGE_INSERT, I, src, TRUE))
not_handled = TRUE
+ if(ITEM_SLOT_ID)
+ if(!wear_id || !SEND_SIGNAL(wear_id, COMSIG_TRY_STORAGE_INSERT, I, src, TRUE))
+ not_handled = TRUE
else
not_handled = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
index 815bfca00028..769f6ce3d5fa 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
@@ -14,7 +14,7 @@
emote_hear = list("cackles","screeches")
stat_attack = CONSCIOUS
ranged_cooldown_time = 5 SECONDS
- vision_range = 9
+ vision_range = 6
retreat_distance = 2
speed = 3
move_to_delay = 5
@@ -98,7 +98,7 @@
visible_message(span_danger("[src] starts charging!"))
balloon_alert(src, "charging...")
to_chat(src, "You begin to charge up...")
- addtimer(CALLBACK(src, PROC_REF(fire_laser)), 1 SECONDS)
+ fire_laser()
COOLDOWN_START(src, ranged_cooldown, ranged_cooldown_time)
/mob/living/simple_animal/hostile/asteroid/brimdemon/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
@@ -115,10 +115,6 @@
/mob/living/simple_animal/hostile/asteroid/brimdemon/proc/fire_laser()
if(stat == DEAD)
return
- visible_message(span_danger("[src] fires a brimbeam!"))
- balloon_alert(src, "brimbeam fired")
- playsound(src, 'sound/creatures/brimdemon.ogg', 150, FALSE, 0, 3)
- cut_overlay("brimdemon_telegraph_dir")
var/turf/target_turf = get_ranged_target_turf(src, dir, BRIMBEAM_RANGE)
var/turf/origin_turf = get_turf(src)
var/list/affected_turfs = get_line(origin_turf, target_turf) - origin_turf
@@ -135,15 +131,30 @@
var/atom/new_brimbeam = new /obj/effect/brimbeam(affected_turf)
new_brimbeam.dir = dir
beamparts += new_brimbeam
- for(var/mob/living/hit_mob in affected_turf.contents)
- hit_mob.adjustFireLoss(35)
- to_chat(hit_mob, span_userdanger("You're hit by [src]'s brimbeam!"))
+ animate(new_brimbeam, 1 SECONDS, alpha = 255)
if(length(beamparts))
var/atom/last_brimbeam = beamparts[length(beamparts)]
last_brimbeam.icon_state = "brimbeam_end"
var/atom/first_brimbeam = beamparts[1]
first_brimbeam.icon_state = "brimbeam_start"
- addtimer(CALLBACK(src, PROC_REF(end_laser)), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(kill_people)), 1 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(end_laser)), 3 SECONDS)
+
+/// Tells the lasers to start murdering people
+/mob/living/simple_animal/hostile/asteroid/brimdemon/proc/kill_people()
+ if(stat == DEAD)
+ end_laser()
+ return
+ playsound(src, 'sound/creatures/brimdemon.ogg', 150, FALSE, 0, 3)
+ visible_message(span_danger("[src] fires a brimbeam!"))
+ balloon_alert(src, "brimbeam fired")
+ cut_overlay("brimdemon_telegraph_dir")
+ for(var/obj/effect/brimbeam/beam in beamparts)
+ var/turf/affected_turf = get_turf(beam)
+ START_PROCESSING(SSfastprocess, beam)
+ for(var/mob/living/hit_mob in affected_turf.contents)
+ hit_mob.adjustFireLoss(35)
+ to_chat(hit_mob, span_userdanger("You're hit by [src]'s brimbeam!"))
/// Deletes all the brimbeam parts and sets variables back to their initial ones.
/mob/living/simple_animal/hostile/asteroid/brimdemon/proc/end_laser()
@@ -163,15 +174,12 @@
icon_state = "brimbeam_mid"
layer = ABOVE_MOB_LAYER
plane = -2
+ alpha = 150
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
light_color = LIGHT_COLOR_BLOOD_MAGIC
light_power = 3
light_range = 2
-/obj/effect/brimbeam/Initialize()
- . = ..()
- START_PROCESSING(SSfastprocess, src)
-
/obj/effect/brimbeam/Destroy()
STOP_PROCESSING(SSfastprocess, src)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index d637b19a2a08..5158c80d056a 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -355,7 +355,6 @@
icon_living = "disfigured_legion"
icon_aggro = "disfigured_legion"
icon_dead = "disfigured_legion"
- difficulty = 2
brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/crystal
loot = list(/obj/item/organ/regenerative_core/legion/crystal)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c7070a66bcdf..06c7a9af52d8 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1202,6 +1202,7 @@
var/list/searching = GetAllContents()
var/search_id = 1
var/search_pda = 1
+ var/search_bankcard = 1
for(var/A in searching)
if(search_id && istype(A, /obj/item/card/id))
@@ -1209,18 +1210,24 @@
if(ID.registered_name == oldname)
ID.registered_name = newname
ID.update_label()
- if(ID.registered_account?.account_holder == oldname)
- ID.registered_account.account_holder = newname
- if(!search_pda)
+ if(!search_pda || !search_bankcard)
break
search_id = 0
+ if(search_bankcard && istype(A, /obj/item/card/bank))
+ var/obj/item/card/bank/bank_card = A
+ if(bank_card.registered_account?.account_holder == oldname)
+ bank_card.registered_account.account_holder = newname
+ if(!search_id || !search_pda)
+ break
+ search_bankcard = 0
+
else if(search_pda && istype(A, /obj/item/pda))
var/obj/item/pda/PDA = A
if(PDA.owner == oldname)
PDA.owner = newname
PDA.update_label()
- if(!search_id)
+ if(!search_id || !search_bankcard)
break
search_pda = 0
@@ -1303,6 +1310,9 @@
/mob/proc/get_idcard(hand_first)
return
+/mob/proc/get_bankcard()
+ return
+
/mob/proc/get_id_in_hand()
return
diff --git a/code/modules/modular_computers/file_system/programs/bounty_board.dm b/code/modules/modular_computers/file_system/programs/bounty_board.dm
index 496011cfdddd..b3b9051e5b8f 100644
--- a/code/modules/modular_computers/file_system/programs/bounty_board.dm
+++ b/code/modules/modular_computers/file_system/programs/bounty_board.dm
@@ -25,8 +25,8 @@
if(!networked)
GLOB.allbountyboards += computer
networked = TRUE
- if(card_slot && card_slot.stored_card && card_slot.stored_card.registered_account)
- current_user = card_slot.stored_card.registered_account
+ if(card_slot && card_slot.bank_card && card_slot.bank_card.registered_account)
+ current_user = card_slot.bank_card.registered_account
for(var/i in GLOB.request_list)
if(!i)
continue
diff --git a/code/modules/modular_computers/file_system/programs/cargoship.dm b/code/modules/modular_computers/file_system/programs/cargoship.dm
index 1bfe53b215f2..2aa9b68565ca 100644
--- a/code/modules/modular_computers/file_system/programs/cargoship.dm
+++ b/code/modules/modular_computers/file_system/programs/cargoship.dm
@@ -35,21 +35,21 @@
// Get components
var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
var/obj/item/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
- var/obj/item/card/id/id_card = card_slot ? card_slot.stored_card : null
+ var/obj/item/card/bank/bank_card = card_slot ? card_slot.stored_card : null
if(!card_slot || !printer) //We need both to successfully use this app.
return
switch(action)
if("ejectid")
- if(id_card)
+ if(bank_card)
card_slot.try_eject(TRUE, usr)
if("selectid")
- if(!id_card)
+ if(!bank_card)
return
- if(!id_card.registered_account)
+ if(!bank_card.registered_account)
playsound(get_turf(ui_host()), 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
return
- payments_acc = id_card.registered_account
+ payments_acc = bank_card.registered_account
playsound(get_turf(ui_host()), 'sound/machines/ping.ogg', 50, TRUE, -1)
if("resetid")
payments_acc = null
diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm
index 1acdb72f400e..1ef62b7617f3 100644
--- a/code/modules/modular_computers/hardware/card_slot.dm
+++ b/code/modules/modular_computers/hardware/card_slot.dm
@@ -8,6 +8,7 @@
var/obj/item/card/id/stored_card
var/obj/item/card/id/stored_card2
+ var/obj/item/card/bank/bank_card
/obj/item/computer_hardware/card_slot/Exited(atom/ejected, atom/newloc)
if(!(ejected == stored_card || ejected == stored_card2))
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index eb363de15792..b1ec3d3edc16 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -248,10 +248,10 @@
visible_message("[user] inserts a [HC.credits] cr holocredit chip into [src].")
qdel(HC)
return
- else if(istype(I, /obj/item/card/id))
+ else if(istype(I, /obj/item/card/bank))
if(state != 2)
return
- var/obj/item/card/id/ID = I
+ var/obj/item/card/bank/ID = I
var/datum/bank_account/account = ID.registered_account
var/target_credits = total_price - credits
if(!account.adjust_money(-target_credits, "laptop_vendor"))
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index a5d8b4c4e1e9..d1c14fe67917 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -1,7 +1,7 @@
// stored_energy += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
-#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power
-#define RAD_COLLECTOR_COEFFICIENT 10
-#define RAD_COLLECTOR_STORED_OUT 0.001 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
+#define RAD_COLLECTOR_EFFICIENCY 300 // radiation needs to be over this amount to get power
+#define RAD_COLLECTOR_COEFFICIENT 100
+#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
#define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process()
#define RAD_COLLECTOR_OUTPUT min(stored_energy, (stored_energy*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
#define PUBLIC_TECHWEB_GAIN 0.6 //how many research points go directly into the main pool
diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
index fa77095de9b9..e235e00b98f6 100644
--- a/code/modules/projectiles/ammunition/ballistic/revolver.dm
+++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -98,3 +98,24 @@
desc = "A .38 iceblox bullet casing."
bullet_skin = "surplus"
projectile_type = /obj/projectile/bullet/c38/iceblox
+
+//44 Roumain (Montagne & Shadow)
+
+/obj/item/ammo_casing/a44roum
+ name = ".44 roumain bullet casing"
+ desc = "A .44 roumain bullet casing."
+ caliber = ".44 Roumain"
+ icon_state = "pistol-steel"
+ projectile_type = /obj/projectile/bullet/a44roum
+
+/obj/item/ammo_casing/a44roum/rubber
+ name = ".44 roumain rubber bullet casing"
+ desc = "A .44 roumain rubber bullet casing."
+ bullet_skin = "rubber"
+ projectile_type = /obj/projectile/bullet/a44roum/rubber
+
+/obj/item/ammo_casing/a44roum/hp
+ name = ".44 roumain hollow point bullet casing"
+ desc = "A .44 roumain holow point bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/a44roum/hp
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 0b5a7f80a837..6246f8f9bf32 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -411,13 +411,13 @@
ammo_type = /obj/item/ammo_casing/c22lr
max_ammo = 75
-/obj/item/ammo_box/c45_speedloader
- name = "speed loader (.45)"
+/obj/item/ammo_box/a44roum_speedloader
+ name = "speed loader (.44)"
desc = "Designed to quickly reload revolvers."
icon_state = "speedloader_38-6"
base_icon_state = "speedloader_38"
- ammo_type = /obj/item/ammo_casing/c45
- caliber = ".45"
+ ammo_type = /obj/item/ammo_casing/a44roum
+ caliber = ".44 Roumain"
max_ammo = 6
multiple_sprites = AMMO_BOX_PER_BULLET
custom_materials = list(/datum/material/iron = 15000)
@@ -472,3 +472,24 @@
icon_state = "300box"
ammo_type = /obj/item/ammo_casing/a300
max_ammo = 20
+
+/obj/item/ammo_box/a44roum
+ name = "ammo box (.44 roumain)"
+ desc = "A box of standard .44 roumain ammo."
+ icon_state = "a44roum"
+ ammo_type = /obj/item/ammo_casing/a44roum
+ max_ammo = 50
+
+/obj/item/ammo_box/a44roum/rubber
+ name = "ammo box (.44 roumain rubber)"
+ desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "a44roum-rubber"
+ ammo_type = /obj/item/ammo_casing/a44roum/rubber
+ max_ammo = 50
+
+/obj/item/ammo_box/a44roum/hp
+ name = "ammo box (.44 roumain hollow point)"
+ desc = "A box of .44 roumain hollow point ammo, designed to cause massive damage at the cost of armor penetration."
+ icon_state = "a44roum-hp"
+ ammo_type = /obj/item/ammo_casing/a44roum/hp
+ max_ammo = 50
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index d757ddf03047..1198970c5146 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -33,13 +33,13 @@
max_ammo = 5
instant_load = FALSE
-/obj/item/ammo_box/magazine/internal/cylinder/rev45
+/obj/item/ammo_box/magazine/internal/cylinder/rev44
name = "cattleman revolver cylinder"
- ammo_type = /obj/item/ammo_casing/c45
- caliber = ".45"
+ ammo_type = /obj/item/ammo_casing/a44roum
+ caliber = ".44 Roumain"
max_ammo = 6
instant_load = FALSE
-/obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne
+/obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
name = "montagne revolver cylinder"
instant_load = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 756a8aa9ca26..034e12ca65cd 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -282,7 +282,7 @@
to_chat(user, "You rack the [bolt_wording] of \the [src].")
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
- if((!safety && !semi_auto) || (!safety && !semi_auto))
+ if(!safety && !semi_auto)
chamber_round(TRUE)
SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
update_appearance()
@@ -570,7 +570,7 @@ EMPTY_GUN_HELPER(revolver/detective)
spread_unwielded = 15
recoil = 0
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
/obj/item/gun/ballistic/revolver/montagne/ComponentInitialize()
. = ..()
@@ -698,7 +698,7 @@ EMPTY_GUN_HELPER(revolver/detective)
fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "shadow"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
manufacturer = MANUFACTURER_HUNTERSPRIDE
obj_flags = UNIQUE_RENAME
gate_loaded = TRUE
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 7ec48a74b970..0c62fe5b3d4f 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -152,3 +152,20 @@
armour_penetration = -45
ricochet_incidence_leeway = 20
ricochet_chance = 65
+
+// 44 Short (Roumain & Shadow)
+
+/obj/projectile/bullet/a44roum
+ name = ".44 roumain bullet"
+ damage = 25
+
+/obj/projectile/bullet/a44roum/rubber
+ name = ".44 roumain bullet"
+ damage = 7
+ stamina = 38
+ armour_penetration = -20
+
+/obj/projectile/bullet/a44roum/hp
+ name = ".44 roumain bullet"
+ damage = 45
+ armour_penetration = -20
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 77525a1f309e..96e027a55476 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -388,8 +388,8 @@
/obj/item/sales_tagger/attackby(obj/item/I, mob/living/user, params)
. = ..()
- if(istype(I, /obj/item/card/id))
- var/obj/item/card/id/potential_acc = I
+ if(isbankcard(I))
+ var/obj/item/card/bank/potential_acc = I
if(potential_acc.registered_account)
payments_acc = potential_acc.registered_account
playsound(src, 'sound/machines/ping.ogg', 40, TRUE)
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index a033b59b56ae..bb56a69adf2b 100644
--- a/code/modules/research/bepis.dm
+++ b/code/modules/research/bepis.dm
@@ -58,11 +58,11 @@
say("Deposited [deposit_value] credits into storage.")
update_icon_state()
return
- if(istype(O, /obj/item/card/id))
- var/obj/item/card/id/Card = O
- if(Card.registered_account)
- account = Card.registered_account
- account_name = Card.registered_name
+ if(istype(O, /obj/item/card/bank))
+ var/obj/item/card/bank/bank_card = O
+ if(bank_card.registered_account)
+ account = bank_card.registered_account
+ account_name = bank_card.registered_name
say("New account detected. Console Updated.")
else
say("No account detected on card. Aborting.")
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 6955bf525d29..5f79bbbf12e5 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -644,6 +644,14 @@
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/board/shuttle/engine/fire
+ name = "Machine Design (Combustion Thruster Board)"
+ desc = "The circuit board for a combustion thruster."
+ id = "engine_fire"
+ build_path = /obj/item/circuitboard/machine/shuttle/engine/fire
+ category = list("Shuttle Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
/datum/design/board/shuttle/engine/electric
name = "Machine Design (Ion Thruster Board)"
desc = "The circuit board for an ion thruster."
@@ -676,6 +684,14 @@
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/board/shuttle/engine/fire_heater
+ name = "Machine Design (Combustion Engine Heater Board)"
+ desc = "The circuit board for a combustion engine heater."
+ id = "engine_fire_heater"
+ build_path = /obj/item/circuitboard/machine/shuttle/fire_heater
+ category = list("Shuttle Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
/datum/design/board/shuttle/engine/smes
name = "Machine Design (Engine Heater Board)"
desc = "The circuit board for an engine heater."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index eaa696c8d775..dbca44b757b9 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -1136,7 +1136,7 @@
display_name = "Basic Shuttle Research"
description = "Research the technology required to create and use basic shuttles."
prereq_ids = list("bluespace_travel", "adv_engi")
- design_ids = list("engine_plasma", "engine_ion", "engine_heater", "engine_smes", "shuttle_helm", "rapid_shuttle_designator")
+ design_ids = list("engine_plasma", "engine_fire", "engine_ion", "engine_heater", "engine_fire_heater", "engine_smes", "shuttle_helm", "rapid_shuttle_designator")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 5000
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index d0b4b49a92f6..31e650a90a31 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -70,10 +70,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
new_dpdir = new_dpdir | angle2dir(rotation+dir2angle(D))
dpdir = new_dpdir
-/obj/structure/table/wood/bar/shuttleRotate(rotation, params)
- . = ..()
- boot_dir = angle2dir(rotation + dir2angle(boot_dir))
-
/obj/structure/alien/weeds/shuttleRotate(rotation, params)
params &= ~ROTATE_OFFSET
return ..()
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
deleted file mode 100644
index 1ddb26efba88..000000000000
--- a/code/modules/shuttle/special.dm
+++ /dev/null
@@ -1,257 +0,0 @@
-// Special objects for shuttle templates go here if nowhere else
-
-// Bar staff, GODMODE mobs(as long as they stay in the shuttle) that just want to make sure people have drinks
-// and a good time.
-
-/mob/living/simple_animal/drone/snowflake/bardrone
- name = "Bardrone"
- desc = "A barkeeping drone, a robot built to tend bars."
- hacked = TRUE
- laws = "1. Serve drinks.\n\
- 2. Talk to patrons.\n\
- 3. Don't get messed up in their affairs."
- unique_name = FALSE // disables the (123) number suffix
- initial_language_holder = /datum/language_holder/universal
-
-/mob/living/simple_animal/drone/snowflake/bardrone/Initialize()
- . = ..()
- access_card.access |= ACCESS_CENT_BAR
- become_area_sensitive(ROUNDSTART_TRAIT)
- RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode))
- check_barstaff_godmode()
-
-/mob/living/simple_animal/drone/snowflake/bardrone/Destroy()
- lose_area_sensitivity(ROUNDSTART_TRAIT)
- return ..()
-
-/mob/living/simple_animal/hostile/alien/maid/barmaid
- gold_core_spawnable = NO_SPAWN
- name = "Barmaid"
- desc = "A barmaid, a maiden found in a bar."
- pass_flags = PASSTABLE
- unique_name = FALSE
- AIStatus = AI_OFF
- stop_automated_movement = TRUE
- initial_language_holder = /datum/language_holder/universal
-
-/mob/living/simple_animal/hostile/alien/maid/barmaid/Initialize()
- . = ..()
- access_card = new /obj/item/card/id(src)
- var/datum/job/captain/C = new /datum/job/captain
- access_card.access = C.get_access()
- access_card.access |= ACCESS_CENT_BAR
- ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
- become_area_sensitive(ROUNDSTART_TRAIT)
- RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode))
- check_barstaff_godmode()
-
-/mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy()
- qdel(access_card)
- lose_area_sensitivity(ROUNDSTART_TRAIT)
- return ..()
-
-/mob/living/simple_animal/proc/check_barstaff_godmode()
- SIGNAL_HANDLER
-
- if(istype(get_area(loc), /area/shuttle/escape))
- status_flags |= GODMODE
- else
- status_flags &= ~GODMODE
-
-// Bar table, a wooden table that kicks you in a direction if you're not
-// barstaff (defined as someone who was a roundstart bartender or someone
-// with CENTCOM_BARSTAFF)
-
-/obj/structure/table/wood/bar
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- flags_1 = NODECONSTRUCT_1
- max_integrity = 1000
- var/boot_dir = 1
-
-/obj/structure/table/wood/bar/Initialize()
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered)
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/structure/table/wood/bar/proc/on_entered(datum/source, atom/movable/AM)
- SIGNAL_HANDLER
- if(isliving(AM) && !is_barstaff(AM))
- // No climbing on the bar please
- var/mob/living/M = AM
- var/throwtarget = get_edge_target_turf(src, boot_dir)
- M.Paralyze(40)
- M.throw_at(throwtarget, 5, 1)
- to_chat(M, "No climbing on the bar please.")
-
-/obj/structure/table/wood/bar/proc/is_barstaff(mob/living/user)
- . = FALSE
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.mind && H.mind.assigned_role == "Bartender")
- return TRUE
-
- var/obj/item/card/id/ID = user.get_idcard(FALSE)
- if(ID && (ACCESS_CENT_BAR in ID.access))
- return TRUE
-
-//Luxury Shuttle Blockers
-
-/obj/machinery/scanner_gate/luxury_shuttle
- name = "luxury shuttle ticket field"
- density = FALSE //allows shuttle airlocks to close, nothing but an approved passenger gets past CanPass
- locked = TRUE
- use_power = FALSE
- var/threshold = 500
- var/static/list/approved_passengers = list()
- var/static/list/check_times = list()
- var/list/payees = list()
-
-/obj/machinery/scanner_gate/luxury_shuttle/CanAllowThrough(atom/movable/mover, border_dir)
- . = ..()
-
- if(mover in approved_passengers)
- set_scanline("scanning", 10)
- return TRUE
-
- if(!isliving(mover)) //No stowaways
- return FALSE
-
-/obj/machinery/scanner_gate/luxury_shuttle/auto_scan(atom/movable/AM)
- return
-
-/obj/machinery/scanner_gate/luxury_shuttle/attackby(obj/item/W, mob/user, params)
- return
-
-/obj/machinery/scanner_gate/luxury_shuttle/emag_act(mob/user)
- return
-
-#define LUXURY_MESSAGE_COOLDOWN 100
-/obj/machinery/scanner_gate/luxury_shuttle/Bumped(atom/movable/AM)
- if(!isliving(AM))
- alarm_beep()
- return ..()
-
- var/datum/bank_account/account
- if(istype(AM.pulling, /obj/item/card/id))
- var/obj/item/card/id/I = AM.pulling
- if(I.registered_account)
- account = I.registered_account
- else if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message
- to_chat(AM, "This ID card doesn't have an owner associated with it!")
- check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
- else if(ishuman(AM))
- var/mob/living/carbon/human/H = AM
- if(H.get_bank_account())
- account = H.get_bank_account()
-
- if(account)
- if(account.account_balance < threshold - payees[AM])
- account.adjust_money(-account.account_balance, "luxury_shuttle")
- payees[AM] += account.account_balance
- else
- var/money_owed = threshold - payees[AM]
- account.adjust_money(-money_owed)
- payees[AM] += money_owed
-
- var/list/counted_money = list()
-
- for(var/obj/item/coin/C in AM.GetAllContents())
- if(payees[AM] >= threshold)
- break
- payees[AM] += C.value
- counted_money += C
- for(var/obj/item/spacecash/bundle/S in AM.GetAllContents())
- if(payees[AM] >= threshold)
- break
- payees[AM] += S.value
- counted_money += S
- for(var/obj/item/holochip/H in AM.GetAllContents())
- if(payees[AM] >= threshold)
- break
- payees[AM] += H.credits
- counted_money += H
-
- if(payees[AM] < threshold && istype(AM.pulling, /obj/item/coin))
- var/obj/item/coin/C = AM.pulling
- payees[AM] += C.value
- counted_money += C
-
- else if(payees[AM] < threshold && istype(AM.pulling, /obj/item/spacecash/bundle))
- var/obj/item/spacecash/bundle/S = AM.pulling
- payees[AM] += S.value
- counted_money += S
-
- else if(payees[AM] < threshold && istype(AM.pulling, /obj/item/holochip))
- var/obj/item/holochip/H = AM.pulling
- payees[AM] += H.credits
- counted_money += H
-
- if(payees[AM] < threshold)
- var/armless
- if(!ishuman(AM) && !istype(AM, /mob/living/simple_animal/slime))
- armless = TRUE
- else
- var/mob/living/carbon/human/H = AM
- if(!H.get_bodypart(BODY_ZONE_L_ARM) && !H.get_bodypart(BODY_ZONE_R_ARM))
- armless = TRUE
-
- if(armless)
- if(!AM.pulling || !iscash(AM.pulling) && !istype(AM.pulling, /obj/item/card/id))
- if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message
- to_chat(AM, "Try pulling a valid ID, space cash, holochip or coin into \the [src]!")
- check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
-
- if(payees[AM] >= threshold)
- for(var/obj/I in counted_money)
- qdel(I)
- payees[AM] -= threshold
-
- var/change = FALSE
- if(payees[AM] > 0)
- change = TRUE
- var/obj/item/holochip/HC = new /obj/item/holochip(AM.loc)
- HC.credits = payees[AM]
- HC.name = "[HC.credits] credit holochip"
- if(istype(AM, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = AM
- if(!H.put_in_hands(HC))
- AM.pulling = HC
- else
- AM.pulling = HC
- payees[AM] -= payees[AM]
-
- say("Welcome to first class, [AM]![change ? " Here is your change." : ""]")
- approved_passengers += AM
-
- check_times -= AM
- return
- else if (payees[AM] > 0)
- for(var/obj/I in counted_money)
- qdel(I)
- if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message
- to_chat(AM, "[payees[AM]] cr received. You need [threshold-payees[AM]] cr more.")
- check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
- alarm_beep()
- return ..()
- else
- alarm_beep()
- return ..()
-
-/mob/living/simple_animal/hostile/bear/fightpit
- name = "fight pit bear"
- desc = "This bear's trained through ancient Solarian secrets to fear the walls of its glass prison."
- environment_smash = ENVIRONMENT_SMASH_NONE
-
-/obj/effect/decal/hammerandsickle
- name = "hammer and sickle"
- desc = "Communism powerful force."
- icon = 'icons/effects/96x96.dmi'
- icon_state = "communist"
- layer = ABOVE_OPEN_TURF_LAYER
- pixel_x = -32
- pixel_y = -32
-
-/obj/effect/decal/hammerandsickle/shuttleRotate(rotation)
- setDir(angle2dir(rotation+dir2angle(dir))) // No parentcall, rest of the rotate code breaks the pixel offset.
diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/white_ship.dm
deleted file mode 100644
index 71afa1c9bc72..000000000000
--- a/code/modules/shuttle/white_ship.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/obj/effect/spawner/lootdrop/whiteship_cere_ripley
- name = "25% mech 75% wreckage ripley spawner"
- loot = list(/obj/mecha/working/ripley/mining = 1,
- /obj/structure/mecha_wreckage/ripley = 5)
- lootdoubles = FALSE
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index c9e990372374..fa3d569b0535 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -5,7 +5,7 @@
max_integrity = 150
var/speed = 2
var/power_efficiency = 1
- var/power_usage = 100
+ var/power_usage = 20
var/panel_open = FALSE
var/list/required_parts = list(/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
@@ -21,7 +21,7 @@
for(var/obj/item/stock_parts/manipulator/M in contents)
speed += M.rating
for(var/obj/item/stock_parts/capacitor/C in contents)
- power_efficiency = C.rating
+ power_efficiency = (C.rating + 1)
var/datum/component/riding/D = GetComponent(/datum/component/riding)
D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * delay_multiplier) / speed
@@ -52,7 +52,7 @@
canmove = FALSE
addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20)
return FALSE
- power_cell.use(power_usage / max(power_efficiency, 1))
+ power_cell.use(power_usage / max(power_efficiency, 2))
return ..()
/obj/vehicle/ridden/wheelchair/motorized/set_move_delay(mob/living/user)
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 4c97b3f7eaa2..6d73fad566f6 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -714,15 +714,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/ui_data(mob/user)
. = list()
var/mob/living/carbon/human/H
- var/obj/item/card/id/card
+ var/obj/item/card/bank/card
if(ishuman(user))
H = user
- card = H.get_idcard(TRUE)
+ card = H.get_bankcard()
if(card)
.["user"] = list()
.["user"]["points"] = card.mining_points
- .["user"]["name"] = card.registered_name
- .["user"]["job"] = card.assignment || "No Job"
if(card.registered_account)
.["user"]["name"] = card.registered_account.account_holder
.["user"]["cash"] = card.registered_account.account_balance
@@ -769,7 +767,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
return
if(!all_items_free && ishuman(usr))
var/mob/living/carbon/human/H = usr
- var/obj/item/card/id/C = H.get_idcard(TRUE)
+ var/obj/item/card/bank/C = H.get_bankcard()
if(!C)
say("No card found.")
@@ -946,10 +944,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/custom/compartmentLoadAccessCheck(mob/user)
. = FALSE
var/mob/living/carbon/human/H
- var/obj/item/card/id/C
+ var/obj/item/card/bank/C
if(ishuman(user))
H = user
- C = H.get_idcard(FALSE)
+ C = H.get_bankcard(FALSE)
if(C?.registered_account && C.registered_account == private_a)
return TRUE
@@ -1003,7 +1001,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
vend_ready = FALSE
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
- var/obj/item/card/id/C = H.get_idcard(TRUE)
+ var/obj/item/card/bank/C = H.get_bankcard()
if(!C)
say("No card found.")
@@ -1055,10 +1053,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/custom/attackby(obj/item/I, mob/user, params)
if(!private_a)
var/mob/living/carbon/human/H
- var/obj/item/card/id/C
+ var/obj/item/card/bank/C
if(ishuman(user))
H = user
- C = H.get_idcard(TRUE)
+ C = H.get_bankcard(TRUE)
if(C?.registered_account)
private_a = C.registered_account
say("\The [src] has been linked to [C].")
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
index 5c4640de3f3c..1f823fb98e0b 100644
--- a/html/changelogs/archive/2024-06.yml
+++ b/html/changelogs/archive/2024-06.yml
@@ -291,3 +291,47 @@
- rscdel: Removed invisible limb armour from Gezenan marine + navywear
- rscadd: Allowed Gezenan armour to hold all guns like normal armour
- bugfix: Fixed Montagne hat description to reflect the fact it is no longer armoured
+2024-06-21:
+ FalloutFalcon:
+ - rscadd: Bank accounts are now handled through cash cards! You now spawn with a
+ wallet to store your extra card!
+ Gristlebee:
+ - balance: Motorized wheelchairs consume less power on move
+ Thera-Pissed:
+ - rscadd: Added Hydrogen, and Combustion Thrusters to go with!
+ rye-rice:
+ - rscadd: Adds a war correspondent for CLIP.
+2024-06-22:
+ Anticept:
+ - bugfix: Dialed down the loudness of a couple Kepori sounds
+ - bugfix: Kepori wooping now has the audible flag.
+ - bugfix: Whistling now varies in pitch
+ PositiveEntropy:
+ - imageadd: SUNS trimline decals are now properly aligned.
+ Sadhorizon:
+ - rscadd: Bone Talisman and Hunter's Necklace were added to loadout.
+ - tweak: Bone Talisman and Hunter's Necklace were reflavored into good lack charms.
+ They are no longer armored.
+ - tweak: Wolf talisman crafting recipe now requires less stuff.
+ - bugfix: Blue wall locker sprites are no longer flipped.
+ SomeguyManperson:
+ - balance: crystal legion spawn 1 less skull per spawn wave, now 1 (like normal
+ legion)
+ - balance: brimdemon beams now have a fade-in effect before dealing damage, making
+ it harder to get instantly chunked for a quarter of your health
+ - balance: brimdemons can no longer aggro on you before you can see them
+ - balance: radiation collectors are now significantly more stingy about the potency
+ of the radiation they will process. Don't expect old nuclear waste or openly
+ stored uranium to do much.
+ - balance: radiation collectors also produce significantly more power from the remaining
+ viable sources
+ Thera-Pissed:
+ - bugfix: infinite negative power draw while calling your grandmother no longer
+ happens.
+ - bugfix: fixed volume pumps for mapping.
+ blinkdog:
+ - bugfix: Cleaned up some logic in revolver safety
+ generalthrax:
+ - bugfix: Tadrixx Float has a sprite again
+ - rscadd: You can now tail thump if you have a tail instead of it being tied to
+ species
diff --git a/icons/effects/ore_visuals.dmi b/icons/effects/ore_visuals.dmi
index b64b8f0427e2..bab677d404e9 100644
Binary files a/icons/effects/ore_visuals.dmi and b/icons/effects/ore_visuals.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 861bb2701699..7e87f94fd183 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/faction/clip/head.dmi b/icons/mob/clothing/faction/clip/head.dmi
index 71edbf436e96..5679758b2f61 100644
Binary files a/icons/mob/clothing/faction/clip/head.dmi and b/icons/mob/clothing/faction/clip/head.dmi differ
diff --git a/icons/mob/clothing/faction/clip/suits.dmi b/icons/mob/clothing/faction/clip/suits.dmi
index 785040d022fe..c68ab77196bb 100644
Binary files a/icons/mob/clothing/faction/clip/suits.dmi and b/icons/mob/clothing/faction/clip/suits.dmi differ
diff --git a/icons/mob/clothing/faction/clip/vox.dmi b/icons/mob/clothing/faction/clip/vox.dmi
index 882e41864ea0..e17d23fba20f 100644
Binary files a/icons/mob/clothing/faction/clip/vox.dmi and b/icons/mob/clothing/faction/clip/vox.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index fe74923b657d..f168673850e0 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 6fac77253d60..86001423aeba 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index b80be47c795d..712adf5af17f 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/icons/obj/atmospherics/components/binary_devices.dmi b/icons/obj/atmospherics/components/binary_devices.dmi
index 0a044c498faa..b666f391e793 100644
Binary files a/icons/obj/atmospherics/components/binary_devices.dmi and b/icons/obj/atmospherics/components/binary_devices.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 4de00230ac76..ecf54fb9f61a 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/faction/clip/head.dmi b/icons/obj/clothing/faction/clip/head.dmi
index b98ec00ea8e8..06962106e6e7 100644
Binary files a/icons/obj/clothing/faction/clip/head.dmi and b/icons/obj/clothing/faction/clip/head.dmi differ
diff --git a/icons/obj/clothing/faction/clip/suits.dmi b/icons/obj/clothing/faction/clip/suits.dmi
index 81e6ee001a2b..8dcc6fa72e9f 100644
Binary files a/icons/obj/clothing/faction/clip/suits.dmi and b/icons/obj/clothing/faction/clip/suits.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 049da153701a..3109928ff7ae 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi
index fa3df8febf1a..2ab3cd0db5ef 100644
Binary files a/icons/obj/drinks/drinks.dmi and b/icons/obj/drinks/drinks.dmi differ
diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi
index 5d82ef881973..cffb7c94b6e5 100644
Binary files a/icons/obj/economy.dmi and b/icons/obj/economy.dmi differ
diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi
index 2e102cda95ad..3b50ef08e89a 100644
Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ
diff --git a/icons/obj/nutanks.dmi b/icons/obj/nutanks.dmi
index c325dadf1c32..4365bdb86771 100644
Binary files a/icons/obj/nutanks.dmi and b/icons/obj/nutanks.dmi differ
diff --git a/icons/obj/ores.dmi b/icons/obj/ores.dmi
index 1e6c41a90c05..6ea0ed496e8f 100644
Binary files a/icons/obj/ores.dmi and b/icons/obj/ores.dmi differ
diff --git a/icons/obj/wallcloset.dmi b/icons/obj/wallcloset.dmi
index 6d41f0ecee85..f2314d0d84c2 100644
Binary files a/icons/obj/wallcloset.dmi and b/icons/obj/wallcloset.dmi differ
diff --git a/icons/turf/decals/suns_floor.dmi b/icons/turf/decals/suns_floor.dmi
index cce105645f23..ffebe3036722 100644
Binary files a/icons/turf/decals/suns_floor.dmi and b/icons/turf/decals/suns_floor.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 7bb3288356ed..b29930a658ee 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -866,7 +866,7 @@
#include "code\game\machinery\aug_manipulator.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\bank_machine.dm"
-#include "code\game\machinery\Beacon.dm"
+#include "code\game\machinery\beacon.dm"
#include "code\game\machinery\bounty_board.dm"
#include "code\game\machinery\buttons.dm"
#include "code\game\machinery\cell_charger.dm"
@@ -879,7 +879,7 @@
#include "code\game\machinery\dish_drive.dm"
#include "code\game\machinery\dna_scanner.dm"
#include "code\game\machinery\doppler_array.dm"
-#include "code\game\machinery\droneDispenser.dm"
+#include "code\game\machinery\drone_dispenser.dm"
#include "code\game\machinery\exp_cloner.dm"
#include "code\game\machinery\firealarm.dm"
#include "code\game\machinery\flasher.dm"
@@ -898,6 +898,7 @@
#include "code\game\machinery\medipen_refiller.dm"
#include "code\game\machinery\navbeacon.dm"
#include "code\game\machinery\newscaster.dm"
+#include "code\game\machinery\outpost_electrolyzer.dm"
#include "code\game\machinery\PDApainter.dm"
#include "code\game\machinery\prisonlabor.dm"
#include "code\game\machinery\quantum_pad.dm"
@@ -909,7 +910,7 @@
#include "code\game\machinery\scan_gate.dm"
#include "code\game\machinery\sheetifier.dm"
#include "code\game\machinery\shieldgen.dm"
-#include "code\game\machinery\Sleeper.dm"
+#include "code\game\machinery\sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
#include "code\game\machinery\spaceheater.dm"
#include "code\game\machinery\stasis.dm"
@@ -1113,6 +1114,7 @@
#include "code\game\objects\items\AI_modules.dm"
#include "code\game\objects\items\airlock_painter.dm"
#include "code\game\objects\items\apc_frame.dm"
+#include "code\game\objects\items\bank_card.dm"
#include "code\game\objects\items\bell.dm"
#include "code\game\objects\items\binoculars.dm"
#include "code\game\objects\items\blueprints.dm"
@@ -3276,9 +3278,7 @@
#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_rotate.dm"
-#include "code\modules\shuttle\special.dm"
#include "code\modules\shuttle\supply.dm"
-#include "code\modules\shuttle\white_ship.dm"
#include "code\modules\spells\spell.dm"
#include "code\modules\spells\spell_types\aimed.dm"
#include "code\modules\spells\spell_types\area_teleport.dm"
diff --git a/sound/voice/kepori/kepiclick.ogg b/sound/voice/kepori/kepiclick.ogg
index 61670a607b66..3f22b6d90d5e 100644
Binary files a/sound/voice/kepori/kepiclick.ogg and b/sound/voice/kepori/kepiclick.ogg differ
diff --git a/sound/voice/kepori/kepiwhistle.ogg b/sound/voice/kepori/kepiwhistle.ogg
index bf1cc76bf5cf..f6260f4c5894 100644
Binary files a/sound/voice/kepori/kepiwhistle.ogg and b/sound/voice/kepori/kepiwhistle.ogg differ
diff --git a/tgui/packages/tgui/interfaces/HydrogenExchange.js b/tgui/packages/tgui/interfaces/HydrogenExchange.js
new file mode 100644
index 000000000000..c07fe40afeab
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/HydrogenExchange.js
@@ -0,0 +1,74 @@
+import { useBackend } from '../backend';
+import { Button, LabeledList, Section } from '../components';
+import { Window } from '../layouts';
+
+export const HydrogenExchange = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { credits, merits, next_merit_rate, credits_to_merits, credit_tax } =
+ data;
+ return (
+
+
+
+
+
+ {' '}
+ {credit_tax + '%'}
+
+
+ {' '}
+ {next_merit_rate + 'cr'}
+
+
+
+
+
+ act('convert_to_merits')}
+ />
+ }
+ />
+ act('convert_to_credits')}
+ />
+ }
+ />
+ act('dispense')}
+ />
+ }
+ />
+
+
+
+
+ );
+};