HugoLuman 71ad25c01c Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/drask.dm
#	code/modules/surgery/organs/subtypes/drask.dm

2016-04-12 19:16:57 -07:00

..

admin

Merge pull request #4165 from Tastyfish/sdql-update

2016-04-12 03:27:11 -04:00

alarm

Port -tg-station cameranets

2016-03-13 15:06:24 -07:00

arcade

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

assembly

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

2016-04-05 21:10:36 -07:00

atmos_automation

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

awaymissions

Updates maploader code to be in line with tg's, startup improvements

2016-04-10 02:57:58 -04:00

client

Drask files

2016-04-12 19:00:29 -07:00

clothing

Drask files

2016-04-12 19:00:29 -07:00

computer3

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

crafting

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

customitems

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

detective_work

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

economy

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

events

Ports SNPCs

2016-04-09 00:10:01 -04:00

examine

…

ext_scripts

…

fish

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

flufftext

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

food

Ports SNPCs

2016-04-09 00:10:01 -04:00

garbage_collection

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

holiday

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

hydroponics

Ports SNPCs

2016-04-09 00:10:01 -04:00

karma

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

library

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

lighting

Assault Pods & Fixes

2016-03-19 14:45:45 -07:00

logic

Fix all of the merge conflicts and lacking to_chats with 4041

2016-04-05 21:16:52 -07:00

media

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

mining

Xenobio Refactor/Changes

2016-04-06 01:37:04 -04:00

mob

Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask

2016-04-12 19:16:57 -07:00

nano

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

ninja

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

paperwork

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

pda

Fixes cyborg pdas

2016-04-08 15:00:52 -04:00

pooling

…

power

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

procedural_mapping

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

projectiles

Ports SNPCs

2016-04-09 00:10:01 -04:00

reagents

Merge pull request #4145 from Tastyfish/snpcs

2016-04-11 20:44:50 -04:00

recycling

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

research

Vendor Changes

2016-04-10 00:07:37 -04:00

scripting

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

security_levels

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

shuttle

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

space_transition

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

store

…

surgery

Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask

2016-04-12 19:16:57 -07:00

telesci

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

tram

…

vehicle

no, no. i clean.

2016-04-10 07:26:24 -04:00