bgobandit 0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-07-24 11:58:52 -04:00

..

admin

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

2015-07-24 11:58:52 -04:00

assembly

Fixes proc arguments

2015-07-15 23:52:35 +02:00

awaymissions

Finishes carnmc's shuttle rotation feature.

2015-07-20 04:28:45 -07:00

client

migrates admin memos to use database

2015-07-19 17:01:38 +10:00

clothing

Merge pull request #10752 from phil235/HailerOverload

2015-07-23 13:51:45 -03:00

crafting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

detectivework

Merge pull request #10656 from phil235/DroneBuckleDropFix

2015-07-17 21:40:32 -05:00

emoji

…

events

Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.

2015-07-23 10:49:06 -04:00

flufftext

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

2015-07-19 21:53:39 +02:00

food&drinks

Merge pull request #10783 from bgobandit/corgiburger

2015-07-24 01:12:12 -05:00

games

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

Fixes proc arguments

2015-07-15 23:52:35 +02:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

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

2015-07-19 21:53:39 +02:00

library

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lighting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mining

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

2015-07-16 13:50:01 +02:00

mob

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

2015-07-24 11:58:52 -04:00

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ninja

Fixes proc arguments

2015-07-15 23:52:35 +02:00

paperwork

Fixes proc arguments

2015-07-15 23:52:35 +02:00

power

Merge pull request #10658 from xxalpha/fixsomething

2015-07-23 01:50:05 +02:00

procedural mapping

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectiles

Merge pull request #10659 from phil235/HandcuffOverlayFix

2015-07-23 22:21:52 +10:00

reagents

Merge pull request #10659 from phil235/HandcuffOverlayFix

2015-07-23 22:21:52 +10:00

recycling

Fixes proc arguments

2015-07-15 23:52:35 +02:00

research

Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.

2015-07-23 10:49:06 -04:00

scripting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

security levels

Fixes proc arguments

2015-07-15 23:52:35 +02:00

shuttle

OH GOD THE RUNTIMES!

2015-07-22 09:49:32 -07:00

surgery

Fixes proc arguments

2015-07-15 23:52:35 +02:00

telesci

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

2015-07-19 21:53:39 +02:00