Commit Graph

69 Commits

Author SHA1 Message Date
Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie 2734a1bcf6 Search function for research 2015-02-08 14:35:49 +01:00
Fox-McCloud af78338a99 Nerfborgs 2015-02-08 00:22:13 -05:00
Fox-McCloud 8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Markolie afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Artorp c281329be0 fix: retractor autolathe build path
Autolathes can now successfully print a retractor.
2015-01-29 08:40:20 +01:00
Markolie e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Markolie ebfe5eea92 R&D fix 2015-01-14 06:19:01 +01:00
Markolie 6a0d3a60b7 Changeling DNA fixes 2015-01-13 20:17:00 +01:00
Markolie c65c9c8a7a Minor R&D changes, defib/IPC fix attempt 999 2015-01-09 05:37:21 +01:00
Markolie 92b57b5189 Bug fixes, R&D design files, map fixes 2015-01-05 21:03:48 +01:00
Markolie f55db398cf ID fix 2014-12-24 00:53:25 +01:00
Markolie c864a732df Missing cyborg repair designs 2014-12-24 00:52:37 +01:00
Markolie 74fc28e6b5 Power cell protolathe fix 2014-12-23 16:52:59 +01:00
Markolie 04fab6fc9e R&D submenus, autolathe rework from /tg/ 2014-12-22 19:40:22 +01:00
Markolie 266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie d78fa6d160 Separate R&D design files 2014-12-22 16:43:42 +01:00