Tigercat2000 29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm

2015-11-07 20:54:24 -08:00

..

admin

Admin Virus2 Creator

2015-11-06 07:57:32 -08:00

alarm

…

assembly

More Dereferencing

2015-10-12 02:37:52 -04:00

atmos_automation

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

awaymissions

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2

2015-10-11 22:50:27 -04:00

client

Merge pull request #2433 from tigercat2000/telecOOOOMS

2015-11-02 19:03:27 -05:00

clothing

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

2015-11-07 20:54:24 -08:00

computer3

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

crafting

…

customitems

Merge pull request #2292 from tigercat2000/fancy

2015-10-06 18:49:08 -04:00

destilery

…

detective_work

…

economy

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

2015-10-28 19:02:27 -04:00

events

Swarmer Event Hotfix

2015-11-05 20:38:17 -05:00

examine

more de-referencing

2015-10-12 04:18:49 -04:00

ext_scripts

…

fish

fishy changes...

2015-11-04 19:09:48 -05:00

flufftext

Another del->qdel pass

2015-10-08 16:49:10 -04:00

food

Another del->qdel pass

2015-10-08 16:49:10 -04:00

games

…

garbage_collection

Garbage Collect Everything

2015-10-13 20:23:26 -04:00

holiday

…

hydroponics

BS crystal and tomato fix

2015-10-31 10:20:17 -04:00

jungle

Another del->qdel pass

2015-10-08 16:49:10 -04:00

karma

…

library

…

lighting

…

liquid

…

media

…

mining

Merge pull request #2468 from tigercat2000/tg-life

2015-11-07 23:08:01 -05:00

mob

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

2015-11-07 20:54:24 -08:00

nano

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

2015-11-07 20:54:24 -08:00

ninja

…

organs

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

paperwork

Merge pull request #2304 from Markolie/paper

2015-10-06 17:23:57 -04:00

pooling

Removes the Rest of Pooled Objects

2015-10-08 14:18:40 -04:00

power

more robust logging

2015-11-03 07:16:14 -05:00

procedural_mapping

…

projectiles

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

2015-10-19 16:13:51 -07:00

reagents

Merge remote-tracking branch 'upstream/master' into barber-update

2015-11-06 06:30:59 -05:00

recycling

Reduces Round-start Atmos Processing: Full Charge Disposals

2015-10-17 19:53:21 -04:00

research

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

scripting

Telecomms Refactor & CodeMirror

2015-10-28 17:23:22 -07:00

security_levels

…

shieldgen

…

shuttles

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00

space_transition

…

store

…

surgery

surgeryize me cap'n

2015-10-14 07:05:49 -04:00

telesci

BS crystal and tomato fix

2015-10-31 10:20:17 -04:00

tram

…

vehicle

-tg- pull refactor

2015-10-10 11:15:52 -07:00

virus2

not ideal but species deffault stuff yeah

2015-11-07 19:11:22 -08:00