paprka 717b857401 Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls ...

Conflicts:
	code/datums/beam.dm
	icons/mob/animal.dmi
	tgstation.dme

2015-12-03 23:20:12 -08:00

..

admin

Merge pull request #13365 from tkdrg/badminthings

2015-12-03 01:39:51 -03:00

assembly

…

awaymissions

Merge pull request #13311 from KorPhaeron/wild_west

2015-11-30 07:12:05 -06:00

client

quant --> quaint

2015-11-29 08:00:33 -08:00

clothing

fix

2015-12-01 21:52:35 -06:00

crafting

Merged upstream

2015-11-28 15:49:41 -08:00

detectivework

…

emoji

…

events

Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls

2015-12-03 23:20:12 -08:00

flufftext

…

food&drinks

Merge pull request #13335 from Incoming5643/fudge_dice

2015-12-02 16:40:25 -06:00

games

…

holiday

…

holodeck

Changes flag name from ABSTRACT to NODECONSTRUCT

2015-11-30 20:26:03 -05:00

html_interface

Asset cache Fixes

2015-11-29 07:19:49 -08:00

hydroponics

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

json

Hotfix for Cryo (JSON problems) and render issues (Internet Explorer)

2015-12-02 19:48:16 -05:00

library

Fixes library computer's next page not working.

2015-11-30 18:40:42 -08:00

lighting

Tweaks lighting some more.

2015-12-02 07:12:37 -08:00

mining

Fixes the pre-mapped cave pieces to spawn the right tiles

2015-12-03 16:07:00 -06:00

mob

Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls

2015-12-03 23:20:12 -08:00

nano

Fix AI NanoUI checks

2015-12-03 15:53:27 -06:00

ninja

Adds subtypesof(). It's shorthand for typesof(path) - path.

2015-11-16 18:55:57 -05:00

paperwork

Merge pull request #13149 from Firecage/toolspeed

2015-11-29 21:06:15 +11:00

power

Merge pull request #13296 from neersighted/nanoui_checks

2015-11-29 18:36:18 -06:00

procedural mapping

Academy Update

2015-11-28 12:35:41 +01:00

projectiles

Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device

2015-11-30 18:18:22 +03:00

reagents

Auto-populate dispenser buttons, fix a couple warts

2015-12-03 15:01:22 -06:00

recycling

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

research

Upgrades the space heater!

2015-11-30 04:11:10 -05:00

security levels

…

shuttle

Makes shuttle turf copy use proper helper.

2015-11-25 21:19:36 +01:00

space transition

Shaves off 1568 iterations

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

surgery

adds chainsaws to ghetto sawing tools

2015-11-23 22:33:13 -08:00

telesci

Various mining additions, fixes and rebalances.

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

tooltip

…