Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01:00

..

Department Sec

Made spawning with a loyalty implant compliant to configuration...

2014-07-14 17:21:11 -04:00

Softcurity

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

2014-09-10 22:14:37 +01:00