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

Arcade Carpetting

2017-09-19 21:39:24 -04:00

assembly

Adds movement intents

2017-06-10 10:12:14 +01:00

atmos_automation

…

awaymissions

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

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

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

Refactors Syndicate Bombs

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

crafting

chemical bombs

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

customitems

i thought i commited this...

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

detective_work

Blood Refactor (#6220)

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

economy

…

error_handler

…

events

Merge pull request #8103 from FalseIncarnate/reagents

2017-10-27 09:23:50 -07: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

Air Traffic Control & Map Lore

2017-06-28 16:12:15 -07:00

fish

Updates Intents

2017-06-10 09:43:36 +01:00

flufftext

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

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

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

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

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

Fox adjustment

2017-08-15 18:32:23 +01:00

mob

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

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

modular_computers

Fixed issue where attempting to clone a file did nothing.

2017-08-10 21:36:59 +01:00

nano

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

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

ninja

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

paperwork

Merge pull request #7800 from Citinited/clipboard-improvements

2017-10-15 19:40:57 -07: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-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

Fixes some instances of disposals sending things to nullspace

2017-08-05 05:51:54 +01:00

research

Fixes typo for energy crossbow

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

ruins

…

scripting

Removes All Comments about auto-correction and Finddeclaration.exe

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

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

Fixes for numerous runtimes

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

spacepods

512 Compilation & Travis

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

station_goals

Breathing is Now Handled on Lungs

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

store

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

2017-08-16 19:12:46 -04:00

surgery

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

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

telesci

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

tooltip

…

tram

…

vehicle

Atmos Fix

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

vr

…