Jack Edge aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp ...

Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm

2016-04-07 22:56:08 +01:00

..

admin

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

2016-04-03 18:22:20 -06:00

assembly

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

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

atmospherics

Merge pull request #16662 from MrStonedOne/patch-187

2016-04-06 20:13:26 +02: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

Made more sleeps use stoplag

2016-04-05 11:08:28 -07:00

clothing

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

2016-04-06 21:26:46 +01:00

crafting

Adds sandbags

2016-04-02 23:52:12 -04:00

detectivework

Makes detective scanners fit inside pockets.

2016-04-03 17:37:48 -07:00

emoji

makes emoji parsing return the text if they runtime

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

events

makes atmos_spawn_air() use the new gas string parser

2016-04-04 01:49:09 -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

makes atmos_spawn_air() use the new gas string parser

2016-04-04 01:49:09 -06:00

games

Merge conflict fix

2016-01-17 19:15:30 +02:00

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

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm

2016-04-04 21:20:03 +01:00

jobs

Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt.

2016-04-04 02:13:33 -04: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 pull request #16661 from ChangelingRain/fixkorsshit2k16

2016-04-06 10:57:31 -05:00

mob

Merge branch 'master' into my-best-friend-is-a-holocarp

2016-04-07 22:56:08 +01:00

ninja

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

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

paperwork

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

power

Made more sleeps use stoplag

2016-04-05 11:08:28 -07: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-04-03 18:22:20 -06:00

reagents

makes atmos_spawn_air() use the new gas string parser

2016-04-04 01:49:09 -06:00

recycling

Made more sleeps use stoplag

2016-04-05 11:08:28 -07:00

research

Merge pull request #16664 from erwgd/PortaseederDesign

2016-04-06 13:23:40 -05:00

ruins

Merge pull request #16640 from KorPhaeron/snow_biome

2016-04-06 00:21:21 -05:00

security levels

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

shuttle

World "?status" expansion, Topic() rework

2016-04-06 02:15:25 -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

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

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