diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 0d93a55d0ad..c7ab2358bfe 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -5,7 +5,7 @@ /obj/machinery/atmospherics/binary/circulator name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger." - icon = 'icons/obj/pipes.dmi' + icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "circ1-off" var/side = 1 // 1=left 2=right diff --git a/code/ATMOSPHERICS/pipes/he_pipes.dm b/code/ATMOSPHERICS/pipes/he_pipes.dm index f99720e1f27..87c43d29d37 100644 --- a/code/ATMOSPHERICS/pipes/he_pipes.dm +++ b/code/ATMOSPHERICS/pipes/he_pipes.dm @@ -106,7 +106,7 @@ //HE Junctions //////////////// /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction - icon = 'icons/obj/pipes/junction.dmi' + icon = 'icons/obj/atmospherics/pipes/junction.dmi' icon_state = "intact" level = 2 minimum_temperature_difference = 300 diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 21b296ad678..1aaf93e3ad9 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -100,13 +100,13 @@ //Add non-broken pieces if(node1) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", get_dir(src,node1)) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", get_dir(src,node1)) if(node2) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", get_dir(src,node2)) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", get_dir(src,node2)) if(node3) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", get_dir(src,node3)) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", get_dir(src,node3)) /obj/machinery/atmospherics/pipe/manifold/hide(var/i) if(level == 1 && istype(loc, /turf/simulated)) diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index 42664de6ec0..d4c80c56b2e 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -112,16 +112,16 @@ //Add non-broken pieces if(node1) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", NORTH) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", NORTH) if(node2) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", SOUTH) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", SOUTH) if(node3) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", EAST) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", EAST) if(node4) - overlays += getpipeimage('icons/obj/atmospherics/pipe_manifold.dmi', "manifold_full[invis]", WEST) + overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", WEST) /obj/machinery/atmospherics/pipe/manifold4w/update_node_icon() ..() diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index 0356973f0f7..e47a510432f 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -1,5 +1,5 @@ /obj/machinery/atmospherics/unary/tank - icon = 'icons/obj/atmospherics/pressure_tank.dmi' + icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi' icon_state = "generic" name = "pressure tank" desc = "A large vessel containing pressurized gas." @@ -16,7 +16,7 @@ col = node.pipe_color else state = "pipe_exposed" - underlays += getpipeimage('icons/obj/atmospherics/pressure_tank.dmi', state, initialize_directions, col) + underlays += getpipeimage('icons/obj/atmospherics/pipes/pressure_tank.dmi', state, initialize_directions, col) /obj/machinery/atmospherics/unary/tank/carbon_dioxide name = "pressure tank (Carbon Dioxide)" diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index 26bd2cff6c1..14d22b5ab9d 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -1,8 +1,8 @@ /obj/machinery/zvent name = "interfloor air transfer system" - icon = 'icons/obj/pipes.dmi' - icon_state = "vent-db" + icon = 'icons/obj/atmospherics/unary_devices.dmi' + icon_state = "vent_map" density = 0 anchored=1 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 bada0095379..54b49942a8e 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -92,7 +92,7 @@ // transit tube station /obj/structure/c_transit_tube/station name = "unattached through station" - icon = 'icons/obj/pipes/transit_tube_station.dmi' + icon = 'icons/obj/atmospherics/pipes/transit_tube_station.dmi' icon_state = "closed" /obj/structure/c_transit_tube/station/tube_turn(var/angle) @@ -122,7 +122,7 @@ // in that sense they're the same as stations and can reuse their flip and rotate verbs /obj/structure/c_transit_tube/station/block name = "unattached tube blocker" - icon = 'icons/obj/pipes/transit_tube.dmi' + icon = 'icons/obj/atmospherics/pipes/transit_tube.dmi' icon_state = "Block" /obj/structure/c_transit_tube/station/block/buildtube() @@ -136,7 +136,7 @@ //see station.dm for the logic /obj/structure/c_transit_tube_pod name = "unattached transit tube pod" - icon = 'icons/obj/pipes/transit_tube_pod.dmi' + icon = 'icons/obj/atmospherics/pipes/transit_tube_pod.dmi' icon_state = "pod" anchored = 0.0 density = 0 diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 86e3930b58a..1a5eee1fc14 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -25,7 +25,7 @@ /obj/machinery/power/compressor name = "compressor" desc = "The compressor stage of a gas turbine generator." - icon = 'icons/obj/pipes.dmi' + icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "compressor" anchored = 1 density = 1 @@ -43,7 +43,7 @@ /obj/machinery/power/turbine name = "gas turbine generator" desc = "A gas turbine used for backup power generation." - icon = 'icons/obj/pipes.dmi' + icon = 'icons/obj/atmospherics/pipes/simple.dmi' icon_state = "turbine" anchored = 1 density = 1 @@ -170,13 +170,13 @@ if(rpm>50000) - overlays += image('icons/obj/pipes.dmi', "comp-o4", FLY_LAYER) + overlays += image('icons/obj/atmospherics/pipes/simple.dmi', "comp-o4", FLY_LAYER) else if(rpm>10000) - overlays += image('icons/obj/pipes.dmi', "comp-o3", FLY_LAYER) + overlays += image('icons/obj/atmospherics/pipes/simple.dmi', "comp-o3", FLY_LAYER) else if(rpm>2000) - overlays += image('icons/obj/pipes.dmi', "comp-o2", FLY_LAYER) + overlays += image('icons/obj/atmospherics/pipes/simple.dmi', "comp-o2", FLY_LAYER) else if(rpm>500) - overlays += image('icons/obj/pipes.dmi', "comp-o1", FLY_LAYER) + overlays += image('icons/obj/atmospherics/pipes/simple.dmi', "comp-o1", FLY_LAYER) //TODO: DEFERRED // These are crucial to working of a turbine - the stats modify the power output. TurbGenQ modifies how much raw energy can you get from @@ -270,7 +270,7 @@ // If it works, put an overlay that it works! if(lastgen > 100) - overlays += image('icons/obj/pipes.dmi', "turb-o", FLY_LAYER) + overlays += image('icons/obj/atmospherics/pipes/simple.dmi', "turb-o", FLY_LAYER) updateDialog()