diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 90640ee5353..8c31d589343 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -37,7 +37,7 @@ /turf/open/floor/catwalk_floor/iron, /area/ruin/planetengi) "as" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm index 6211bd0ef6d..45144d39df2 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm @@ -62,7 +62,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/ruin/powered/mailroom) "gO" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /turf/open/floor/carpet/green, @@ -126,7 +126,7 @@ /turf/open/floor/carpet/royalblack, /area/ruin/powered/mailroom) "lw" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /turf/open/floor/carpet/green, diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index f149f3f9918..8a96a43f8ed 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -336,7 +336,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/hellfactoryoffice) "bg" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /turf/open/floor/iron, /area/ruin/space/has_grav/hellfactory) "bh" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index bfd2782f4fc..ae4db7d304c 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -4445,7 +4445,7 @@ /area/ruin/space/ancientstation/charlie/hall) "we" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) "wg" = ( diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm index b2aa28d68ba..dd625a170e3 100644 --- a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm +++ b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm @@ -19,7 +19,7 @@ /turf/open/floor/carpet/red/airless, /area/ruin/space/prison_shuttle) "f" = ( -/obj/machinery/modular_computer/console, +/obj/machinery/modular_computer, /turf/closed/mineral/random/stationside/asteroid, /area/ruin/space/prison_shuttle) "g" = ( diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm index a1d7b9427ec..5bb07de05ea 100644 --- a/_maps/RandomRuins/SpaceRuins/waystation.dmm +++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm @@ -2143,7 +2143,7 @@ name = "Loading Doors"; pixel_y = 6 }, -/obj/machinery/modular_computer/console/preset{ +/obj/machinery/modular_computer/preset{ dir = 8 }, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm index 28c3e1584a9..df4ca2d8c4f 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm @@ -937,7 +937,7 @@ /area/ruin/space/has_grav/whiteship/box) "CV" = ( /obj/structure/lattice, -/obj/machinery/modular_computer/console{ +/obj/machinery/modular_computer{ dir = 8 }, /obj/item/shard, diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 41853a55a6b..7f50455d560 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -1567,7 +1567,7 @@ /turf/open/floor/iron/small, /area/station/engineering/engine_smes) "aLe" = ( -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -2114,7 +2114,7 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/engine) "aVr" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/effect/turf_decal/tile/dark_red/fourcorners, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/smooth, @@ -2331,7 +2331,7 @@ /area/station/maintenance/department/medical/central) "bbj" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6545,7 +6545,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "cME" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /obj/effect/turf_decal/bot, @@ -7213,7 +7213,7 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) "cZv" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/machinery/light/directional/west, @@ -11936,7 +11936,7 @@ /turf/open/floor/catwalk_floor, /area/station/ai_monitored/command/nuke_storage) "eMj" = ( -/obj/machinery/modular_computer/console/preset/cargochat/engineering{ +/obj/machinery/modular_computer/preset/cargochat/engineering{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -12052,7 +12052,7 @@ /turf/open/floor/iron, /area/station/maintenance/department/medical/central) "eOT" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -12428,7 +12428,7 @@ "eWd" = ( /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/modular_computer/console/preset/cargochat/service{ +/obj/machinery/modular_computer/preset/cargochat/service{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -13752,7 +13752,7 @@ "fxq" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/machinery/requests_console/directional/east{ @@ -14894,7 +14894,7 @@ /turf/open/floor/engine/air, /area/station/engineering/atmos) "fOP" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /turf/open/floor/iron/dark, @@ -17963,7 +17963,7 @@ /area/station/maintenance/port/aft) "gTl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 1 }, /obj/machinery/light/small/directional/south, @@ -18536,7 +18536,7 @@ /obj/effect/turf_decal/siding/thinplating_new/terracotta{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 1 }, /obj/effect/turf_decal/siding/yellow, @@ -20645,7 +20645,7 @@ /area/station/cargo/miningoffice) "hNE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/light/cold/directional/south, @@ -34935,7 +34935,7 @@ /area/station/maintenance/starboard/aft) "mMF" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/keycard_auth/directional/south, @@ -36128,7 +36128,7 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "nkD" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/requests_console/directional/east{ @@ -37351,7 +37351,7 @@ /area/station/maintenance/port/greater) "nGP" = ( /obj/machinery/keycard_auth/directional/south, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /turf/open/floor/wood/parquet, @@ -38346,7 +38346,7 @@ /area/station/maintenance/department/medical/central) "ocn" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/button/ticket_machine{ pixel_x = 9; pixel_y = 23 @@ -39641,7 +39641,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "oAL" = ( -/obj/machinery/modular_computer/console/preset/curator, +/obj/machinery/modular_computer/preset/curator, /obj/effect/mapping_helpers/broken_floor, /obj/machinery/firealarm/directional/north, /turf/open/floor/wood/parquet, @@ -46497,7 +46497,7 @@ /area/station/science/ordnance/testlab) "qMX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/modular_computer/console/preset/cargochat/cargo, +/obj/machinery/modular_computer/preset/cargochat/cargo, /turf/open/floor/iron, /area/station/cargo/sorting) "qNj" = ( @@ -50073,7 +50073,7 @@ /obj/effect/turf_decal/siding/thinplating_new/terracotta{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/command{ +/obj/machinery/modular_computer/preset/command{ dir = 1 }, /obj/effect/turf_decal/siding/yellow, @@ -60253,7 +60253,7 @@ /turf/open/floor/iron/white, /area/station/science/research) "viD" = ( -/obj/machinery/modular_computer/console/preset/cargochat/science{ +/obj/machinery/modular_computer/preset/cargochat/science{ dir = 1 }, /obj/machinery/light/dim/directional/east, @@ -62031,7 +62031,7 @@ /area/station/security/detectives_office) "vKB" = ( /obj/effect/turf_decal/siding/dark_red, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/newscaster/directional/south, @@ -69012,7 +69012,7 @@ /area/station/service/greenroom) "xHw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/modular_computer/console/preset/cargochat/medical{ +/obj/machinery/modular_computer/preset/cargochat/medical{ dir = 1 }, /obj/machinery/light/cold/directional/south, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c51aee744cd..19977c92875 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -108,7 +108,7 @@ /turf/open/floor/plating, /area/station/maintenance/central) "abq" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/keycard_auth/directional/south{ @@ -909,7 +909,7 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "alx" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -14610,7 +14610,7 @@ /turf/open/floor/wood, /area/station/service/electronic_marketing_den) "dEk" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 1 }, /obj/structure/cable, @@ -17345,7 +17345,7 @@ /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) "epF" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/south, @@ -18176,7 +18176,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/modular_computer/console/preset/curator{ +/obj/machinery/modular_computer/preset/curator{ dir = 1 }, /obj/effect/turf_decal/bot_white, @@ -20098,7 +20098,7 @@ "eYr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -26284,7 +26284,7 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "gzz" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/structure/cable, @@ -30676,7 +30676,7 @@ /area/station/commons/vacant_room/commissary) "hHf" = ( /obj/item/radio/intercom/directional/north, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -38479,7 +38479,7 @@ /area/station/cargo/miningoffice) "jBR" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/command, +/obj/machinery/modular_computer/preset/command, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -42595,7 +42595,7 @@ /area/station/maintenance/port) "kCq" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/effect/turf_decal/bot, @@ -43170,7 +43170,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/machinery/modular_computer/console/preset/cargochat/science{ +/obj/machinery/modular_computer/preset/cargochat/science{ dir = 4 }, /obj/effect/turf_decal/bot/left, @@ -43590,7 +43590,7 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "kQV" = ( -/obj/machinery/modular_computer/console/preset/cargochat/service, +/obj/machinery/modular_computer/preset/cargochat/service, /obj/effect/turf_decal/bot, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/checker, @@ -43718,7 +43718,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/modular_computer/console/preset/cargochat/cargo, +/obj/machinery/modular_computer/preset/cargochat/cargo, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -43910,7 +43910,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "kVe" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hos) "kVo" = ( @@ -48410,7 +48410,7 @@ /turf/open/floor/carpet/orange, /area/station/commons/dorms) "mcS" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/machinery/requests_console/directional/west{ @@ -54833,7 +54833,7 @@ /area/station/maintenance/port/fore) "nKN" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 4 }, /obj/effect/turf_decal/bot, @@ -57022,7 +57022,7 @@ /turf/open/floor/iron/white, /area/station/security/execution/transfer) "ooa" = ( -/obj/machinery/modular_computer/console/preset/cargochat/engineering{ +/obj/machinery/modular_computer/preset/cargochat/engineering{ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -59322,7 +59322,7 @@ pixel_x = 28; pixel_y = -28 }, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 1 }, /obj/item/radio/intercom/directional/east, @@ -62680,7 +62680,7 @@ /turf/open/floor/iron/grimy, /area/station/service/lawoffice) "pLV" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/structure/cable, @@ -63521,7 +63521,7 @@ /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) "pUC" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -68097,7 +68097,7 @@ /turf/open/floor/iron/dark/side, /area/station/engineering/lobby) "rdU" = ( -/obj/machinery/modular_computer/console/preset/cargochat/medical, +/obj/machinery/modular_computer/preset/cargochat/medical, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 }, @@ -72883,7 +72883,7 @@ /obj/item/radio/intercom/directional/west{ pixel_y = -8 }, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /turf/open/floor/iron/dark/textured_large, @@ -75640,7 +75640,7 @@ /obj/machinery/light_switch/directional/east{ pixel_x = 22 }, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -85296,7 +85296,7 @@ /turf/open/floor/iron/dark, /area/station/security/office) "vrJ" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/machinery/camera/directional/east{ @@ -86360,7 +86360,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "vEl" = ( -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/structure/cable, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -87981,7 +87981,7 @@ c_tag = "Security - Office Aft" }, /obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/machinery/modular_computer/console/preset/cargochat/security{ +/obj/machinery/modular_computer/preset/cargochat/security{ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -95810,7 +95810,7 @@ /turf/open/floor/iron, /area/station/science/robotics/mechbay) "xYS" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/machinery/computer/security/telescreen/entertainment/directional/east, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index a8f3dc9202d..6fa3a7b34f5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1394,7 +1394,7 @@ /area/station/science/research) "axf" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /turf/open/floor/iron, /area/station/command/bridge) "axm" = ( @@ -2174,7 +2174,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) "aLS" = ( -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -3090,7 +3090,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "baq" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -4345,7 +4345,7 @@ /turf/open/floor/iron/large, /area/station/engineering/main) "btQ" = ( -/obj/machinery/modular_computer/console/preset/curator{ +/obj/machinery/modular_computer/preset/curator{ dir = 8 }, /obj/item/radio/intercom/directional/east, @@ -7457,7 +7457,7 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "cnU" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 }, @@ -10258,7 +10258,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "deD" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/machinery/camera/directional/west{ @@ -12895,7 +12895,7 @@ /turf/open/floor/grass, /area/station/security/prison/garden) "dWX" = ( -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, @@ -19190,7 +19190,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /turf/open/floor/iron/smooth_corner{ @@ -25077,7 +25077,7 @@ /turf/open/floor/plating, /area/station/engineering/storage/tech) "iaS" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/item/paper/fluff/ids_for_dummies, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -26834,7 +26834,7 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "iBO" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /turf/open/floor/iron/white/side{ @@ -30667,7 +30667,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/modular_computer/console/preset/cargochat/service{ +/obj/machinery/modular_computer/preset/cargochat/service{ dir = 4 }, /turf/open/floor/plating, @@ -31535,7 +31535,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -32222,7 +32222,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "kna" = ( -/obj/machinery/modular_computer/console/preset/cargochat/engineering, +/obj/machinery/modular_computer/preset/cargochat/engineering, /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/lobby) @@ -32661,7 +32661,7 @@ "ksU" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/effect/turf_decal/bot_white, /obj/machinery/newscaster/directional/north, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -37953,7 +37953,7 @@ /turf/closed/wall, /area/station/hallway/secondary/service) "meg" = ( -/obj/machinery/modular_computer/console/preset/cargochat/science{ +/obj/machinery/modular_computer/preset/cargochat/science{ dir = 1 }, /obj/item/radio/intercom/directional/south, @@ -40015,7 +40015,7 @@ /turf/open/floor/iron/smooth, /area/mine/laborcamp/security) "mQr" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/item/radio/intercom/directional/east, /obj/machinery/camera{ c_tag = "Chief Medical Office North"; @@ -48412,7 +48412,7 @@ /turf/open/floor/plating, /area/station/engineering/engine_smes) "ptB" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /turf/open/floor/wood, @@ -55399,7 +55399,7 @@ /turf/open/floor/engine, /area/station/science/explab) "rEd" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -56616,7 +56616,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "rYZ" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "rZa" = ( @@ -62797,7 +62797,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "tZO" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/structure/sign/poster/official/build/directional/north, @@ -65686,7 +65686,7 @@ /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry) "uXW" = ( -/obj/machinery/modular_computer/console/preset/cargochat/security{ +/obj/machinery/modular_computer/preset/cargochat/security{ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/north, @@ -66861,7 +66861,7 @@ /area/station/medical/treatment_center) "vra" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/modular_computer/console/preset/cargochat/cargo{ +/obj/machinery/modular_computer/preset/cargochat/cargo{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -66995,7 +66995,7 @@ /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/aft) "vuq" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/structure/fireaxecabinet/mechremoval/directional/north, /turf/open/floor/iron/white, /area/station/science/robotics/lab) @@ -67257,7 +67257,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vyd" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hos) "vyg" = ( @@ -69911,7 +69911,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "woF" = ( -/obj/machinery/modular_computer/console/preset/cargochat/medical{ +/obj/machinery/modular_computer/preset/cargochat/medical{ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/end{ @@ -75732,7 +75732,7 @@ }, /area/mine/eva/lower) "ydw" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, /obj/structure/cable, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 044af46b749..b8b32753194 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3289,7 +3289,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bjH" = ( -/obj/machinery/modular_computer/console/preset/cargochat/engineering, +/obj/machinery/modular_computer/preset/cargochat/engineering, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, @@ -5012,7 +5012,7 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "bSj" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/item/paper/fluff/ids_for_dummies, @@ -5073,7 +5073,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "bTP" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -8350,7 +8350,7 @@ /turf/closed/wall/r_wall, /area/station/command/bridge) "dhp" = ( -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -8769,7 +8769,7 @@ /turf/open/floor/wood, /area/station/service/theater) "dra" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/machinery/requests_console/directional/west{ @@ -9497,7 +9497,7 @@ /area/station/engineering/break_room) "dFJ" = ( /obj/machinery/light_switch/directional/east, -/obj/machinery/modular_computer/console/preset/curator{ +/obj/machinery/modular_computer/preset/curator{ dir = 8 }, /turf/open/floor/wood, @@ -9629,7 +9629,7 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "dIm" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/requests_console/directional/north{ department = "Chief Engineer's Desk"; name = "Chief Engineer's Requests Console" @@ -19881,7 +19881,7 @@ /turf/closed/wall/r_wall, /area/station/maintenance/starboard/greater) "huq" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -29240,7 +29240,7 @@ pixel_y = 32 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -31040,7 +31040,7 @@ /turf/closed/wall, /area/station/commons/lounge) "lkh" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/light/directional/north, /obj/machinery/requests_console/directional/north{ department = "Security"; @@ -32526,7 +32526,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/cargochat/medical{ +/obj/machinery/modular_computer/preset/cargochat/medical{ dir = 1 }, /turf/open/floor/iron/dark, @@ -36056,7 +36056,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "mZL" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, @@ -36672,7 +36672,7 @@ "nmb" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/east, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/structure/sign/poster/official/random/directional/east, @@ -37708,7 +37708,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "nCB" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/machinery/light/small/directional/east, @@ -45013,7 +45013,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "qmu" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /turf/open/floor/iron/dark, @@ -45162,7 +45162,7 @@ /area/station/maintenance/starboard/lesser) "qpn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/modular_computer/console/preset/cargochat/service{ +/obj/machinery/modular_computer/preset/cargochat/service{ dir = 8 }, /obj/structure/sign/poster/random/directional/east, @@ -47482,7 +47482,7 @@ /turf/open/floor/iron, /area/station/cargo/storage) "rgS" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52586,7 +52586,7 @@ /area/station/ai_monitored/command/storage/satellite) "sVz" = ( /obj/machinery/airalarm/directional/west, -/obj/machinery/modular_computer/console/preset/command, +/obj/machinery/modular_computer/preset/command, /obj/structure/cable, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -57798,7 +57798,7 @@ /area/station/medical/virology) "uKA" = ( /obj/machinery/light/directional/west, -/obj/machinery/modular_computer/console/preset/cargochat/science{ +/obj/machinery/modular_computer/preset/cargochat/science{ dir = 4 }, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -59190,7 +59190,7 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "vkR" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /turf/open/floor/wood, @@ -60213,7 +60213,7 @@ /turf/open/floor/engine/air, /area/station/engineering/atmos) "vEo" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/turf_decal/siding/purple{ @@ -61646,7 +61646,7 @@ /turf/open/floor/plating, /area/station/maintenance/port) "wew" = ( -/obj/machinery/modular_computer/console/preset/cargochat/cargo{ +/obj/machinery/modular_computer/preset/cargochat/cargo{ dir = 8 }, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -63206,7 +63206,7 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 10 }, -/obj/machinery/modular_computer/console/preset/cargochat/security{ +/obj/machinery/modular_computer/preset/cargochat/security{ dir = 8 }, /turf/open/floor/iron, diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index bf386ac31fb..1823701fd2d 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -562,7 +562,7 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port/fore) "agJ" = ( -/obj/machinery/modular_computer/console/preset/cargochat/science, +/obj/machinery/modular_computer/preset/cargochat/science, /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/effect/turf_decal/stripes/white/line, @@ -635,7 +635,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "ahG" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -973,7 +973,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "alK" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -3459,7 +3459,7 @@ /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/ce) "aRK" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/turf_decal/tile/purple/fourcorners, @@ -3622,7 +3622,7 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/fore) "aTn" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ @@ -4886,7 +4886,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/visit) "bif" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /turf/open/floor/iron/dark/smooth_large, @@ -10870,7 +10870,7 @@ /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/hop) "cGQ" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /turf/open/floor/iron/dark, @@ -11451,7 +11451,7 @@ /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 }, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/structure/cable, @@ -13115,7 +13115,7 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/entry) "dmZ" = ( -/obj/machinery/modular_computer/console/preset/cargochat/medical{ +/obj/machinery/modular_computer/preset/cargochat/medical{ dir = 1 }, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -14512,7 +14512,7 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "dFO" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/machinery/light/small/directional/east, @@ -19049,7 +19049,7 @@ }, /obj/machinery/vending/wallmed/directional/east, /obj/machinery/light/directional/east, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /turf/open/floor/iron/dark, @@ -20756,7 +20756,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/item/radio/intercom/directional/south, @@ -21257,7 +21257,7 @@ /area/station/hallway/floor1/aft) "fyT" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/machinery/light_switch/directional/north, @@ -26064,7 +26064,7 @@ /area/station/maintenance/floor2/port/aft) "gJz" = ( /obj/effect/turf_decal/tile/green/opposingcorners, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /turf/open/floor/iron/white, @@ -27630,7 +27630,7 @@ }, /area/station/commons/fitness) "heZ" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -28229,7 +28229,7 @@ /obj/effect/turf_decal/trimline/neutral/warning{ dir = 8 }, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/bot_white, @@ -28911,7 +28911,7 @@ }, /obj/machinery/newscaster/directional/east, /obj/machinery/light/directional/east, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /turf/open/floor/iron/dark, @@ -30066,7 +30066,7 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/starboard/fore) "hNg" = ( -/obj/machinery/modular_computer/console/preset/cargochat/cargo{ +/obj/machinery/modular_computer/preset/cargochat/cargo{ dir = 1 }, /turf/open/floor/iron/textured_corner, @@ -30920,7 +30920,7 @@ /turf/open/floor/iron/dark, /area/station/commons/locker) "hZt" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/structure/cable, @@ -31765,7 +31765,7 @@ /turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "ilx" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/machinery/newscaster/directional/east, @@ -32129,7 +32129,7 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor1/port) "iqy" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/machinery/button/door/directional/west{ @@ -34354,7 +34354,7 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/exit/escape_pod) "iUS" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ name = "Captain's Computer" }, /obj/item/radio/intercom/directional/north, @@ -35867,7 +35867,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 }, -/obj/machinery/modular_computer/console/preset/cargochat/security{ +/obj/machinery/modular_computer/preset/cargochat/security{ dir = 8 }, /turf/open/floor/iron, @@ -42689,7 +42689,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /turf/open/floor/iron/smooth_edge{ @@ -42922,7 +42922,7 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "lhi" = ( -/obj/machinery/modular_computer/console/preset/command, +/obj/machinery/modular_computer/preset/command, /turf/open/floor/carpet/blue, /area/station/command/bridge) "lhl" = ( @@ -43569,7 +43569,7 @@ }, /area/station/science/genetics) "lpB" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -45265,7 +45265,7 @@ /turf/open/floor/plating, /area/station/maintenance/floor3/starboard/aft) "lNE" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/machinery/light/directional/north, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) @@ -51197,7 +51197,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/engineering, +/obj/machinery/modular_computer/preset/engineering, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -56931,7 +56931,7 @@ }, /area/station/hallway/floor3/aft) "oGm" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -56940,7 +56940,7 @@ /area/station/science/genetics) "oGo" = ( /obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /turf/open/floor/iron/dark, @@ -58860,7 +58860,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "piA" = ( -/obj/machinery/modular_computer/console/preset/curator{ +/obj/machinery/modular_computer/preset/curator{ dir = 4 }, /turf/open/floor/engine/cult, @@ -67611,7 +67611,7 @@ /area/station/science/xenobiology) "rwY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 1 }, /turf/open/floor/pod/light, @@ -70823,7 +70823,7 @@ /turf/closed/wall, /area/station/commons/locker) "swe" = ( -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating_new/corner{ @@ -70898,7 +70898,7 @@ /turf/open/floor/engine/hull, /area/space/nearstation) "sxl" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -74027,7 +74027,7 @@ /turf/open/space/openspace, /area/space) "tlX" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -74067,7 +74067,7 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "tms" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/structure/cable, @@ -82351,7 +82351,7 @@ /turf/open/floor/mineral/plastitanium, /area/station/maintenance/floor2/starboard/aft) "vyy" = ( -/obj/machinery/modular_computer/console/preset/cargochat/service{ +/obj/machinery/modular_computer/preset/cargochat/service{ dir = 8 }, /obj/machinery/light/directional/south, @@ -83004,7 +83004,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -91189,7 +91189,7 @@ /turf/open/space/openspace, /area/space) "xKy" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /turf/open/floor/iron/dark, @@ -91427,7 +91427,7 @@ /turf/open/floor/wood/tile, /area/station/command/heads_quarters/captain/private) "xOd" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -92731,7 +92731,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/service/library/printer) "yib" = ( -/obj/machinery/modular_computer/console/preset/cargochat/engineering, +/obj/machinery/modular_computer/preset/cargochat/engineering, /obj/effect/turf_decal/tile/brown{ dir = 4 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 906397d179e..6e2c9bbc7ad 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4413,7 +4413,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) "ux" = ( -/obj/machinery/modular_computer/console/preset/id/centcom{ +/obj/machinery/modular_computer/preset/id/centcom{ dir = 1 }, /obj/machinery/button/door/indestructible{ @@ -6128,7 +6128,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) "Cs" = ( -/obj/machinery/modular_computer/console/preset/command{ +/obj/machinery/modular_computer/preset/command{ dir = 8 }, /obj/machinery/status_display/evac/directional/east, @@ -8890,7 +8890,7 @@ /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) "RU" = ( -/obj/machinery/modular_computer/console/preset/id/centcom, +/obj/machinery/modular_computer/preset/id/centcom, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) @@ -9026,7 +9026,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supplypod) "SI" = ( -/obj/machinery/modular_computer/console/preset/id/centcom{ +/obj/machinery/modular_computer/preset/id/centcom{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -9655,7 +9655,7 @@ /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) "VL" = ( -/obj/machinery/modular_computer/console/preset/id/centcom{ +/obj/machinery/modular_computer/preset/id/centcom{ dir = 1 }, /turf/open/floor/iron/grimy, @@ -9787,7 +9787,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) "Wq" = ( -/obj/machinery/modular_computer/console/preset/id/centcom, +/obj/machinery/modular_computer/preset/id/centcom, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office."; name = "Research Monitor"; diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c2bc83e8c3b..5a8fc54bc7f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2619,7 +2619,7 @@ /area/station/asteroid) "ahs" = ( /obj/machinery/newscaster/directional/north, -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /obj/structure/sign/calendar/directional/west, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) @@ -3359,7 +3359,7 @@ /turf/open/floor/iron, /area/station/engineering/engine_smes) "anJ" = ( -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -7509,7 +7509,7 @@ /area/station/commons/vacant_room) "bia" = ( /obj/machinery/light/directional/east, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /turf/open/floor/iron, @@ -8345,7 +8345,7 @@ /turf/open/floor/iron/grimy, /area/station/ai_monitored/command/nuke_storage) "byp" = ( -/obj/machinery/modular_computer/console/preset/research, +/obj/machinery/modular_computer/preset/research, /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/command/heads_quarters/rd) @@ -9329,7 +9329,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "bNZ" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, @@ -13043,7 +13043,7 @@ /turf/open/floor/glass, /area/station/commons/fitness/recreation) "ddz" = ( -/obj/machinery/modular_computer/console/preset/cargochat/service{ +/obj/machinery/modular_computer/preset/cargochat/service{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -14966,7 +14966,7 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "dPS" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 8 }, /obj/machinery/keycard_auth/directional/north, @@ -18558,7 +18558,7 @@ "fkq" = ( /obj/machinery/light/directional/south, /obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 1 }, /obj/structure/cable, @@ -19732,7 +19732,7 @@ /turf/open/floor/iron, /area/station/commons/dorms) "fGS" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /obj/structure/sign/clock/directional/south, @@ -24455,7 +24455,7 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hCm" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /obj/structure/window/spawner/directional/north, @@ -25174,7 +25174,7 @@ dir = 8 }, /obj/item/radio/intercom/directional/west, -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /turf/open/floor/iron, @@ -44766,7 +44766,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/cargochat/cargo, +/obj/machinery/modular_computer/preset/cargochat/cargo, /turf/open/floor/iron, /area/station/cargo/office) "oZq" = ( @@ -54176,7 +54176,7 @@ /turf/open/floor/iron/white, /area/station/security/medical) "stC" = ( -/obj/machinery/modular_computer/console/preset/civilian, +/obj/machinery/modular_computer/preset/civilian, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, @@ -54361,7 +54361,7 @@ }, /area/station/science/lab) "svb" = ( -/obj/machinery/modular_computer/console/preset/engineering{ +/obj/machinery/modular_computer/preset/engineering{ dir = 1 }, /obj/structure/window/reinforced/spawner/directional/south, @@ -55508,7 +55508,7 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) "sQu" = ( -/obj/machinery/modular_computer/console/preset/curator{ +/obj/machinery/modular_computer/preset/curator{ dir = 4 }, /obj/machinery/light_switch/directional/west{ @@ -58137,7 +58137,7 @@ /turf/closed/wall/r_wall, /area/station/engineering/atmos) "tLA" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 4 }, /obj/structure/cable, @@ -60177,7 +60177,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "utY" = ( @@ -63998,7 +63998,7 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "vGt" = ( -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -65428,7 +65428,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/modular_computer/console/preset/civilian{ +/obj/machinery/modular_computer/preset/civilian{ dir = 8 }, /turf/open/floor/glass/reinforced, @@ -66673,7 +66673,7 @@ /turf/open/floor/iron, /area/station/commons/dorms) "wFS" = ( -/obj/machinery/modular_computer/console/preset/cargochat/security{ +/obj/machinery/modular_computer/preset/cargochat/security{ dir = 4 }, /obj/machinery/newscaster/directional/west, @@ -68345,7 +68345,7 @@ /area/station/security/interrogation) "xrD" = ( /obj/effect/landmark/navigate_destination/engineering, -/obj/machinery/modular_computer/console/preset/cargochat/engineering{ +/obj/machinery/modular_computer/preset/cargochat/engineering{ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -70052,7 +70052,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/modular_computer/console/preset/cargochat/medical{ +/obj/machinery/modular_computer/preset/cargochat/medical{ dir = 4 }, /turf/open/floor/iron/white, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 310413554bb..44770065902 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -18,7 +18,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "ai" = ( -/obj/machinery/modular_computer/console/preset/id, +/obj/machinery/modular_computer/preset/id, /turf/open/floor/iron/dark, /area/shuttle/escape) "aj" = ( diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index d488bf896c7..dba347439d1 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -423,7 +423,7 @@ /turf/open/floor/wood, /area/shuttle/escape) "yH" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 422d2335eef..50dd7802f2f 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -877,7 +877,7 @@ /area/shuttle/abandoned) "Ky" = ( /obj/effect/turf_decal/bot_white, -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 1 }, /obj/effect/turf_decal/siding/purple/end, diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm index 156fe755021..300ee89d97a 100644 --- a/_maps/templates/lazy_templates/ninja_den.dmm +++ b/_maps/templates/lazy_templates/ninja_den.dmm @@ -2031,7 +2031,7 @@ /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) "Wc" = ( -/obj/machinery/modular_computer/console/preset/research{ +/obj/machinery/modular_computer/preset/research{ dir = 4 }, /obj/machinery/light/directional/west, diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm index 879ff60eaa2..a8da7781c37 100644 --- a/code/__DEFINES/dcs/signals/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum.dm @@ -44,11 +44,7 @@ #define COMSIG_GASMIX_REACTED "comsig_gasmix_reacted" // Modular computer's file signals. Tells the program datum something is going on. -/// From /obj/item/modular_computer/proc/store_file: () -#define COMSIG_MODULAR_COMPUTER_FILE_ADDING "comsig_modular_computer_file_adding" -/// From /obj/item/modular_computer/proc/store_file: () -#define COMSIG_MODULAR_COMPUTER_FILE_ADDED "comsig_modular_computer_file_added" -/// From /obj/item/modular_computer/proc/remove_file: () -#define COMSIG_MODULAR_COMPUTER_FILE_DELETING "comsig_modular_computer_file_deleting" +/// From /obj/item/modular_computer/proc/store_file: (datum/computer_file/file_source, obj/item/modular_computer/host) +#define COMSIG_MODULAR_COMPUTER_FILE_STORE "comsig_modular_computer_file_store" /// From /obj/item/modular_computer/proc/store_file: () #define COMSIG_MODULAR_COMPUTER_FILE_DELETED "comsig_modular_computer_file_deleted" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ca4088c8500..850ae6241a9 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("tram wall girders (anchored)", /obj/structure/girder/tram, 2, time = 4 SECONDS, one_per_turf = TRUE, on_solid_ground = FALSE, check_density = FALSE, on_tram = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \ null, \ new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_EQUIPMENT), \ - new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console, 10, time = 2.5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_EQUIPMENT), \ + new/datum/stack_recipe("modular console", /obj/machinery/modular_computer, 10, time = 2.5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_EQUIPMENT), \ new/datum/stack_recipe("machine frame", /obj/structure/frame/machine, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_EQUIPMENT), \ null, \ new /datum/stack_recipe_list("airlock assemblies", list( \ diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 1807c5ae56f..91d0d71bfc3 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -82,7 +82,7 @@ description = "Our big data division needs more powerful hardware to play 'Outbomb Cuban Pe-', err, to closely monitor threats in your sector. Send us a working modular computer console." reward = CARGO_CRATE_VALUE * 6 required_count = 1 - wanted_types = list(/obj/machinery/modular_computer/console = TRUE) + wanted_types = list(/obj/machinery/modular_computer = TRUE) require_powered = FALSE /datum/bounty/item/science/ntnet/console/applies_to(obj/O) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index c55a9fccccf..93556ecd132 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -143,7 +143,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar /obj/item/modular_computer/proc/install_default_programs() SHOULD_CALL_PARENT(FALSE) for(var/programs in default_programs + starting_programs) - var/datum/computer_file/program/program_type = new programs + var/datum/computer_file/program_type = new programs store_file(program_type) /obj/item/modular_computer/Destroy() diff --git a/code/modules/modular_computers/computers/item/computer_files.dm b/code/modules/modular_computers/computers/item/computer_files.dm index 8d9f9006b07..296f5be0992 100644 --- a/code/modules/modular_computers/computers/item/computer_files.dm +++ b/code/modules/modular_computers/computers/item/computer_files.dm @@ -14,11 +14,9 @@ if(file_storing in stored_files) return FALSE - SEND_SIGNAL(file_storing, COMSIG_MODULAR_COMPUTER_FILE_ADDING) file_storing.computer = src - stored_files.Add(file_storing) used_capacity += file_storing.size - SEND_SIGNAL(file_storing, COMSIG_MODULAR_COMPUTER_FILE_ADDED) + SEND_SIGNAL(file_storing, COMSIG_MODULAR_COMPUTER_FILE_STORE, src) return TRUE /** @@ -35,15 +33,12 @@ return FALSE if(istype(file_removing, /datum/computer_file/program)) var/datum/computer_file/program/program_file = file_removing - if(program_file == active_program) - active_program.kill_program() - for(var/datum/computer_file/program/programs as anything in idle_threads) - programs.kill_program() + program_file.kill_program() - SEND_SIGNAL(file_removing, COMSIG_MODULAR_COMPUTER_FILE_DELETING) stored_files.Remove(file_removing) used_capacity -= file_removing.size SEND_SIGNAL(file_removing, COMSIG_MODULAR_COMPUTER_FILE_DELETED) + qdel(file_removing) return TRUE /** diff --git a/code/modules/modular_computers/computers/item/disks/computer_disk.dm b/code/modules/modular_computers/computers/item/disks/computer_disk.dm index bd652a31c8e..041abf341d0 100644 --- a/code/modules/modular_computers/computers/item/disks/computer_disk.dm +++ b/code/modules/modular_computers/computers/item/disks/computer_disk.dm @@ -17,7 +17,7 @@ /obj/item/computer_disk/Initialize(mapload) . = ..() for(var/programs in starting_programs) - var/datum/computer_file/program/program_type = new programs + var/datum/computer_file/program_type = new programs add_file(program_type) /obj/item/computer_disk/Destroy(force) @@ -47,6 +47,7 @@ return FALSE stored_files.Remove(file) used_capacity -= file.size + qdel(file) return TRUE /obj/item/computer_disk/advanced diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm index 0236e42ff9d..69d4f445ed0 100644 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ b/code/modules/modular_computers/computers/machinery/console_presets.dm @@ -1,19 +1,18 @@ -/obj/machinery/modular_computer/console/preset +/obj/machinery/modular_computer/preset ///List of programs the computer starts with, given on Initialize. var/list/datum/computer_file/starting_programs = list() -/obj/machinery/modular_computer/console/preset/Initialize(mapload) +/obj/machinery/modular_computer/preset/Initialize(mapload) . = ..() if(!cpu) return for(var/programs in starting_programs) - var/datum/computer_file/program/program_type = new programs + var/datum/computer_file/program_type = new programs cpu.store_file(program_type) // ===== ENGINEERING CONSOLE ===== -/obj/machinery/modular_computer/console/preset/engineering - console_department = "Engineering" +/obj/machinery/modular_computer/preset/engineering name = "engineering console" desc = "A stationary computer. This one comes preloaded with engineering programs." starting_programs = list( @@ -23,8 +22,7 @@ ) // ===== RESEARCH CONSOLE ===== -/obj/machinery/modular_computer/console/preset/research - console_department = "Research" +/obj/machinery/modular_computer/preset/research name = "research director's console" desc = "A stationary computer. This one comes preloaded with research programs." starting_programs = list( @@ -36,8 +34,7 @@ ) // ===== COMMAND CONSOLE ===== -/obj/machinery/modular_computer/console/preset/command - console_department = "Command" +/obj/machinery/modular_computer/preset/command name = "command console" desc = "A stationary computer. This one comes preloaded with command programs." starting_programs = list( @@ -46,8 +43,7 @@ ) // ===== IDENTIFICATION CONSOLE ===== -/obj/machinery/modular_computer/console/preset/id - console_department = "Identification" +/obj/machinery/modular_computer/preset/id name = "identification console" desc = "A stationary computer. This one comes preloaded with identification modification programs." starting_programs = list( @@ -57,17 +53,16 @@ /datum/computer_file/program/crew_manifest, ) -/obj/machinery/modular_computer/console/preset/id/centcom +/obj/machinery/modular_computer/preset/id/centcom desc = "A stationary computer. This one comes preloaded with CentCom identification modification programs." -/obj/machinery/modular_computer/console/preset/id/centcom/Initialize(mapload) +/obj/machinery/modular_computer/preset/id/centcom/Initialize(mapload) . = ..() var/datum/computer_file/program/card_mod/card_mod_centcom = cpu.find_file_by_name("plexagonidwriter") card_mod_centcom.is_centcom = TRUE // ===== CIVILIAN CONSOLE ===== -/obj/machinery/modular_computer/console/preset/civilian - console_department = "Civilian" +/obj/machinery/modular_computer/preset/civilian name = "civilian console" desc = "A stationary computer. This one comes preloaded with generic programs." starting_programs = list( @@ -76,8 +71,7 @@ ) // curator -/obj/machinery/modular_computer/console/preset/curator - console_department = "Civilian" +/obj/machinery/modular_computer/preset/curator name = "curator console" desc = "A stationary computer. This one comes preloaded with art programs." starting_programs = list( @@ -85,48 +79,51 @@ ) // ===== CARGO CHAT CONSOLES ===== -/obj/machinery/modular_computer/console/preset/cargochat +/obj/machinery/modular_computer/preset/cargochat name = "cargo chatroom console" desc = "A stationary computer. This one comes preloaded with a chatroom for your cargo requests." starting_programs = list( /datum/computer_file/program/chatclient, ) -/obj/machinery/modular_computer/console/preset/cargochat/Initialize(mapload) + ///Used in Initialize to set the chat client name. + var/console_department + +/obj/machinery/modular_computer/preset/cargochat/Initialize(mapload) . = ..() var/datum/computer_file/program/chatclient/chatprogram = cpu.find_file_by_name("ntnrc_client") chatprogram.username = "[lowertext(console_department)]_department" cpu.active_program = chatprogram -/obj/machinery/modular_computer/console/preset/cargochat/service +/obj/machinery/modular_computer/preset/cargochat/service console_department = "Service" -/obj/machinery/modular_computer/console/preset/cargochat/engineering +/obj/machinery/modular_computer/preset/cargochat/engineering console_department = "Engineering" -/obj/machinery/modular_computer/console/preset/cargochat/science +/obj/machinery/modular_computer/preset/cargochat/science console_department = "Science" -/obj/machinery/modular_computer/console/preset/cargochat/security +/obj/machinery/modular_computer/preset/cargochat/security console_department = "Security" -/obj/machinery/modular_computer/console/preset/cargochat/medical +/obj/machinery/modular_computer/preset/cargochat/medical console_department = "Medical" //ONE PER MAP PLEASE, IT MAKES A CARGOBUS FOR EACH ONE OF THESE -/obj/machinery/modular_computer/console/preset/cargochat/cargo +/obj/machinery/modular_computer/preset/cargochat/cargo console_department = "Cargo" name = "department chatroom console" desc = "A stationary computer. This one comes preloaded with a chatroom for incoming cargo requests. You may moderate it from this computer." -/obj/machinery/modular_computer/console/preset/cargochat/cargo/LateInitialize() +/obj/machinery/modular_computer/preset/cargochat/cargo/LateInitialize() . = ..() var/datum/computer_file/program/chatclient/chatprogram = cpu.find_file_by_name("ntnrc_client") chatprogram.username = "cargo_requests_operator" var/datum/ntnet_conversation/cargochat = chatprogram.create_new_channel("#cargobus", strong = TRUE) - for(var/obj/machinery/modular_computer/console/preset/cargochat/cargochat_console in GLOB.machines) + for(var/obj/machinery/modular_computer/preset/cargochat/cargochat_console in GLOB.machines) if(cargochat_console == src) continue var/datum/computer_file/program/chatclient/other_chatprograms = cargochat_console.cpu.find_file_by_name("ntnrc_client") diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 1c9b353eaa8..ac7e8713b63 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -1,20 +1,18 @@ -// Modular Computer - device that runs various programs and operates with hardware -// DO NOT SPAWN THIS TYPE. Use /laptop/ or /console/ instead. +// Modular Computer - A machinery that is mostly just a host to the Modular Computer item. /obj/machinery/modular_computer name = "modular computer" desc = "You shouldn't see this. If you do, report it." //they should be examining the processor instead - - // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..) - // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently - // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example. icon = 'icons/obj/modular_console.dmi' - icon_state = null - + icon_state = "console" idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.05 + density = TRUE + max_integrity = 300 + integrity_failure = 0.5 + ///The power cell, null by default as we use the APC we're in var/internal_cell = null ///A flag that describes this device type - var/hardware_flag = NONE + var/hardware_flag = PROGRAM_CONSOLE ///Power usage during last tick var/last_power_usage = 0 /// Amount of programs that can be ran at once @@ -22,9 +20,9 @@ ///Icon state when the computer is turned off. - var/icon_state_unpowered = null + var/icon_state_unpowered = "console-off" ///Icon state when the computer is turned on. - var/icon_state_powered = null + var/icon_state_powered = "console" ///Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. var/screen_icon_state_menu = "menu" ///Icon state overlay when the computer is powered, but not 'switched on'. @@ -32,11 +30,11 @@ ///Amount of steel sheets refunded when disassembling an empty frame of this computer. var/steel_sheet_cost = 10 ///Light luminosity when turned on - var/light_strength = 0 + var/light_strength = 2 ///Power usage when the computer is open (screen is active) and can be interacted with. - var/base_active_power_usage = 100 + var/base_active_power_usage = 500 ///Power usage when the computer is idle and screen is off (currently only applies to laptops) - var/base_idle_power_usage = 10 + var/base_idle_power_usage = 100 ///CPU that handles most logic while this type only handles power and other specific things. var/obj/item/modular_computer/processor/cpu @@ -44,7 +42,8 @@ /obj/machinery/modular_computer/Initialize(mapload) . = ..() cpu = new(src) - cpu.physical = src + cpu.screen_on = TRUE + update_appearance() /obj/machinery/modular_computer/Destroy() QDEL_NULL(cpu) diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm deleted file mode 100644 index 2cbcb5ffdea..00000000000 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ /dev/null @@ -1,24 +0,0 @@ -/obj/machinery/modular_computer/console - name = "console" - desc = "A stationary computer." - - icon = 'icons/obj/modular_console.dmi' - icon_state = "console" - icon_state_powered = "console" - icon_state_unpowered = "console-off" - hardware_flag = PROGRAM_CONSOLE - density = TRUE - base_idle_power_usage = 100 - base_active_power_usage = 500 - steel_sheet_cost = 10 - light_strength = 2 - max_integrity = 300 - integrity_failure = 0.5 - ///Used in New() to set network tag according to our area. - var/console_department = "" - -/obj/machinery/modular_computer/console/Initialize(mapload) - . = ..() - if(cpu) - cpu.screen_on = TRUE - update_appearance() diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index 2c08fa8480e..b26df2bf475 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -19,17 +19,12 @@ /datum/computer_file/New() ..() uid = file_uid++ - RegisterSignal(src, COMSIG_MODULAR_COMPUTER_FILE_ADDED, PROC_REF(on_install)) + RegisterSignal(src, COMSIG_MODULAR_COMPUTER_FILE_STORE, PROC_REF(on_install)) /datum/computer_file/Destroy(force) if(computer) - if(src == computer.active_program) - computer.active_program = null - if(src in computer.idle_threads) - computer.idle_threads.Remove(src) computer = null if(disk_host) - disk_host.remove_file(src) disk_host = null return ..() @@ -55,9 +50,9 @@ return temp ///Called post-installation of an application in a computer, after 'computer' var is set. -/datum/computer_file/proc/on_install() +/datum/computer_file/proc/on_install(datum/computer_file/source, obj/item/modular_computer/computer_installing) SIGNAL_HANDLER - return + computer_installing.stored_files.Add(src) /** * Called when examining a modular computer diff --git a/code/modules/modular_computers/file_system/programs/file_browser.dm b/code/modules/modular_computers/file_system/programs/file_browser.dm index 78b2f83ec1b..50fa29ccd5c 100644 --- a/code/modules/modular_computers/file_system/programs/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/file_browser.dm @@ -57,6 +57,8 @@ var/datum/computer_file/F = computer.find_file_by_name(params["name"]) if(!F) return + if(computer.find_file_by_name(params["name"], computer.inserted_disk)) + return var/datum/computer_file/C = F.clone(FALSE) computer.inserted_disk.add_file(C) return TRUE diff --git a/code/modules/modular_computers/file_system/programs/maintenance/_maintenance_program.dm b/code/modules/modular_computers/file_system/programs/maintenance/_maintenance_program.dm index 39edf659cff..0575aa8a0f0 100644 --- a/code/modules/modular_computers/file_system/programs/maintenance/_maintenance_program.dm +++ b/code/modules/modular_computers/file_system/programs/maintenance/_maintenance_program.dm @@ -10,4 +10,7 @@ /datum/computer_file/program/maintenance/clone(rename = FALSE) . = ..() - qdel(src) + if(computer) + computer.remove_file(src) + if(disk_host) + disk_host.remove_file(src) diff --git a/code/modules/modular_computers/file_system/programs/maintenance/themes.dm b/code/modules/modular_computers/file_system/programs/maintenance/themes.dm index 0248997e795..fe6a25f15b1 100644 --- a/code/modules/modular_computers/file_system/programs/maintenance/themes.dm +++ b/code/modules/modular_computers/file_system/programs/maintenance/themes.dm @@ -32,7 +32,6 @@ theme_app.imported_themes += theme_name theme_app.size += size qdel(src) - return ..() /datum/computer_file/program/maintenance/theme/cat theme_name = CAT_THEME_NAME diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index 52f87f3214f..30aa03a613b 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -31,8 +31,10 @@ ///Cooldown timer between pings. COOLDOWN_DECLARE(ping_cooldown) -/datum/computer_file/program/chatclient/New() - username = "DefaultUser[rand(100, 999)]" +/datum/computer_file/program/chatclient/on_install(datum/computer_file/source, obj/item/modular_computer/computer_installing) + . = ..() + if(!username) + username = "DefaultUser[rand(100, 999)]" /datum/computer_file/program/chatclient/Destroy() for(var/datum/ntnet_conversation/discussion as anything in conversations) diff --git a/tgstation.dme b/tgstation.dme index 434a13a4a50..6a62ccf1bf3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4362,7 +4362,6 @@ #include "code\modules\modular_computers\computers\item\disks\virus_disk.dm" #include "code\modules\modular_computers\computers\machinery\console_presets.dm" #include "code\modules\modular_computers\computers\machinery\modular_computer.dm" -#include "code\modules\modular_computers\computers\machinery\modular_console.dm" #include "code\modules\modular_computers\file_system\computer_file.dm" #include "code\modules\modular_computers\file_system\data.dm" #include "code\modules\modular_computers\file_system\program.dm" diff --git a/tools/UpdatePaths/Scripts/75863_computer_preset.txt b/tools/UpdatePaths/Scripts/75863_computer_preset.txt new file mode 100644 index 00000000000..8ed36758eb3 --- /dev/null +++ b/tools/UpdatePaths/Scripts/75863_computer_preset.txt @@ -0,0 +1 @@ +/obj/machinery/modular_computer/console/@SUBTYPES : /obj/machinery/modular_computer/@SUBTYPES{@OLD}