Hornygranny 9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 ...

Conflicts:
	code/game/turfs/simulated/floor.dm

2014-10-30 17:26:25 -07:00

..

admin

Merge pull request #5530 from MrStonedOne/fukkinreallyerro

2014-10-30 21:00:42 +01:00

assembly

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

2014-10-22 20:54:35 +02:00

awaymissions

Makes the gateway unacidable.

2014-10-12 20:43:15 +03:00

client

Merge pull request #5530 from MrStonedOne/fukkinreallyerro

2014-10-30 21:00:42 +01:00

clothing

Merge pull request #5466 from paprka/removejensen

2014-10-27 10:15:19 -07:00

crafting

moved files and fixed tablecrafting

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

detectivework

…

events

Fixes botcall conflicts, removes even more cruft and unused code

2014-10-30 20:36:30 -03:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

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

2014-10-25 11:29:07 +00:00

holiday

Makes spookoween compile

2014-10-25 11:40:53 +00:00

hydroponics

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

2014-10-20 21:38:39 -07:00

library

Fixes the book changing icon when carved.

2014-10-21 23:51:41 +02:00

mining

Merge remote-tracking branch 'upstream/master' into attackoftheturfs

2014-10-30 19:35:03 -03:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2

2014-10-30 17:26:25 -07:00

nano

…

paperwork

Error message due to being clothed during ass photocopy only appears once now. You can no longer photocopy the ass of alien larvas, they have no ass. Weapon/paper now has a layer of 3 and won't appear in front of mobs.

2014-10-27 20:27:03 +01:00

power

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2

2014-10-30 17:26:25 -07:00

projectiles

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2

2014-10-28 15:27:46 -07:00

reagents

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

2014-10-25 23:25:27 -07:00

recycling

Merge remote-tracking branch 'upstream/master' into attackoftheturfs

2014-10-30 19:35:03 -03:00

research

Merge pull request #5530 from MrStonedOne/fukkinreallyerro

2014-10-30 21:00:42 +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

…

telesci

Removes telesci comp's update_icon override

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