cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Derp, I break stuff when I update.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1118 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2011-02-24 17:28:29 +00:00
parent e1d410c637
commit 2451bc7ac1
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/autolathe.dm
+1 -1
View File
@@ -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()
code/game/machinery/cell_charger.dm
+1 -3
View File
@@ -32,9 +32,7 @@
overlays = null
/obj/machinery/cell_charger/attack_hand(mob/user)
add_fingerprint(user)
if(stat & BROKEN)
if(..())
return
if(charging)
code/game/machinery/constructable_frame.dm
+4 -4
View File
@@ -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
code/game/research/circuitprinter.dm
+1 -1
View File
@@ -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()
code/game/research/destructive_analyzer.dm
+1 -1
View File
@@ -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()
code/game/research/protolathe.dm
+2 -2
View File
@@ -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()
maps/tgstation.2.0.3.dmm
+1 -1
View File
@@ -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)