Jack Edge 78100f83ea Merge branch 'master' into turn-both-keys ...

Conflicts:
	tgui/assets/tgui.js

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

..

admin

Merge branch 'master' into turn-both-keys

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

assembly

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

atmospherics

Merge pull request #18637 from lzimann/patch-9

2016-06-18 11:36:20 +12:00

awaymissions

Adds ammo drops to CTF, fixes reload bug (#19125)

2016-07-06 07:53:30 -04:00

cargo

Fixes bug with Centcom shuttle loan

2016-07-03 21:40:55 +01:00

chatter

improve chatter regex to prevent infinite loop

2016-05-15 20:12:17 +12:00

client

Instant Runoff Voting! (#19153)

2016-07-06 16:03:43 +12:00

clothing

Making Space Great Again (implying it ever was): Part Uno (#19085)

2016-07-05 00:02:42 +12:00

countdown

Fully functional nuclear system

2016-07-05 21:38:08 +01:00

crafting

Crafting TGUI improvements (#19170)

2016-07-08 13:27:37 -04:00

detectivework

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

emoji

makes emoji parsing return the text if they runtime

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

events

"vines", "plants" faction gives immunity to kuzdu (#18540)

2016-07-08 12:48:29 +12:00

flufftext

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

food_and_drinks

AI APC hacking improvements (#19203)

2016-07-08 08:18:37 -04:00

games

Even more Cards Against Spess tweaks. (#17398)

2016-05-09 15:00:40 -05:00

holiday

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

holodeck

Snow holodeck is now cold, but air pressure

2016-06-16 19:25:51 +01:00

html_interface

…

hydroponics

Reverts accidental botany buff (#19175)

2016-07-06 16:43:59 -04:00

jobs

Making Space Great Again (implying it ever was): Part Uno (#19085)

2016-07-05 00:02:42 +12:00

library

Devil fixes (#18520)

2016-06-14 15:43:33 +12:00

lighting

Fixes random dark turfs

2016-07-02 19:41:26 -07:00

mining

Necropolis Beautification (#19134)

2016-07-05 20:15:19 -04:00

mob

AI APC hacking improvements (#19203)

2016-07-08 08:18:37 -04:00

ninja

Layers are now defines (#17949)

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

paperwork

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

power

AI APC hacking improvements (#19203)

2016-07-08 08:18:37 -04:00

procedural_mapping

Renames files under code/ with naughty characters

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

projectiles

Merge pull request #19095 from MrStonedOne/patch-225

2016-07-08 09:50:22 +12:00

reagents

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

recycling

Tiles are now (mostly) pooled objects (#19112)

2016-07-08 13:32:40 -04:00

research

Adds conveyor belts to autolathe (#19169)

2016-07-07 19:10:43 -04:00

ruins

Necropolis Beautification (#19134)

2016-07-05 20:15:19 -04:00

security_levels

Renames files under code/ with naughty characters

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

shuttle

Shuttle bombs now make transit space turfs (#19171)

2016-07-07 08:04:54 -04:00

space_transition

Debugging statement commented out

2016-06-20 13:57:39 +01:00

spells

Aimed Fireball Spells! (#19030)

2016-07-05 09:06:01 +12:00

stock_market

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

surgery

Removes shadowling (#18951)

2016-06-27 20:53:35 -04:00

telesci

Ore redemption machine streamlining. (#19062)

2016-07-04 13:57:27 +12:00

tgui

tgui modifications for custom browser id

2016-07-06 06:00:50 +02:00

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

Adds the Power Fist (#19013)

2016-07-02 14:40:22 +12:00

vehicles

conflicts + undo loc changes

2016-06-20 22:22:50 -07:00

zombie

Adds DROPDEL flag; items will qdel() on dropped()

2016-06-17 12:14:28 +01:00