diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index d13454a521..e5de6294f9 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -559,7 +559,7 @@ /turf/template_noop, /area/ruin/space/derelict/bridge/ai_upload) "bM" = ( -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /turf/template_noop, /area/ruin/space/derelict/bridge/ai_upload) "bN" = ( @@ -991,7 +991,7 @@ icon_state = "0-8" }, /obj/structure/frame/machine, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /turf/open/floor/plating/airless, /area/ruin/space/derelict/gravity_generator) "dj" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index f580b26a81..bf9e23978e 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2610,8 +2610,8 @@ /area/ruin/space/has_grav/ancientstation/rnd) "gQ" = ( /obj/structure/table, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/scanning_module{ pixel_x = 2; @@ -4457,7 +4457,7 @@ /area/template_noop) "lv" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /turf/open/floor/plasteel/airless/white/side{ dir = 4 }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 7a48d610df..a3eb4d1afd 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -3735,9 +3735,9 @@ /area/awaymission/undergroundoutpost45/research) "ik" = ( /obj/structure/table/glass, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, /turf/open/floor/plasteel/white/side{ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3d0ccb33fa..670e803f74 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -25954,10 +25954,10 @@ /turf/open/floor/plasteel/white, /area/science/lab) "bnl" = ( -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/structure/table/glass, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, /obj/machinery/light{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 48c1f9fdd5..0479e1ec28 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3164,7 +3164,7 @@ name = "dust" }, /obj/structure/frame/computer, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, @@ -7652,8 +7652,8 @@ }, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/circuitboard/machine/microwave, /turf/open/floor/plasteel/dark, /area/crew_quarters/electronic_marketing_den) @@ -43446,9 +43446,9 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/stock_parts/cell/high, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -61739,7 +61739,7 @@ /obj/item/clipboard, /obj/item/folder/blue, /obj/item/electronics/firelock, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/port) @@ -75440,7 +75440,7 @@ /obj/structure/table, /obj/item/clipboard, /obj/item/electronics/airlock, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/item/device/assembly/signaler, /obj/machinery/airalarm{ dir = 1; @@ -79144,9 +79144,9 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/stock_parts/cell/high, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/structure/cable/white{ icon_state = "0-4" }, @@ -84059,9 +84059,9 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/stock_parts/cell/high, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) @@ -86074,7 +86074,7 @@ /area/science/research/abandoned) "dus" = ( /obj/structure/table/reinforced, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -87643,7 +87643,7 @@ /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/electronics/firealarm, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/secondary/construction) @@ -90494,7 +90494,7 @@ "dDk" = ( /obj/structure/frame/machine, /obj/machinery/light/small, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ac9ec2228b..34757316a1 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -50277,7 +50277,7 @@ /area/science/research) "caA" = ( /obj/structure/table, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/item/electronics/airlock, /obj/item/device/assembly/timer{ pixel_x = -4; @@ -52868,7 +52868,7 @@ "cfC" = ( /obj/item/trash/pistachios, /obj/structure/closet, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /obj/item/extinguisher, /obj/item/storage/belt/utility, /turf/open/floor/plating, @@ -56852,9 +56852,9 @@ /area/science/lab) "cnW" = ( /obj/structure/table, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 1eb515a49b..00a601dba2 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -24721,9 +24721,9 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/stock_parts/cell/high, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -25197,8 +25197,8 @@ /obj/structure/table/wood, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/circuitboard/machine/microwave, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 96b543b37a..fab27c788f 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -32699,8 +32699,8 @@ /area/science/lab) "bAq" = ( /obj/structure/table, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/manipulator, @@ -47954,8 +47954,8 @@ /area/tcommsat/server) "cnw" = ( /obj/structure/table, -/obj/item/stock_parts/console_screen, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, /obj/item/stock_parts/micro_laser, /obj/item/stock_parts/micro_laser, /turf/open/floor/plasteel/dark/telecomms, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 1deda26adf..5961fef79f 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -1413,7 +1413,7 @@ name = "dust" }, /obj/structure/frame/computer, -/obj/item/stock_parts/console_screen, +/obj/item/stack/sheet/glass, /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 3e24b47760..ec6a53f308 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1064,7 +1064,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, - /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5, /obj/item/stock_parts/console_screen = 5) + /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 7576824747..1857a27593 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -6,8 +6,7 @@ /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/console_screen = 1, - /obj/item/stack/sheet/glass = 1) + /obj/item/stack/sheet/glass = 2) /obj/item/circuitboard/machine/announcement_system name = "Announcement System (Machine Board)" @@ -15,7 +14,7 @@ origin_tech = "programming=3;bluespace=3;magnets=2" req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/autolathe name = "Autolathe (Machine Board)" @@ -24,7 +23,7 @@ req_components = list( /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/clonepod name = "Clone Pod (Machine Board)" @@ -78,7 +77,7 @@ req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/reagent_containers/glass/beaker = 2, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/quantumpad name = "Quantum Pad (Machine Board)" @@ -209,7 +208,7 @@ req_components = list( /obj/item/ore/bluespace_crystal = 2, /obj/item/stock_parts/capacitor = 2, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) def_components = list(/obj/item/ore/bluespace_crystal = /obj/item/ore/bluespace_crystal/artificial) /obj/item/circuitboard/machine/vendor @@ -268,7 +267,7 @@ /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/micro_laser = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/cryo_tube name = "Cryotube (Machine Board)" @@ -277,18 +276,17 @@ req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/console_screen = 1, - /obj/item/stack/sheet/glass = 2) + /obj/item/stack/sheet/glass = 4) /obj/item/circuitboard/machine/thermomachine name = "Thermomachine (Machine Board)" desc = "You can use a screwdriver to switch between heater and freezer." origin_tech = "programming=3;plasmatech=3" req_components = list( - /obj/item/stock_parts/matter_bin = 2, - /obj/item/stock_parts/micro_laser = 2, - /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stack/cable_coil = 1, + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/thermomachine/Initialize() . = ..() @@ -417,7 +415,7 @@ /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/plantgenes name = "Plant DNA Manipulator (Machine Board)" @@ -426,7 +424,7 @@ req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/micro_laser = 1, - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/scanning_module = 1) /obj/item/circuitboard/machine/plantgenes/vault @@ -447,7 +445,7 @@ req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/seed_extractor name = "Seed Extractor (Machine Board)" @@ -462,7 +460,7 @@ build_path = /obj/machinery/mineral/ore_redemption origin_tech = "programming=1;engineering=2" req_components = list( - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1, /obj/item/stock_parts/manipulator = 1, @@ -473,7 +471,7 @@ build_path = /obj/machinery/mineral/equipment_vendor origin_tech = "programming=1;engineering=3" req_components = list( - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/matter_bin = 3) /obj/item/circuitboard/machine/mining_equipment_vendor/golem @@ -594,7 +592,7 @@ /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/cell = 1) def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) @@ -606,7 +604,7 @@ /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/stock_parts/cell = 1) /obj/item/circuitboard/machine/chem_heater @@ -615,7 +613,7 @@ origin_tech = "programming=2;engineering=2;biotech=2" req_components = list( /obj/item/stock_parts/micro_laser = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/chem_master name = "ChemMaster 3000 (Machine Board)" @@ -624,7 +622,7 @@ req_components = list( /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stock_parts/manipulator = 1, - /obj/item/stock_parts/console_screen = 1) + /obj/item/stack/sheet/glass = 1) /obj/item/circuitboard/machine/chem_master/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) @@ -730,13 +728,12 @@ /obj/item/stock_parts/micro_laser = 1, /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 2, - /obj/item/stock_parts/console_screen = 1, - /obj/item/stack/sheet/glass = 1) + /obj/item/stack/sheet/glass = 2) /obj/item/circuitboard/machine/vending/donksofttoyvendor name = "Donksoft Toy Vendor (Machine Board)" build_path = /obj/machinery/vending/donksofttoyvendor origin_tech = "programming=1;syndicate=2" req_components = list( - /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/sheet/glass = 1, /obj/item/vending_refill/donksoft = 3) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 946ec70d38..03424346e8 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -123,14 +123,6 @@ build_path = /obj/item/storage/toolbox category = list("initial","Tools") -/datum/design/console_screen - name = "Console Screen" - id = "console_screen" - build_type = AUTOLATHE - materials = list(MAT_GLASS = 200) - build_path = /obj/item/stock_parts/console_screen - category = list("initial", "Electronics") - /datum/design/apc_board name = "APC Module" id = "power control" diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 4e160ad140..28485f535c 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -82,6 +82,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi //Rating 1 +<<<<<<< HEAD /obj/item/stock_parts/console_screen name = "console screen" desc = "Used in the construction of computers and other devices with an interactive console." @@ -89,6 +90,8 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi origin_tech = "materials=1" materials = list(MAT_GLASS=200) +======= +>>>>>>> 4c909b5... Replaces "console screen" stock part with glass sheets (#33018) /obj/item/stock_parts/capacitor name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi index a2e09f2943..fbc8be5474 100644 Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ