AndrewJacksonThe2nd 480583da32 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port ...

Conflicts:
	code/modules/cargo/packs.dm

2016-03-04 23:41:48 -08:00

..

admin

SNPC verb hotfix

2016-03-02 22:05:23 +11:00

assembly

…

atmospherics

…

awaymissions

Merge pull request #15852 from KazeEspada/Cabin

2016-03-03 22:18:12 +01:00

cargo

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

2016-03-04 23:41:48 -08:00

client

…

clothing

Merge pull request #15895 from TehZombehz/firstfashion

2016-03-04 21:34:42 -03:00

crafting

adds bolas

2016-02-26 17:59:55 -08:00

detectivework

…

emoji

…

events

Plant Refactor: Seeds

2016-03-04 02:35:51 +03:00

flufftext

…

food&drinks

Plant Refactor: Seeds

2016-03-04 02:35:51 +03:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

quickfix

2016-03-04 05:20:33 +03:00

jobs

Cuffs and sec clean up

2016-02-23 21:46:59 +00:00

library

…

lighting

…

mining

Merge pull request #15908 from Core0verload/plantrefactor1

2016-03-04 01:02:50 -06:00

mob

Merge pull request #15904 from KorPhaeron/lmao2cat

2016-03-04 20:55:01 -06:00

ninja

…

paperwork

Merge pull request #15788 from Shadowlight213/Oldcultredo

2016-03-01 22:37:58 -06:00

power

* Cleaning field generator code

2016-02-27 22:44:17 +01:00

procedural mapping

Forgot a file.

2016-03-03 13:50:16 -07:00

projectiles

Defines

2016-03-02 00:23:50 +03:00

reagents

Merge pull request #15885 from phil235/ReagentMobUpdateFix2

2016-03-04 22:18:39 -03:00

recycling

Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes.

2016-03-04 17:24:36 +01:00

research

Adds breathing tube implant, changes how heart works, reworks arm-mounted implants

2016-02-25 12:50:45 +03:00

ruins

Plant Refactor: Seeds

2016-03-04 02:35:51 +03:00

security levels

…

shuttle

…

space transition

…

spells

Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message.

2016-02-29 16:30:54 +01:00

stock_market

Goon Port #1: Stock Market

2016-03-04 20:39:27 -08:00

surgery

Merge pull request #15816 from Core0verload/fcku

2016-03-01 21:48:28 -03:00

telesci

…

tgui

…

tooltip

…

uplink

Merge pull request #15793 from ChangelingRain/steelpunted

2016-02-28 13:23:54 -06:00

vehicles

Switches to overlay/temp

2016-02-25 13:11:08 +01:00