Fox-McCloud 6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm

2017-11-18 18:49:47 -05:00

..

admin

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

2017-11-18 18:49:47 -05:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

…

busy_space

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

client

fix prefs

2017-10-18 12:02:37 +08:00

clothing

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

2017-11-18 18:49:47 -05:00

countdown

…

crafting

…

customitems

i thought i commited this...

2017-10-08 18:37:34 -04:00

detective_work

…

economy

…

error_handler

…

events

Merge pull request #8103 from FalseIncarnate/reagents

2017-10-27 09:23:50 -07:00

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

…

food_and_drinks

Merge pull request #8279 from msgerbs/master

2017-11-13 07:55:20 -08:00

garbage_collection

…

holiday

…

hydroponics

adds check for null beegent

2017-10-08 18:37:53 +01:00

karma

…

library

…

lighting

…

logic

…

map_fluff

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

martial_arts

Makes cutting off fingertips optional

2017-10-08 17:26:10 +02:00

mining

…

mob

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

2017-11-18 18:49:47 -05:00

modular_computers

…

nano

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

2017-10-26 12:02:31 -07:00

ninja

…

paperwork

Merge pull request #7800 from Citinited/clipboard-improvements

2017-10-15 19:40:57 -07:00

pda

…

persistence

…

power

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

2017-11-18 18:49:47 -05:00

procedural_mapping

…

projectiles

Ion Rifles are not pistols

2017-10-23 19:00:12 -04:00

reagents

Merge pull request #8242 from Allfd/vamp

2017-11-10 12:29:43 -08:00

recycling

…

research

Fixes typo for energy crossbow

2017-10-25 10:10:43 -04:00

ruins

…

scripting

…

security_levels

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

2017-10-26 12:02:31 -07:00

shuttle

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

2017-10-26 12:02:31 -07:00

space_management

…

spacepods

512 Compilation & Travis

2017-11-11 09:50:21 -08:00

station_goals

…

store

…

surgery

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

2017-11-18 18:49:47 -05:00

telesci

…

tooltip

…

tram

…

vehicle

Atmos Fix

2017-11-11 00:10:21 -05:00

vr

…