Lzimann 7bf4aea58b Merge branch 'master' of https://github.com/tgstation/-tg-station into datumemotes

2016-12-25 13:22:56 -02:00

..

admin

Map Conflict Fixing Helper (#22421)

2016-12-25 16:25:54 +13:00

assembly

Fixes a rogue unreturning Destroy (#22362)

2016-12-22 13:16:11 +01:00

atmospherics

Fixes a hotspot Destroy runtime (#22383)

2016-12-23 13:30:50 +01:00

awaymissions

MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)

2016-12-25 16:18:55 +13:00

cargo

Adjust cargo crate prices (#22318)

2016-12-20 21:57:51 -06:00

chatter

…

client

[READY]Parallax (#22315)

2016-12-20 21:55:10 -06:00

clothing

SHENZI DID YOU FORGOT THE DET COATS? (#22412)

2016-12-24 19:00:13 -05:00

crafting

Fixes ED-209 Crafting Recipe Cost

2016-12-13 09:11:31 -05:00

detectivework

a_intent now uses defines

2016-12-02 22:27:30 -08:00

emoji

…

events

Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237)

2016-12-17 14:22:46 -05:00

flufftext

These comments where removed by me.exe, just now

2016-12-08 01:48:46 -08:00

food_and_drinks

Adds eggnog (#22238)

2016-12-17 14:19:23 -05:00

games

Speeds up world init. (93s -> 49s) (#21992)

2016-12-08 21:50:15 +13:00

holiday

…

holodeck

Easy fixes/tweaks. (#22348)

2016-12-25 16:57:34 +13:00

html_interface

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

hydroponics

Update seeds.dm (#22407)

2016-12-24 18:57:40 +13:00

jobs

[READY]PAI PATCH 2 (#22214)

2016-12-19 15:33:34 +13:00

library

Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood

2016-12-23 16:14:21 +00:00

lighting

Fixes a bug I introduced into starlight (#22316)

2016-12-20 11:14:59 +13:00

mining

Adds a sprite for a survival pod fridge with the panel open (#22375)

2016-12-23 09:38:46 +13:00

mob

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

2016-12-25 13:22:56 -02:00

modular_computers

Adds arrival shuttle to radstorm protected areas

2016-12-23 18:50:10 -08:00

ninja

…

orbit

[READY]Parallax (#22315)

2016-12-20 21:55:10 -06:00

paperwork

Pens can now be placed on top of paper bins :shock: 🚀 (#22195)

2016-12-18 19:49:03 +13:00

power

MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)

2016-12-25 16:18:55 +13:00

procedural_mapping

…

projectiles

Merge pull request #22377 from Cyberboss/patch-14

2016-12-23 09:39:04 +13:00

reagents

Refactors mineral golem code (#22354)

2016-12-23 09:35:26 +13:00

recycling

Abductor tools and tool sound refactor. (#22125)

2016-12-14 18:09:41 +13:00

research

Replaces black magic spawn with addtimers (#22291)

2016-12-19 12:00:08 +01:00

ruins

Refactors mineral golem code (#22354)

2016-12-23 09:35:26 +13:00

security_levels

The time left on a shuttle call/recall modifies with security level. (#21906)

2016-12-04 18:47:17 +01:00

shuttle

[READY]Parallax (#22315)

2016-12-20 21:55:10 -06:00

space_transition

…

spells

Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237)

2016-12-17 14:22:46 -05:00

station_goals

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00

stock_market

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

surgery

Fixes things

2016-12-19 00:44:27 +01:00

telesci

Abductor tools and tool sound refactor. (#22125)

2016-12-14 18:09:41 +13:00

tgui

…

tooltip

…

uplink

The fake disk will almost never appear in surplus crates

2016-12-12 13:03:36 -05:00

vehicles

Abductor tools and tool sound refactor. (#22125)

2016-12-14 18:09:41 +13:00

VR

…

zombie

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00