3 Commits

Author	SHA1	Message	Date
Kelenius	35a20002c6	Merge branch 'dev' into ofResearchAndPrototypes ... Conflicts: baystation12.dme code/defines/obj/weapon.dm code/game/mecha/equipment/tools/medical_tools.dm code/game/mecha/equipment/tools/tools.dm code/game/mecha/mecha.dm code/game/mecha/mecha_parts.dm code/game/objects/items/devices/flash.dm code/game/objects/items/devices/powersink.dm code/game/objects/items/devices/scanners.dm code/game/objects/items/stacks/sheets/glass.dm code/game/objects/items/stacks/sheets/sheet_types.dm code/game/objects/items/weapons/RCD.dm code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm code/game/objects/items/weapons/circuitboards/machinery/cloning.dm code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm code/game/objects/items/weapons/circuitboards/machinery/pacman.dm code/game/objects/items/weapons/circuitboards/machinery/power.dm code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm code/game/objects/items/weapons/circuitboards/machinery/research.dm code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm code/game/objects/items/weapons/flamethrower.dm code/game/objects/items/weapons/handcuffs.dm code/game/objects/items/weapons/kitchen.dm code/game/objects/items/weapons/shields.dm code/game/objects/items/weapons/storage/backpack.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/teleportation.dm code/game/objects/items/weapons/tools.dm code/modules/assembly/igniter.dm code/modules/assembly/infrared.dm code/modules/assembly/mousetrap.dm code/modules/assembly/proximity.dm code/modules/assembly/signaler.dm code/modules/assembly/timer.dm code/modules/assembly/voice.dm code/modules/clothing/glasses/glasses.dm code/modules/hydroponics/trays/tray_tools.dm code/modules/mining/drilling/scanner.dm code/modules/mining/mine_items.dm code/modules/mining/ore.dm code/modules/mob/living/silicon/robot/analyzer.dm code/modules/power/rust/circuits_and_design.dm code/modules/projectiles/ammunition/boxes.dm code/modules/projectiles/guns/energy/laser.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/energy/stun.dm code/modules/research/circuitprinter.dm code/modules/research/designs.dm code/modules/research/destructive_analyzer.dm code/modules/research/protolathe.dm code/modules/research/rdconsole.dm code/modules/research/research.dm code/modules/research/server.dm code/modules/research/xenoarchaeology/genetics/reconstitutor.dm	2015-05-20 11:50:28 +03:00
Kelenius	db30c15e4c	Updates to science ... Protolathe and CI build procs moved to them from RD console. Protolathe and CI now have a build queue. Designs take varying time to build. P and CI material storage is now a list instead of a set of vars. origin_tech is now a list. All sheets now contain exactly 2000 units of matter. In design datum, chemicals and materials are two separate lists. Designs are now sorted. The method is kinda hacky but flexible. They have a var, sort_string. Designs are sorted alphabetically using it. Circuits how show whether they build a machine or a computer in CI menu. Adds item construction, for now protolathe is used.	2015-04-04 13:38:03 +03:00
Kelenius	b4b635f32d	Chemistry commit ... I messed something in the git	2015-03-25 19:09:10 +03:00