paprka c0425bc06e initial commit of assistant antag option

2014-10-13 17:21:02 -07:00

..

admin

initial commit of assistant antag option

2014-10-13 17:21:02 -07:00

assembly

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

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

awaymissions

Merge pull request #5124 from MrPerson/implant_action_button

2014-10-11 18:15:44 +02:00

client

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

clothing

Merge pull request #5181 from paprka/maskflippanreal

2014-10-13 11:43:23 +01:00

crafting

On second thought, leave the result as just a path

2014-10-10 14:30:41 -07:00

detectivework

The rest of the junk

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

events

Merge pull request #5174 from Jordie0608/properwordingisrealfun

2014-10-11 12:41:00 -07:00

flufftext

Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3

2014-10-06 19:27:14 -05:00

food&drinks

Ian emotes while eating again. Fixed #5147

2014-10-11 14:35:35 +02: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

bookcases no longer opaque

2014-10-04 18:28:30 -07:00

mining

Merge pull request #5193 from phil235/OreBoxExFix

2014-10-13 11:49:41 +01:00

mob

Merge pull request #5178 from phil235/IanFoodFix

2014-10-13 11:43:51 +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 #5192 from phil235/TurbineSpriteFix

2014-10-13 11:49:03 +01:00

projectiles

Merge pull request #5120 from nivomi/turretsounds

2014-10-08 20:57:21 +02:00

reagents

Merge pull request #5093 from paprka/medipens

2014-10-08 22:15:52 +01:00

recycling

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

research

Merge pull request #5103 from paprka/largebow

2014-10-08 10:18:51 +01: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

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

2014-10-05 13:48:11 +02: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

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00