paprka 2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns ...

Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi

2014-10-19 17:30:47 -07:00

..

admin

reverts wizard jumpsuit stuff

2014-10-18 19:31:56 -07:00

assembly

Merge pull request #5263 from Aranclanos/electropackrevamp

2014-10-16 08:08:57 -05:00

awaymissions

Makes the gateway unacidable.

2014-10-12 20:43:15 +03: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 #5316 from xxalpha/fix_flasher

2014-10-19 17:44:30 -05:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

The rest of the junk

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

events

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

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

flufftext

Adds construction permits

2014-10-11 17:39:27 -05:00

food&drinks

Ian emotes while eating again. Fixed #5147

2014-10-11 14:35:35 +02:00

hydroponics

Merge pull request #5075 from Incoming5643/FuckIKEA

2014-10-16 23:00:07 -05:00

library

bookcases no longer opaque

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

mining

Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD

2014-10-16 08:44:36 -05:00

mob

Merge pull request #5300 from phil235/DroneArrestFix

2014-10-19 18:54:33 -05:00

nano

…

paperwork

Merge pull request #5201 from Cheridan/permits

2014-10-17 05:24:37 +01:00

power

Nothing to see here, move along.

2014-10-15 11:40:12 -03:00

projectiles

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

2014-10-19 17:30:47 -07:00

reagents

[nerfingintesifies]

2014-10-11 08:04:35 -07:00

recycling

initial commit

2014-10-15 13:29:19 -07:00

research

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

2014-10-19 17:30:47 -07: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