SnipeDragon 2f858d7426 Merge branch 'master' of github.com:SnipeDragon/tgstation

2016-06-22 04:45:59 -05:00

..

admin

Merge pull request #18714 from coiax/fridge-magnet

2016-06-21 08:46:17 -04:00

assembly

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

atmospherics

Merge pull request #18637 from lzimann/patch-9

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

awaymissions

stop the pills (#18703)

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

cargo

Merge pull request #18741 from KorPhaeron/tacticalespionageaction

2016-06-22 12:08:05 +12:00

chatter

improve chatter regex to prevent infinite loop

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

client

Merge pull request #17069 from MrStonedOne/XKeyscore

2016-06-19 01:17:59 +12:00

clothing

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

countdown

stop the pills (#18703)

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

crafting

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

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

detectivework

Added priority overlay system. (#18225)

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

emoji

…

events

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

flufftext

stop the pills (#18703)

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

food_and_drinks

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

games

…

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

stop the pills (#18703)

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

jobs

Adds explorer gas mask for lavaland miners

2016-06-11 10:38:53 +03:00

library

Devil fixes (#18520)

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

lighting

StonedMC, the bastard love child of GoonPS and CarnMC (#17987)

2016-06-16 18:01:16 +12:00

mining

Merge pull request #18794 from KorPhaeron/durkel

2016-06-21 23:13:49 -05:00

mob

Consistency fix for Issue #18786

2016-06-22 04:43:05 -05:00

ninja

Layers are now defines (#17949)

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

paperwork

Added priority overlay system. (#18225)

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

power

stop the pills (#18703)

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

procedural_mapping

Renames files under code/ with naughty characters

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

projectiles

Make Staff of Honkmother slightly less OP (#18802)

2016-06-22 03:23:05 -05:00

reagents

Merge pull request #18785 from Incoming5643/patch-12

2016-06-22 12:32:23 +12:00

recycling

Added priority overlay system. (#18225)

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

research

stop the pills (#18703)

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

ruins

Merge pull request #18767 from ChangelingRain/legiondoor

2016-06-22 09:51:06 +12:00

security_levels

Renames files under code/ with naughty characters

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

shuttle

Merge pull request #18726 from coiax/spawn-removal-1

2016-06-21 09:56:38 +12:00

space_transition

Renames files under code/ with naughty characters

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

spells

Code review

2016-06-19 10:15:26 +01:00

stock_market

stop the pills (#18703)

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

surgery

stop the pills (#18703)

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

telesci

stop the pills (#18703)

2016-06-20 12:07:44 +02: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

Nuke ops can no longer get free noslips with their camo kit

2016-06-19 11:41:42 -04: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