Merge branch 'master' into cube-world

_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm

@@ -70,7 +70,7 @@
 /obj/structure/alien/weeds,
 /obj/item/clothing/mask/facehugger/impregnated,
 /obj/item/clothing/glasses/night,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/effect/decal/cleanable/blood/old,
 /obj/item/clothing/under/syndicate/tacticool,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

@@ -526,8 +526,8 @@
 /obj/structure/closet/crate/secure/gear{
 	req_access_txt = "150"
 	},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/storage/belt/military,
@@ -4197,7 +4197,7 @@
 "kw" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
 	pixel_y = -6
 	},
 /obj/item/tank/internals/emergency_oxygen{

_maps/RandomRuins/SpaceRuins/advancedlab.dmm

@@ -185,7 +185,7 @@
 	name = "Clothes"
 	},
 /obj/item/clothing/head/chameleon,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/item/clothing/suit/chameleon,
 /obj/item/clothing/under/chameleon,
 /obj/item/clothing/shoes/chameleon,
@@ -221,7 +221,7 @@
 	},
 /obj/item/clothing/under/rank/centcom/commander,
 /obj/item/clothing/head/centhat,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/shoes/sneakers/brown,
 /turf/open/floor/wood,

_maps/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -2202,11 +2202,11 @@
 /area/ruin/space/has_grav/deepstorage/armory)
 "eO" = (
 /obj/structure/table,
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
 	pixel_x = -3;
 	pixel_y = 4
 	},
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
 	pixel_x = 3;
 	pixel_y = -2
 	},

_maps/RandomZLevels/Academy.dmm

@@ -4322,7 +4322,7 @@
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/academy/academycellar)
 "mV" = (
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/academy/academycellar)
 "mW" = (

_maps/RandomZLevels/spacebattle.dmm

@@ -243,7 +243,7 @@
 /area/awaymission/spacebattle/syndicate1)
 "bg" = (
 /obj/structure/table/reinforced,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/spacebattle/syndicate1)
 "bh" = (

_maps/map_files/BoxStation/BoxStation.dmm

@@ -60,7 +60,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "aai" = (
@@ -2696,6 +2698,9 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "afp" = (
@@ -4439,9 +4444,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -5100,9 +5102,6 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
@@ -5528,9 +5527,6 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -5546,14 +5542,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
 /turf/open/floor/plasteel,
 /area/security/main)
 "akj" = (
@@ -7986,6 +7982,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
 "aqm" = (
@@ -9816,6 +9815,9 @@
 	name = "Dormitories Maintenance";
 	req_access_txt = "12"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
 "avy" = (
@@ -10271,6 +10273,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "awz" = (
@@ -23786,9 +23791,6 @@
 "bfC" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bfD" = (
@@ -55616,6 +55618,10 @@
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
+"iUK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/vacantoffice/b)
 "iVU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -56974,6 +56980,12 @@
 /obj/machinery/vending/autodrobe,
 /turf/open/floor/wood,
 /area/maintenance/bar)
+"nfw" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
 "ngs" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -57837,6 +57849,13 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/fitness)
+"pRW" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
 "pTB" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -59423,6 +59442,15 @@
 	},
 /turf/open/floor/plating,
 /area/space/nearstation)
+"vaW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
 "vbi" = (
 /obj/structure/table,
 /obj/item/instrument/guitar{
@@ -59990,6 +60018,9 @@
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "wrp" = (
@@ -86195,7 +86226,7 @@ cCi
 aqX
 arR
 asj
-arT
+iUK
 ajr
 atY
 auo
@@ -94674,15 +94705,15 @@ aoa
 ajo
 apt
 aql
-aoJ
-aoJ
-aoJ
-aoJ
+pRW
+pRW
+pRW
+pRW
 avw
 awy
-awr
-awr
-avG
+nfw
+nfw
+vaW
 wqF
 aAh
 aAh

_maps/map_files/generic/CentCom.dmm

@@ -7639,7 +7639,7 @@
 /obj/item/clothing/suit/space/hardsuit/deathsquad{
 	pixel_y = 5
 	},
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/item/clothing/shoes/combat/swat,
 /obj/item/clothing/mask/gas/sechailer/swat,
 /obj/effect/turf_decal/stripes/line,