Remie Richards 9aaf4ffc40 Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES ...

Conflicts:
	icons/obj/hydroponics/equipment.dmi

2016-03-21 05:03:33 +00:00

..

admin

Merge pull request #16073 from KorPhaeron/humans

2016-03-16 17:48:29 +01:00

assembly

…

atmospherics

Merge pull request #16216 from phil235/CanisterBreakFix

2016-03-20 11:47:50 -05:00

awaymissions

Minor tweak and fixes to subsystem logic

2016-03-19 22:41:38 +00:00

cargo

Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.

2016-03-21 04:51:16 +00:00

client

…

clothing

Fixes chameleon jumpsuit not working.

2016-03-18 00:06:18 +01:00

crafting

Merge pull request #16078 from PKPenguin321/scoot-scoot-thats-the-sound-of-the-police

2016-03-15 05:11:47 +03:00

detectivework

…

emoji

makes emoji parsing return the text if they runtime

2016-03-16 21:28:36 -07:00

events

Refactors the bulk string framework

2016-03-19 22:37:32 +00:00

flufftext

Chaotic

2016-03-14 15:24:57 -05:00

food&drinks

Merge pull request #16197 from KorPhaeron/crates

2016-03-19 21:29:18 -05:00

games

…

holiday

…

holodeck

icon smooth ss

2016-03-12 23:57:45 +00:00

html_interface

…

hydroponics

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

2016-03-21 05:03:33 +00:00

jobs

Merge pull request #16082 from Core0verload/plants-revengeofGMO

2016-03-21 15:57:40 +11:00

library

…

lighting

…

mining

Merge pull request #16197 from KorPhaeron/crates

2016-03-19 21:29:18 -05:00

mob

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

2016-03-21 05:03:33 +00:00

ninja

…

paperwork

…

power

Merge pull request #16165 from ChangelingRain/cultlock

2016-03-19 21:58:12 -05:00

procedural mapping

Explosions and singulo use spiral range (and other changes)

2016-03-15 03:39:41 -07:00

projectiles

Xray lasers now have unique sprites and inhands

2016-03-17 23:21:52 -04:00

reagents

Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.

2016-03-21 04:51:16 +00:00

recycling

…

research

Merge pull request #15849 from Core0verload/jetpack

2016-03-17 00:59:23 +00:00

ruins

Fix

2016-03-16 17:36:23 -05:00

security levels

…

shuttle

Merge pull request #16067 from xxalpha/silky_smooth

2016-03-15 04:59:48 -05:00

space transition

…

spells

…

surgery

Merge pull request #15849 from Core0verload/jetpack

2016-03-17 00:59:23 +00:00

telesci

…

tgui

…

tooltip

blob tooltips now have a custom blob theme(it's actually pretty plain but it's better than using hud theme)

2016-03-14 18:32:52 -04:00

uplink

Space suits are much less likely to appear in the syndicate crate

2016-03-18 18:01:00 -04:00

vehicles

tweaks code slightly as per remie's request

2016-03-14 19:16:32 -07:00