Perakp 48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-11-29 09:37:40 +02:00

..

AI_module_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

comp_board_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

machine_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

mecha_designs.dm

Exosuit fabricator revamp

2014-11-06 23:45:16 -03:00

mechfabricator_designs.dm

Fixes phazon chassis availability in the mech fabricator, they were missing.

2014-11-14 14:45:38 -03:00

medical_designs.dm

research design and origintech update

2014-10-30 19:21:58 -07:00

power_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

stock_parts_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

telecomms_designs.dm

Advanced Shotshells

2014-08-14 12:15:10 -05:00

weapon_designs.dm

Bluespace wormhole projector

2014-10-26 15:06:30 +02:00