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

Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm

2016-06-04 17:41:43 +02:00

..

admin

Adds Asteroid emergency shuttle to station (#18125)

2016-06-02 15:48:08 -05:00

assembly

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

atmospherics

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

awaymissions

Ghost sword orbits on button click, added URL, POI

2016-05-28 12:23:24 +01:00

cargo

Adjusts RCD family export prices to be realistic (#18186)

2016-06-03 14:45:04 -05:00

chatter

…

client

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

clothing

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

2016-06-04 17:41:43 +02:00

countdown

Push

2016-06-02 18:28:46 +01:00

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

detectivework

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

2016-06-04 17:41:43 +02:00

emoji

…

events

Vines fix (#18134)

2016-06-02 14:07:16 -05:00

flufftext

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

food_and_drinks

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

games

…

holiday

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

2016-05-28 00:24:58 +01:00

holodeck

…

html_interface

…

hydroponics

Merge pull request #18154 from PKPenguin321/plant-analyzer-repath

2016-06-03 16:41:02 +10:00

jobs

repaths plant analyzers

2016-06-01 22:44:03 -07:00

library

Merge pull request #18005 from swankcookie/book_length

2016-05-29 17:05:33 +12:00

lighting

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mining

Adds all-seeing-eye to necropolis chests. (#18160)

2016-06-04 02:52:04 -05:00

mob

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

2016-06-04 17:41:43 +02:00

ninja

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

paperwork

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

2016-06-04 17:41:43 +02:00

power

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

procedural_mapping

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

projectiles

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

2016-06-04 17:41:43 +02:00

reagents

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

2016-06-04 17:41:43 +02:00

recycling

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

research

Fixes experimentor doing many reactions with one event (#18180)

2016-06-03 18:00:15 -05:00

ruins

Revert "Updates some lavaland ruins and adds new ones."

2016-06-01 16:47:16 -05:00

security_levels

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

shuttle

Shuttle manipulator: Added "Fast Travel" button

2016-06-01 15:58:18 +01:00

space_transition

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

spells

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

stock_market

…

surgery

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

2016-06-04 17:41:43 +02:00

telesci

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

tgui

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

2016-05-28 00:24:58 +01:00

tooltip

…

uplink

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

vehicles

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

zombie

Infectious zombies are now a full subspecies

2016-05-31 00:15:10 +01:00