From 2451bc7ac11ec853bdaf26fb3f0ceb70d0f18b83 Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Thu, 24 Feb 2011 17:28:29 +0000 Subject: [PATCH] Derp, I break stuff when I update. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1118 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/autolathe.dm | 2 +- code/game/machinery/cell_charger.dm | 4 +--- code/game/machinery/constructable_frame.dm | 8 ++++---- code/game/research/circuitprinter.dm | 2 +- code/game/research/destructive_analyzer.dm | 2 +- code/game/research/protolathe.dm | 4 ++-- maps/tgstation.2.0.3.dmm | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7c10bdeeba6..453d09608f1 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -272,7 +272,7 @@ var/global/list/autolathe_recipes_hidden = list( \ component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_manipulator(src) + component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/stock_parts/console_screen(src) RefreshParts() diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index ecd07debf4e..3bc7ac3f8fe 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -32,9 +32,7 @@ overlays = null /obj/machinery/cell_charger/attack_hand(mob/user) - add_fingerprint(user) - - if(stat & BROKEN) + if(..()) return if(charging) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 76bb1d4d22d..964a2b1a5b7 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -130,7 +130,7 @@ to destroy them and players will be able to make replacements. origin_tech = "magnets=2;materials=2" req_components = list( "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/micro_manipulator" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, "/obj/item/weapon/stock_parts/micro_laser" = 1) /obj/item/weapon/circuitboard/autolathe @@ -140,7 +140,7 @@ to destroy them and players will be able to make replacements. origin_tech = "materials=3" req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 3, - "/obj/item/weapon/stock_parts/micro_manipulator" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1) /obj/item/weapon/circuitboard/protolathe @@ -150,7 +150,7 @@ to destroy them and players will be able to make replacements. origin_tech = "materials=2" req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/micro_manipulator" = 2, + "/obj/item/weapon/stock_parts/manipulator" = 2, "/obj/item/weapon/reagent_containers/glass/beaker" = 2) @@ -161,7 +161,7 @@ to destroy them and players will be able to make replacements. origin_tech = "materials=2;programming=2" req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/micro_manipulator" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, "/obj/item/weapon/reagent_containers/glass/beaker" = 2) /obj/item/weapon/circuitboard/pacman diff --git a/code/game/research/circuitprinter.dm b/code/game/research/circuitprinter.dm index e35ad0ed222..450ede4acd2 100644 --- a/code/game/research/circuitprinter.dm +++ b/code/game/research/circuitprinter.dm @@ -17,7 +17,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). component_parts = list() component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_manipulator(src) + component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) RefreshParts() diff --git a/code/game/research/destructive_analyzer.dm b/code/game/research/destructive_analyzer.dm index 5d8e5ee2635..66acecf9ad6 100644 --- a/code/game/research/destructive_analyzer.dm +++ b/code/game/research/destructive_analyzer.dm @@ -17,7 +17,7 @@ Note: Must be placed within 3 tiles of the R&D Console component_parts = list() component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(src) component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/micro_manipulator(src) + component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) RefreshParts() diff --git a/code/game/research/protolathe.dm b/code/game/research/protolathe.dm index 98f6951aae0..5c023f73c5e 100644 --- a/code/game/research/protolathe.dm +++ b/code/game/research/protolathe.dm @@ -29,8 +29,8 @@ Note: Must be placed west/left of and R&D console to function. component_parts += new /obj/item/weapon/circuitboard/protolathe(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/micro_manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/micro_manipulator(src) + component_parts += new /obj/item/weapon/stock_parts/manipulator(src) + component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src) RefreshParts() diff --git a/maps/tgstation.2.0.3.dmm b/maps/tgstation.2.0.3.dmm index 4144b058043..fca5ff21fdc 100644 --- a/maps/tgstation.2.0.3.dmm +++ b/maps/tgstation.2.0.3.dmm @@ -4130,7 +4130,7 @@ "bBv" = (/obj/table{dir = 9; icon_state = "tabledir"},/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bBw" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/screwdriver,/obj/item/weapon/screwdriver,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bBx" = (/obj/table{dir = 9; icon_state = "tabledir"},/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/micro_laser,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) -"bBy" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/item/weapon/stock_parts/micro_manipulator,/obj/item/weapon/stock_parts/micro_manipulator,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) +"bBy" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/item/weapon/stock_parts/manipulator,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bBz" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; layer = 3; level = 2},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bBA" = (/obj/machinery/atmospherics/binary/pump{dir = 4; icon_state = "intact_on"; on = 1},/turf/simulated/wall/r_wall,/area/toxins/server) "bBB" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/outlet_injector{icon_state = "on"; dir = 8; pixel_y = 1; on = 1},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)