paprka 372ecd6233 Merge branch 'master' of https://github.com/tgstation/-tg-station into syndicateshotgunsreturn ...

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

2014-10-01 20:10:58 -07:00

..

admin

Merge pull request #4990 from Ikarrus/deathsquads

2014-09-30 12:55:50 -05:00

assembly

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

2014-09-25 18:45:53 +02:00

awaymissions

…

client

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

clothing

rta button

2014-09-26 15:28:57 -07:00

detectivework

…

events

Merge pull request #4977 from Menshin/structure_lighting_update

2014-10-01 10:27:40 -05:00

flufftext

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

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

food&drinks

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

hydroponics

Resolved conflicts and added my yml changelog file

2014-09-19 09:30:59 -06:00

library

Merge pull request #4815 from phil235/AudibleMsgFix

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

mining

Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire

2014-09-24 16:58:23 +02:00

mob

Merge pull request #5008 from Miauw62/EVERYTHINGBKEARPESK

2014-10-01 10:45:53 -05:00

nano

…

paperwork

…

power

Merge pull request #4639 from RemieRichards/AtomPool

2014-09-19 20:03:24 +02:00

projectiles

even more code optimizing

2014-10-01 15:12:21 -07:00

reagents

Replacing clone damage descriptions by "cellular damage".

2014-09-25 19:11:31 +02:00

recycling

reverting to show_message proc in three places.

2014-09-25 19:14:51 +02:00

research

initial commit

2014-09-30 13:41:02 -07:00

scripting

Removed language argument from broadcast()

2014-09-30 18:20:01 +02:00

security levels

New sound for more distressing minor announcements

2014-09-21 22:33:08 -06:00

shuttle

Adds a JMP link to the Admin Ferry Message

2014-09-27 17:13:37 -06:00

surgery

removing comment.

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

telesci

…