phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm

2016-10-31 19:59:00 +01:00

..

admin

Remove span

2016-10-28 08:14:24 -02:00

assembly

Above and beyond the call of duty

2016-10-21 20:29:54 -04:00

atmospherics

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

awaymissions

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

cargo

Merge pull request #21178 from Tacolizard/patch-11

2016-10-27 15:12:36 -05:00

chatter

…

client

Does the remie

2016-10-27 20:09:52 -07:00

clothing

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

countdown

…

crafting

Adds Juiceboxes/Cartons + Apple juice & Choc. Milk (#21206)

2016-10-29 18:13:32 +13:00

detectivework

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

emoji

…

events

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

flufftext

The creepy clown epidemic has arrived at Space Station 13. (#21164)

2016-10-30 19:51:19 +13:00

food_and_drinks

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

games

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

holiday

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

holodeck

Tweak Duplicate object proc (#21069)

2016-10-30 13:41:54 +01:00

html_interface

…

hydroponics

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

jobs

Neck Slots (#21169)

2016-10-26 19:03:41 +13:00

library

Fixes order by id button in library's computer (#21259)

2016-10-30 18:39:00 +01:00

lighting

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

mining

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

mob

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

modular_computers

Merge pull request #20992 from swindly/spelling

2016-10-18 09:15:32 +13:00

ninja

…

orbit

…

paperwork

Minor devil fixes (#20770)

2016-10-18 08:45:45 +02:00

power

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

procedural_mapping

…

projectiles

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

reagents

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

recycling

Revert "Makes drag/drop that dont have any use call click"

2016-10-16 12:41:42 -07:00

research

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

ruins

fixing stuff about atom_colours.

2016-10-21 01:30:42 +02:00

security_levels

…

shuttle

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

space_transition

…

spells

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

station_goals

Merge branch 'master' of https://github.com/tgstation/tgstation into gaswalkers

2016-10-19 16:34:00 -07:00

stock_market

Station Charter now keeps the server name in the game's window name after renaming the station (#21030)

2016-10-19 16:54:22 +13:00

surgery

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

telesci

…

tgui

…

tooltip

…

uplink

Hardlight Bows (#20944)

2016-10-28 14:16:16 +13:00

vehicles

…

VR

…

zombie

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00