diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index eb49ebcb8e1..beca406c5a3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -1054,10 +1054,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/ancientstation) -"de" = ( -/obj/structure/transit_tube/crossing/horizontal, -/turf/template_noop, -/area/space/nearstation) "df" = ( /obj/structure/cable/yellow, /turf/simulated/floor/plating/airless, @@ -4992,10 +4988,6 @@ /obj/machinery/power/tesla_coil, /turf/simulated/floor/plating, /area/ruin/ancientstation/thetacorridor) -"Db" = ( -/obj/structure/transit_tube/crossing, -/turf/template_noop, -/area/space/nearstation) "Lu" = ( /obj/structure/transit_tube/horizontal{ dir = 4 @@ -5810,7 +5802,7 @@ aa aa aa aa -de +VT aa uQ ck @@ -7443,7 +7435,7 @@ aa aa aa dk -Db +cX aa dg dg @@ -7506,7 +7498,7 @@ aa aa aa aa -de +VT aa aa aa diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index dd99adb0592..9939e6204ce 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -59186,7 +59186,7 @@ /area/station/hallway/primary/central/south) "gCu" = ( /obj/structure/lattice, -/obj/structure/transit_tube/crossing/horizontal, +/obj/structure/transit_tube/horizontal, /turf/space, /area/space/nearstation) "gCE" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 6422805231b..22f6bcc00b2 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -7543,7 +7543,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) "aWo" = ( -/obj/structure/transit_tube/crossing/horizontal, +/obj/structure/transit_tube/horizontal, /obj/structure/lattice, /turf/space, /area/space/nearstation) @@ -13676,7 +13676,7 @@ }, /area/station/engineering/control) "bzJ" = ( -/obj/structure/transit_tube/crossing, +/obj/structure/transit_tube, /obj/structure/lattice, /turf/space, /area/space/nearstation) @@ -20227,20 +20227,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/asmaint) -"cdv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Brig Cell 6"; - dir = 4 - }, -/obj/structure/closet/secure_closet/brig/temp/cell_6, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/station/security/prison/cell_block/A) "cdx" = ( /obj/machinery/light/small{ dir = 1 @@ -29026,20 +29012,6 @@ icon_state = "darkyellow" }, /area/station/engineering/atmos) -"cZn" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Brig Cell 7"; - dir = 4 - }, -/obj/structure/closet/secure_closet/brig/temp/cell_7, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/station/security/prison/cell_block/A) "cZr" = ( /obj/structure/chair{ dir = 8 @@ -29443,20 +29415,6 @@ icon_state = "cafeteria" }, /area/station/medical/break_room) -"ddq" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Brig Cell 8"; - dir = 4 - }, -/obj/structure/closet/secure_closet/brig/temp/cell_8, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/station/security/prison/cell_block/A) "ddr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -43474,7 +43432,7 @@ /area/station/hallway/primary/fore/north) "gXd" = ( /obj/structure/lattice, -/obj/structure/transit_tube/crossing, +/obj/structure/transit_tube, /turf/space, /area/space/nearstation) "gXl" = ( diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 7e3130b37d9..293adf51411 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -62155,21 +62155,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "dHO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + d2 = 2; + icon_state = "1-2" }, +/obj/structure/cable, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "dHQ" = ( @@ -64426,6 +64418,16 @@ /obj/item/crowbar/red, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) +"dSB" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/obj/machinery/atmospherics/portable/canister/air, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "dSD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -66907,16 +66909,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/station/legal/lawoffice) -"evE" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable, -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/exit) "evX" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, @@ -67051,22 +67043,6 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/port/east) -"ezr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "ezR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -71561,16 +71537,6 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) -"hli" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/obj/machinery/atmospherics/portable/canister/air, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "hly" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel/dark, @@ -72190,7 +72156,7 @@ /area/station/security/evidence) "hFE" = ( /obj/structure/lattice/catwalk, -/obj/structure/transit_tube/crossing{ +/obj/structure/transit_tube{ dir = 8 }, /turf/space, @@ -74304,10 +74270,6 @@ icon_state = "bar" }, /area/station/service/kitchen) -"iVe" = ( -/obj/effect/spawner/airlock, -/turf/simulated/wall, -/area/station/service/chapel/office) "iVg" = ( /obj/machinery/economy/atm/directional/west, /turf/simulated/floor/plasteel{ @@ -76158,6 +76120,15 @@ icon_state = "whiteblue" }, /area/station/medical/storage) +"kdg" = ( +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "kdm" = ( /obj/machinery/power/apc/critical/directional/north, /obj/machinery/firealarm{ @@ -76258,15 +76229,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) -"kfC" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "kfT" = ( /obj/structure/cable{ d2 = 4; @@ -82982,6 +82944,22 @@ icon_state = "red" }, /area/station/security/permabrig) +"ogR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "ogX" = ( /obj/machinery/camera{ c_tag = "Experimentation Lab Office"; @@ -91983,21 +91961,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/research) -"tjT" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/newscaster{ - dir = 1; - name = "south bump"; - pixel_y = -28 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "tkb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -92536,6 +92499,24 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/port/west) +"tEp" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/exit) "tEw" = ( /obj/structure/showcase{ density = 0; @@ -93037,6 +93018,21 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) +"tSp" = ( +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, +/obj/machinery/newscaster{ + dir = 1; + name = "south bump"; + pixel_y = -28 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "tSt" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/drinkingglass{ @@ -93680,6 +93676,10 @@ icon_state = "darkred" }, /area/station/security/processing) +"uil" = ( +/obj/effect/spawner/airlock, +/turf/simulated/wall, +/area/station/service/chapel/office) "uit" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -137410,7 +137410,7 @@ dIx dIx dIx dIx -iVe +uil abj aaa aaa @@ -137921,7 +137921,7 @@ dPM dkq dSs dSP -hli +dSB dIH dIH dIH @@ -138179,8 +138179,8 @@ dNa dXJ dKo dUj -kfC -tjT +kdg +tSp dIH abj aaa @@ -141250,9 +141250,9 @@ pIY kuJ kpd kpd +tEp +dHO dHO -evE -evE tJT dKQ jpk @@ -149735,7 +149735,7 @@ dGw dGw hGZ qgr -ezr +ogR wWW qfH sRk diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index e6c1b3d46f5..93799a729a5 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -57332,7 +57332,7 @@ /area/station/service/hydroponics) "iuj" = ( /obj/structure/lattice/catwalk, -/obj/structure/transit_tube/crossing{ +/obj/structure/transit_tube{ dir = 8 }, /turf/space, @@ -58855,7 +58855,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "jbB" = ( -/obj/structure/transit_tube/crossing{ +/obj/structure/transit_tube{ dir = 8 }, /obj/structure/lattice, diff --git a/code/__DEFINES/pipes.dm b/code/__DEFINES/pipes.dm index a7baf86cadf..8eadcae54e6 100644 --- a/code/__DEFINES/pipes.dm +++ b/code/__DEFINES/pipes.dm @@ -58,15 +58,12 @@ // Transit tubes #define PIPE_TRANSIT_POD 200 #define PIPE_TRANSIT_TUBE 201 -#define PIPE_TRANSIT_TUBE_CROSSING 202 -#define PIPE_TRANSIT_TUBE_DIAGONAL 203 -#define PIPE_TRANSIT_TUBE_DIAGONAL_CROSSING 204 -#define PIPE_TRANSIT_TUBE_CURVED 205 -#define PIPE_TRANSIT_TUBE_JUNCTION 206 -#define PIPE_TRANSIT_TUBE_TERMINUS 207 -#define PIPE_TRANSIT_TUBE_STATION 208 -#define PIPE_TRANSIT_TUBE_TERMINUS_DISPENSER 209 -#define PIPE_TRANSIT_TUBE_DISPENSER_STATION 210 +#define PIPE_TRANSIT_TUBE_DIAGONAL 202 +#define PIPE_TRANSIT_TUBE_CURVED 203 +#define PIPE_TRANSIT_TUBE_JUNCTION 204 +#define PIPE_TRANSIT_TUBE_STATION 205 +#define PIPE_TRANSIT_TUBE_TERMINUS_DISPENSER 206 +#define PIPE_TRANSIT_TUBE_DISPENSER_STATION 207 //RPD stuff diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm index 8f9da40124c..23c42723ae4 100644 --- a/code/datums/pipe_datums.dm +++ b/code/datums/pipe_datums.dm @@ -344,14 +344,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable /// The type of the object that results from dispensing this datum from the RPD. var/construction_type = null -/datum/pipes/transit/pod - pipe_name = "transit pod" - construction_type = /obj/structure/transit_tube_construction/pod - pipe_id = PIPE_TRANSIT_POD - orientations = 2 - pipe_icon = "transit_pod" - rpd_dispensable = TRUE - /datum/pipes/transit/tube pipe_name = "transit tube" construction_type = /obj/structure/transit_tube_construction/straight @@ -360,14 +352,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_icon = "transit_straight" rpd_dispensable = TRUE -/datum/pipes/transit/tube/crossing - pipe_name = "transit tube crossing" - construction_type = /obj/structure/transit_tube_construction/straight/crossing - pipe_id = PIPE_TRANSIT_TUBE_CROSSING - orientations = 2 - pipe_icon = "transit_straight_crossing" - rpd_dispensable = TRUE - /datum/pipes/transit/tube/diagonal pipe_name = "diagonal transit tube" construction_type = /obj/structure/transit_tube_construction/diagonal @@ -376,14 +360,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_icon = "transit_diagonal" rpd_dispensable = TRUE -/datum/pipes/transit/tube/diagonal/crossing - pipe_name = "diagonal transit tube crossing" - construction_type = /obj/structure/transit_tube_construction/diagonal/crossing - pipe_id = PIPE_TRANSIT_TUBE_DIAGONAL_CROSSING - orientations = 2 - pipe_icon = "transit_diagonal_crossing" - rpd_dispensable = TRUE - /datum/pipes/transit/tube/curved pipe_name = "curved transit tube" construction_type = /obj/structure/transit_tube_construction/curved @@ -400,22 +376,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_icon = "transit_junction" rpd_dispensable = TRUE -/datum/pipes/transit/tube/terminus - pipe_name = "transit tube terminus" - construction_type = /obj/structure/transit_tube_construction/terminus - pipe_id = PIPE_TRANSIT_TUBE_TERMINUS - orientations = 4 - pipe_icon = "transit_terminus" - rpd_dispensable = TRUE - -/datum/pipes/transit/tube/station - pipe_name = "transit tube station" - construction_type = /obj/structure/transit_tube_construction/station - pipe_id = PIPE_TRANSIT_TUBE_STATION - orientations = 4 - pipe_icon = "transit_station" - rpd_dispensable = TRUE - /datum/pipes/transit/tube/terminus_dispenser_station pipe_name = "terminus dispenser tube station" construction_type = /obj/structure/transit_tube_construction/terminus/dispenser @@ -427,10 +387,19 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable /datum/pipes/transit/tube/dispenser_station pipe_name = "dispenser tube station" pipe_id = PIPE_TRANSIT_TUBE_DISPENSER_STATION + construction_type = /obj/structure/transit_tube_construction/station/dispenser orientations = 4 pipe_icon = "transit_dispenser_station" rpd_dispensable = TRUE +/datum/pipes/transit/tube/station + pipe_name = "transit tube station" + construction_type = /obj/structure/transit_tube_construction/station + pipe_id = PIPE_TRANSIT_TUBE_STATION + orientations = 4 + pipe_icon = "transit_station" + rpd_dispensable = TRUE + //Pipes the RPD can't dispense. Since these don't use an interface, we don't need to bother with setting an icon. We do, however, want to name these for other purposes /datum/pipes/atmospheric/circulator diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 2bfd6c08747..a9f15097ab8 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -330,8 +330,14 @@ T.rpd_act(user, src) /obj/item/rpd/attack_obj(obj/O, mob/living/user) - if(istype(O, /obj/machinery/atmospherics/pipe) && user.a_intent != INTENT_HARM) - return + if(user.a_intent != INTENT_HARM) + if(istype(O, /obj/machinery/atmospherics/pipe)) + return + else if(istype(O, /obj/structure/disposalconstruct)) + return + else if(istype(O, /obj/structure/transit_tube_construction)) + return + return ..() #undef RPD_COOLDOWN_TIME diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 1443a69219b..5cff309495b 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -14,6 +14,7 @@ base_icon_state = "station0" exit_delay = 1 enter_delay = 2 + density = TRUE uninstalled_type = /obj/structure/transit_tube_construction/station var/pod_moving = FALSE var/launch_cooldown = 0 diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index df203639395..aad4e103818 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -8,7 +8,7 @@ desc = "A pneumatic tube that brings you from here to there." icon = 'icons/obj/pipes/transit_tube.dmi' icon_state = "straight" - density = TRUE + density = FALSE layer = 3.1 anchored = TRUE var/list/tube_dirs = null @@ -216,16 +216,6 @@ /obj/structure/transit_tube/diagonal/topleft dir = WEST -/obj/structure/transit_tube/diagonal/crossing - density = FALSE - icon_state = "diagonal_crossing" - uninstalled_type = /obj/structure/transit_tube_construction/diagonal/crossing - -//mostly for mapping use -/obj/structure/transit_tube/diagonal/crossing/topleft - dir = WEST - - /obj/structure/transit_tube/curved icon_state = "curved0" uninstalled_type = /obj/structure/transit_tube_construction/curved @@ -286,15 +276,6 @@ tube_dirs = list(WEST, SOUTHEAST, NORTHEAST) -/obj/structure/transit_tube/crossing - icon_state = "crossing" - uninstalled_type = /obj/structure/transit_tube_construction/straight/crossing - density = FALSE - -//mostly for mapping use -/obj/structure/transit_tube/crossing/horizontal - dir = WEST - // cosmetic "cap" for tubes. Note that tubes can't enter this. /obj/structure/transit_tube/cap icon_state = "cap" diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index bf891303496..9dfbdf7819b 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -64,6 +64,17 @@ user.visible_message("[user] disassembles [src].") qdel(src) +/obj/structure/transit_tube_construction/rpd_act(mob/user, obj/item/rpd/our_rpd) + . = TRUE + if(our_rpd.mode == RPD_ROTATE_MODE) + rotate() + else if(our_rpd.mode == RPD_FLIP_MODE) + flip() + else if(our_rpd.mode == RPD_DELETE_MODE) + our_rpd.delete_single_pipe(user, src) + else + return ..() + /obj/structure/transit_tube_construction/pod name = "uninstalled transit pod" layer = 3.2 // Necessary to be able to install them if on the same tile as tube/construction @@ -89,21 +100,11 @@ base_icon_state = "transit_straight" icon_state = "transit_straight" -/obj/structure/transit_tube_construction/straight/crossing - installed_type = /obj/structure/transit_tube/crossing - base_icon_state = "transit_straight_crossing" - icon_state = "transit_straight_crossing" - /obj/structure/transit_tube_construction/diagonal installed_type = /obj/structure/transit_tube/diagonal base_icon_state = "transit_diagonal" icon_state = "transit_diagonal" -/obj/structure/transit_tube_construction/diagonal/crossing - installed_type = /obj/structure/transit_tube/diagonal/crossing - base_icon_state = "transit_diagonal_crossing" - icon_state = "transit_diagonal_crossing" - /obj/structure/transit_tube_construction/curved installed_type = /obj/structure/transit_tube/curved installed_type_flipped = /obj/structure/transit_tube/curved/flipped @@ -116,12 +117,6 @@ base_icon_state = "transit_junction" icon_state = "transit_junction" -/obj/structure/transit_tube_construction/terminus - installed_type = /obj/structure/transit_tube/station/reverse - installed_type_flipped = /obj/structure/transit_tube/station/reverse/flipped - base_icon_state = "transit_terminus" - icon_state = "transit_terminus" - /obj/structure/transit_tube_construction/station installed_type = /obj/structure/transit_tube/station base_icon_state = "transit_station" diff --git a/icons/obj/pipes/transit_tube.dmi b/icons/obj/pipes/transit_tube.dmi index aca65d502fd..f60ba71321b 100644 Binary files a/icons/obj/pipes/transit_tube.dmi and b/icons/obj/pipes/transit_tube.dmi differ diff --git a/icons/obj/pipes/transit_tube_rpd.dmi b/icons/obj/pipes/transit_tube_rpd.dmi index 126748b724b..377f4b6a88d 100644 Binary files a/icons/obj/pipes/transit_tube_rpd.dmi and b/icons/obj/pipes/transit_tube_rpd.dmi differ diff --git a/icons/obj/pipes/transit_tube_station.dmi b/icons/obj/pipes/transit_tube_station.dmi index 348f6d29561..08c78700350 100644 Binary files a/icons/obj/pipes/transit_tube_station.dmi and b/icons/obj/pipes/transit_tube_station.dmi differ diff --git a/tools/UpdatePaths/Scripts/24739_tube_crossings.txt b/tools/UpdatePaths/Scripts/24739_tube_crossings.txt new file mode 100644 index 00000000000..4320cf0e3fe --- /dev/null +++ b/tools/UpdatePaths/Scripts/24739_tube_crossings.txt @@ -0,0 +1,4 @@ +/obj/structure/transit_tube/diagonal/crossing : /obj/structure/transit_tube/diagonal {@OLD} +/obj/structure/transit_tube/diagonal/crossing/topleft : /obj/structure/transit_tube/diagonal/topleft {@OLD} +/obj/structure/transit_tube/crossing : /obj/structure/transit_tube {@OLD} +/obj/structure/transit_tube/crossing/horizontal : /obj/structure/transit_tube/horizontal {@OLD}