Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

2017-08-05 19:03:52 -04:00

..

admin

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

2017-08-05 19:03:52 -04:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

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

2017-08-05 19:03:52 -04:00

client

Sound Update/Refactor

2017-07-25 20:35:38 -04:00

clothing

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

2017-08-05 19:03:52 -04:00

countdown

Refactors Syndicate Bombs

2017-06-29 18:10:58 -04:00

crafting

chemical bombs

2017-06-29 20:02:27 -04:00

customitems

Merge pull request #7728 from Xantholne/HoodieFluff

2017-07-10 13:28:42 -07:00

detective_work

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

economy

…

error_handler

…

events

virus immunity trait not var

2017-07-13 19:47:23 -04:00

examine

Reduces Stat Calls

2017-07-23 04:56:05 -04:00

ext_scripts

Paranoid sanitization

2017-07-20 01:15:13 -07:00

fancytitle

…

fish

…

flufftext

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

2017-08-05 19:03:52 -04:00

food_and_drinks

Merge pull request #7860 from Kyep/corgi_eat_tweak

2017-07-25 06:52:23 -04:00

garbage_collection

…

holiday

…

hydroponics

Most of fox's changes

2017-07-21 15:20:12 -07:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

mining

Removes Unused Xenoarch Files

2017-07-29 20:13:45 -04:00

mob

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

2017-08-05 19:03:52 -04:00

modular_computers

Merge pull request #6516 from fludd12/Grey-Rework

2017-06-30 08:29:31 -07:00

nano

…

ninja

…

paperwork

Makes autopsy reports its own object

2017-07-27 00:14:27 +01:00

pda

Merge pull request #7818 from Crazylemon64/item_stumbling

2017-07-22 01:55:19 -04:00

persistence

…

power

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

2017-08-05 19:03:52 -04:00

procedural_mapping

…

projectiles

Merge pull request #7708 from Fox-McCloud/you-cant-outmeme-memers

2017-07-25 10:42:42 -07:00

reagents

Fixes Dead Hearts Allowing you to live.

2017-07-29 19:28:38 -04:00

recycling

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

research

Merge pull request #7906 from Fox-McCloud/remove-cael

2017-08-01 22:15:22 -07:00

ruins

…

scripting

Removes All Comments about auto-correction and Finddeclaration.exe

2017-07-22 02:54:45 -04:00

security_levels

…

shuttle

karma karma karma karma chameleon....

2017-08-04 15:29:18 +01:00

space_management

Fixes for numerous runtimes

2017-07-16 14:42:11 -07:00

spacepods

eh

2017-07-26 16:29:05 -04:00

station_goals

Breathing is Now Handled on Lungs

2017-07-19 03:28:21 -04:00

store

Instruments Refactor and Electric Guitars

2017-07-02 03:52:42 -04:00

surgery

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

2017-08-05 19:03:52 -04:00

telesci

…

tooltip

…

tram

…

vehicle

…

vr

…