bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear ...

Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm

2015-11-18 19:55:06 -05:00

..

admin

Merge pull request #13022 from tkdrg/morefix

2015-11-15 14:19:44 -06:00

assembly

Revenant changes XVIII

2015-11-05 18:50:51 -05:00

awaymissions

fucking Lummox JR's map loader treating chars and tiles as one

2015-11-13 10:22:52 -08:00

client

Merge pull request #12916 from tkdrg/ripinpiss

2015-11-09 02:56:41 -03:00

clothing

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

2015-11-15 16:30:03 -05:00

crafting

Makes it so only advanced tool users can use tablecrafting.

2015-10-27 02:01:47 +02:00

detectivework

Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ).

2015-10-22 18:40:32 +02:00

emoji

…

events

Fixes warning in anomaly_pyro.dm

2015-11-14 00:23:05 -06:00

flufftext

Changed various instances of range() and orange() to ultra_range().

2015-10-19 20:04:14 +01:00

food&drinks

Merge pull request #12924 from Firecage/Optable

2015-11-11 17:31:38 +01:00

games

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

holodeck

Holodeck refactor and Enchancements

2015-11-15 20:23:23 -05:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears).

2015-11-10 22:06:54 +01:00

library

Fixes compile error in library computers from me coding while too high

2015-11-16 13:01:34 -08:00

lighting

Improves speed of redraw_lighting()

2015-11-06 23:36:03 -03:00

mining

fixes memestation, ups ore points slightly

2015-11-18 19:51:49 -05:00

mob

Merge pull request #13055 from Anonus/actionbuttons

2015-11-18 20:26:47 +00:00

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ninja

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

2015-11-07 15:56:39 -03:00

paperwork

makes sleepypens refillable

2015-11-02 17:41:35 -08:00

power

A STRONG INDEPENDENT ELDER GOD THAT DOESN'T NEED NO MACHINES

2015-11-16 17:08:25 -05: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 branch 'master' of https://github.com/tgstation/-tg-station into newmininggear

2015-11-18 19:55:06 -05:00

reagents

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

2015-11-18 19:55:06 -05:00

recycling

Merge pull request #12552 from KorPhaeron/disposals

2015-11-07 06:16:41 +03:00

research

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

2015-11-18 19:55:06 -05:00

security levels

Removes in world

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

shuttle

Fixes shuttle docking ports being acted upon by the singulo

2015-11-01 12:03:50 -08:00

space transition

Shaves off 1568 iterations

2015-11-13 10:57:42 +03:00

surgery

Merge pull request #12924 from Firecage/Optable

2015-11-11 17:31:38 +01:00

telesci

Various mining additions, fixes and rebalances.

2015-11-18 19:14:28 -05:00

tooltip

Updates ToolTips system to V1.1, by Wirewraith

2015-10-22 21:40:16 +01:00