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

Conflicts:
	code/game/mecha/mecha.dm

2014-08-06 15:22:56 -07:00

..

admin

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

2014-08-06 15:22:56 -07:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

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

2014-08-06 15:22:56 -07:00

client

MONKEY MODE: "IT ACTUALLY WORKS" EDITION

2014-07-08 22:55:47 -05:00

clothing

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

2014-08-06 15:22:56 -07:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

2014-05-02 17:46:04 +01:00

events

added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.

2014-08-03 22:14:56 -03: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&drinks

merging

2014-07-29 16:50:21 -07:00

hydroponics

Merge pull request #4123 from Rolan7/Issue_4045

2014-07-21 08:40:38 -05:00

library

Merge branch 'master' into ItemNameFixing07-2014

2014-07-31 18:54:38 +02:00

mining

Another lowercasing pass on a bunch of items and furnitures.

2014-07-27 19:14:40 +02:00

mob

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

2014-08-06 15:22:56 -07:00

nano

Initial pass to convert LF to CRLF

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

paperwork

fixes laziness

2014-07-18 18:30:23 -07:00

power

fix for #4243, adds notification

2014-07-30 11:00:31 -07:00

projectiles

Merge pull request #4336 from Incoming5643/bluepanties

2014-08-06 10:41:07 +01:00

reagents

added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.

2014-08-03 22:14:56 -03:00

recycling

Fixes that "temporary black screen on deletion" issue for disposals

2014-08-02 18:47:00 -07:00

research

Mining Machines: Implementing ex_act()

2014-07-20 01:11:06 -04: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

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

2014-07-07 13:42:31 -04:00

surgery

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

2014-07-07 13:42:31 -04:00

telesci

Initial pass to convert LF to CRLF

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