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

..

admin

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

2017-01-06 16:36:46 +01:00

alarm

…

arcade

Fixes up battle terminal connections

2016-12-30 00:12:02 -05:00

assembly

…

atmos_automation

…

awaymissions

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

2017-01-06 16:36:46 +01:00

client

Merge pull request #6138 from Puckaboo2/masterbackup

2017-01-11 16:36:44 -05:00

clothing

updated flags

2017-01-10 20:43:55 +04:00

computer3

Computer3 machines no longer set the user's machine to a datum

2016-12-23 18:09:40 -08:00

countdown

…

crafting

…

customitems

Adds a fluff item for ComputerlessCitizen

2017-01-10 14:31:27 +01:00

detective_work

…

economy

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

error_handler

…

events

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

2016-12-23 19:32:19 +01:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

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

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

garbage_collection

…

holiday

…

hydroponics

Merge pull request #6085 from Fox-McCloud/food-rework

2017-01-10 12:11:17 -08:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

mining

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

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

mob

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

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

nano

Fixes both pai resting jankiness, pai body re-entering

2017-01-09 15:14:26 -08:00

ninja

…

paperwork

Fixes video cam's networkless camera

2017-01-06 04:56:10 -05:00

pda

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

persistence

…

pooling

…

power

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

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

procedural_mapping

…

projectiles

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

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

reagents

Fixing Food Runtime

2017-01-10 21:40:54 -05:00

recycling

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

research

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

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

ruins

…

scripting

…

security_levels

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

shuttle

Merge pull request #6051 from Crazylemon64/pai_ui_fix

2017-01-06 03:08:27 -05:00

space_management

…

spacepods

Fixes a runtime when attempting to assemble an incomplete pod frame

2016-12-30 00:10:35 -08:00

store

…

surgery

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

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

telesci

…

tooltip

…

tram

…

vehicle

…