PsiOmegaDelta 2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm

2015-09-08 07:58:25 +02:00

..

implant.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

implantcase.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

implantchair.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

implanter.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-08 07:58:25 +02:00

implantfreedom.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

implantpad.dm

…

implantuplink.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00