Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

2017-01-11 23:11:29 +01:00

..

AI_module_designs.dm

…

autolathe_designs.dm

Adds the Voice of God, fix up font-size CSS

2017-01-07 23:43:32 +01:00

bluespace_designs.dm

…

comp_board_designs.dm

added category for atmos consoles

2017-01-11 09:56:16 +04:00

equipment_designs.dm

Technical difficulties

2016-06-20 11:20:32 -05:00

janitorial_designs.dm

…

machine_designs.dm

SMES and Borg coolers can now be made again, R&D maxing works again

2016-09-19 16:33:06 -07:00

mecha_designs.dm

…

mechfabricator_designs.dm

Fixes a couple incorrect research prereq specifications

2016-11-04 12:24:32 -07:00

medical_designs.dm

lein nutes

2016-06-01 18:11:52 -04:00

mining_designs.dm

…

misc_designs.dm

…

power_designs.dm

…

spacepod_designs.dm

Fixes a couple incorrect research prereq specifications

2016-11-04 12:24:32 -07:00

stock_parts_designs.dm

Desnowflakizing

2016-06-16 11:01:25 -04:00

telecomms_designs.dm

…

weapon_designs.dm

Makes RnD console use NanoUI

2016-06-08 21:14:14 -04:00