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

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm

2016-03-30 22:55:00 -06:00

..

admin

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

assembly

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

2016-03-29 14:46:06 -06:00

atmospherics

fixes huge roundstart bugs

2016-03-30 16:07:35 -06:00

awaymissions

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

cargo

Fixes and standardizes spelling

2016-03-30 04:14:07 -04:00

client

Fix Preference toggles and button name.

2016-03-28 03:29:31 +02:00

clothing

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

2016-03-30 22:55:00 -06:00

crafting

Adds craftable paper sacks

2016-03-27 23:37:43 -05:00

detectivework

…

emoji

makes emoji parsing return the text if they runtime

2016-03-16 21:28:36 -07:00

events

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

flufftext

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

2016-03-29 14:46:06 -06:00

food&drinks

Updates nutritional content with honey

2016-03-30 03:07:27 -05:00

games

…

holiday

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

holodeck

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

html_interface

…

hydroponics

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

jobs

I'm a skrub

2016-03-24 18:25:02 -03:00

library

Replaced last occurences of gc_destroyed by qdeleted().

2016-03-05 01:58:56 +01:00

lighting

fixes huge roundstart bugs

2016-03-30 16:07:35 -06:00

mining

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

2016-03-30 22:55:00 -06:00

mob

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

2016-03-30 22:55:00 -06:00

ninja

Neatens the code, by making non-visible antaghuds a subtype of antaghud.

2016-03-08 21:19:46 -05:00

paperwork

Replaced last occurences of gc_destroyed by qdeleted().

2016-03-05 01:58:56 +01:00

power

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

procedural mapping

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

projectiles

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

2016-03-30 22:55:00 -06:00

reagents

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

recycling

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

2016-03-30 22:55:00 -06:00

research

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

2016-03-29 14:46:06 -06:00

ruins

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

security levels

…

shuttle

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

space transition

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

spells

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

stock_market

You must be 18 or older to play

2016-03-27 22:21:34 -04:00

surgery

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

2016-03-29 14:46:06 -06:00

telesci

Fixes issues put forth by maintainers.

2016-03-19 01:09:32 -07:00

tgui

…

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

Merge pull request #16260 from Bawhoppen/grenadesholyshithelp

2016-03-22 19:35:43 +01:00

vehicles

Merge pull request #16375 from ChangelingRain/fastbike

2016-03-26 20:46:35 -05:00