Jordie0608 2ad2cc83e7 Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen ...

Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm

2015-10-18 17:27:24 +11:00

..

admin

Merge pull request #12331 from phil235/AdminTopicFix

2015-10-13 21:41:06 -05:00

assembly

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

awaymissions

Merge pull request #12339 from Shadowlight213/Grindering

2015-10-16 09:30:21 +03:00

client

Merge pull request #12429 from Shadowlight213/Kittygobyebye

2015-10-18 00:42:38 +03:00

clothing

Merge pull request #12401 from KorPhaeron/cakehat

2015-10-15 23:44:46 -03:00

crafting

Fixes hotspot having two New() procs.

2015-10-08 19:50:01 +02:00

detectivework

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

2015-09-19 22:34:30 +02:00

emoji

…

events

Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.

2015-10-15 21:52:37 +02:00

flufftext

Fixes critical bug causing multiple hits from single projectile.

2015-10-07 20:57:36 +02:00

food&drinks

Merge pull request #12420 from phil235/TransferAmountChange

2015-10-17 18:06:39 +03:00

games

…

holiday

…

html_interface

…

hydroponics

Merge pull request #12431 from Incoming5643/blaze_it

2015-10-17 10:16:04 -05:00

library

…

lighting

Disallow nulls in the lighting system's lights list

2015-10-12 01:52:30 -07:00

mining

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

mob

Merge pull request #12431 from Incoming5643/blaze_it

2015-10-17 10:16:04 -05:00

nano

…

ninja

Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.

2015-10-15 21:52:37 +02:00

paperwork

Fixes not being able to move during jaunting if you are cuffed and pulled.

2015-10-08 00:48:00 +02:00

power

Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.

2015-10-15 21:52:37 +02:00

procedural mapping

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

projectiles

Merge pull request #12417 from phil235/SmokeChange

2015-10-17 10:07:04 -05:00

reagents

Merge pull request #12417 from phil235/SmokeChange

2015-10-17 10:07:04 -05:00

recycling

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

2015-10-12 22:01:57 +02:00

research

Merge pull request #12417 from phil235/SmokeChange

2015-10-17 10:07:04 -05:00

security levels

Removes in world

2015-10-09 22:37:53 -05:00

shuttle

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

2015-10-16 01:14:17 +11:00

space transition

Removes obsolete comment

2015-10-14 07:17:24 +03:00

surgery

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

telesci

…