Remie Richards b463c5a51f Merge pull request #5056 from Incoming5643/banthatshit ...

Adds step_x and step_y to the locked var list

2014-10-06 14:23:04 +01:00

..

admin

Merge pull request #5056 from Incoming5643/banthatshit

2014-10-06 14:23:04 +01:00

assembly

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

awaymissions

remove helmet pathing

2014-10-01 15:01:36 -07:00

client

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

clothing

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

detectivework

The rest of the junk

2014-09-05 18:14:02 +04:00

events

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

flufftext

Standardizes name and path of plastique/plastic explosive/c4 to C4

2014-09-21 17:34:26 +10:00

food&drinks

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

hydroponics

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

library

Merge pull request #4815 from phil235/AudibleMsgFix

2014-09-27 15:01:56 +02:00

mining

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

mob

Merge pull request #5092 from Cheridan/flashing

2014-10-06 14:10:31 +01:00

nano

…

paperwork

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

power

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

projectiles

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

reagents

Merge pull request #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -05:00

recycling

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

research

Flash Update

2014-10-04 19:51:14 -05:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

shuttle

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

surgery

removing comment.

2014-09-21 22:26:18 +02:00

telesci

…