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

Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm

2015-01-06 12:17:29 +08:00

..

admin

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

2015-01-06 12:17:29 +08:00

assembly

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

2015-01-04 01:52:14 +00:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

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

2015-01-04 01:52:14 +00:00

clothing

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

2015-01-06 12:17:29 +08:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

…

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

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

2015-01-04 01:52:14 +00:00

flufftext

Fixes hallucinated attackers not doing the attack animation.

2014-12-27 22:41:13 +01:00

food&drinks

Fixes potato cell construction being broken

2015-01-02 18:18:26 +01:00

holiday

…

hydroponics

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

2015-01-04 01:52:14 +00:00

library

Defines allowed books in main bookcase define

2014-12-31 23:08:23 -05:00

mining

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

2015-01-05 19:52:03 +00:00

mob

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

2015-01-05 19:52:03 +00:00

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paperwork

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

2015-01-04 01:52:14 +00:00

power

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

2015-01-04 01:52:14 +00:00

projectiles

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

2015-01-06 12:17:29 +08:00

reagents

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

2015-01-06 12:17:29 +08:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe.

2014-12-29 20:46:01 +01:00

scripting

…

security levels

…

shuttle

Map Update

2015-01-04 01:45:02 +00:00

surgery

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

2014-12-16 02:52:08 +03:00

telesci

SubSystem rewrite

2014-12-31 13:25:41 +00:00