CHOMPstation

mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 20:46:29 +01:00

Files

T

Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes

Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm

2015-05-22 19:26:39 +03:00

artifact

Merge with dev.

2015-05-20 13:39:31 +09:30

finds

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

machinery

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

tools

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

chemistry.dm

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

geosample.dm

Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.

2015-04-26 12:53:26 +09:30

manuals.dm

Update and clean up of all manuals

2014-04-20 16:09:57 -07:00

master_controller.dm

Removes xenoarch reconstitutors entirely. "Fixes" #5413

2015-05-16 17:40:49 +09:30

misc.dm

Debugging!

2015-05-12 21:30:06 +09:30

readme.dm

moved and tweaked the xenoarch finds a bit

2012-08-11 02:17:07 +10:00

readme.dm



//coming soon

//there'll probably be some stuff on the wiki at some point



//original code from alfie275 / lunacode, artifacts are from isaidno