PsiOmega d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm

2015-05-11 09:28:59 +02:00

..

implant.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

implantcase.dm

Removes most instances of item_color

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

implantchair.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

implanter.dm

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

2015-05-11 09:28:59 +02:00

implantfreedom.dm

Removes most instances of item_color

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

implantpad.dm

- Implant pads will no longer be stuck inside your pocket. Fixes Issue 1058.

2013-01-18 10:51:41 +00:00

implantuplink.dm

Code formatting, EOL at EOF fixes, refactoring

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