Incoming be8671fcf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6 ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-04-21 19:00:04 -04:00

..

admin

Generalised ID naming

2014-04-09 18:49:59 +02:00

assembly

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

2014-03-26 18:14:48 -07:00

awaymissions

Generalised ID naming

2014-04-09 18:49:59 +02:00

client

Merge pull request #3418 from VistaPOWA/pr_announce

2014-04-18 19:05:44 -07:00

clothing

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

2014-04-16 16:58:28 -07:00

detectivework

…

events

AHJGFD

2014-04-18 19:48:32 +04:00

flufftext

Fixes the bug where players get deleted because of hallucinations. How the fuck did I screw this up so badly...

2014-03-22 21:55:52 -07:00

food

human-burgers now eject correctly

2014-04-03 22:50:02 +02:00

hydroponics

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

2014-04-11 01:36:49 +04:00

library

Wooden Walls

2014-04-01 18:03:02 +11:00

mining

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

2014-04-16 16:58:28 -07:00

mob

Merge pull request #3459 from MrPerson/screen_deletion

2014-04-21 13:26:49 -05:00

nano

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

paperwork

Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"

2014-04-21 18:59:58 +02:00

power

* sun and solars now uses world.time instead of timeofday,

2014-04-19 18:31:22 +02:00

projectiles

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

2014-04-21 19:00:04 -04:00

reagents

Merge pull request #3465 from Giacom/pandemic_fix

2014-04-21 10:18:19 -05:00

recycling

Merge pull request #3329 from phil235/DisposalPipeFix

2014-04-08 02:04:51 -05:00

research

Increased cost of gygax, decreased cost of durand, capped protolathe coeff at 2x

2014-04-16 20:09:54 -07:00

scripting

fixes shit

2014-03-09 18:31:43 +01:00

security levels

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

shuttle

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

surgery

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

2014-03-26 18:14:48 -07:00

telesci

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00