AndrewJacksonThe2nd 082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos ...

Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm

2016-09-02 15:51:26 -07:00

..

admin

Admin messages for prayers show the round's deity. (#20162)

2016-08-31 09:07:33 +12:00

assembly

Flash Buff (#19370)

2016-07-22 10:16:13 +12:00

atmospherics

Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION

2016-09-02 15:04:51 -07:00

awaymissions

[s] Adds the top secret room to centcom (#20071)

2016-08-26 08:46:52 +12:00

cargo

Since infinite traitor items is okay, I improved it (#20108)

2016-08-31 16:58:05 +12:00

chatter

improve chatter regex to prevent infinite loop

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

client

Better Admin name for the notes.

2016-08-23 21:26:35 -07:00

clothing

Merge pull request #20082 from Xhuis/highlander_patch

2016-08-29 11:27:58 +12:00

countdown

Clockcult fixes and tweaks (#19795)

2016-08-12 09:06:21 +12:00

crafting

Fixed fortune cookies not dropping their fortune.

2016-08-29 14:52:58 -07:00

detectivework

Revert "Fixes issues with packagewrap, trashbag, handlabeler, "

2016-09-01 12:18:24 -04:00

emoji

…

events

Quality of life pull for my recent commits (#20210)

2016-08-31 09:23:54 +12:00

flufftext

Code cleanup; silicons, melee, hallucinations

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

food_and_drinks

Fixes pizza bombs and boxes not deleting correctly. (#20254)

2016-09-01 15:47:52 -05:00

games

moves and fixes corrupt dmi (#19767)

2016-08-09 07:06:13 -05:00

holiday

Fixes food crafting lag. (#19325)

2016-07-16 00:31:59 -04:00

holodeck

Fixes holodeck animals bleeding.

2016-07-08 19:28:21 +02:00

html_interface

…

hydroponics

Merge pull request #20214 from Cruix/telekinetic_gaia_removal

2016-09-01 10:12:08 +12:00

jobs

Modular PCs rewrite (#20003)

2016-08-25 10:28:33 +12:00

library

Devil fixes (#18520)

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

lighting

Make lighting object management robust. (#19365)

2016-07-19 14:53:42 +12:00

mining

chestproofing

2016-08-29 19:12:57 -07:00

mob

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

2016-09-02 15:51:26 -07:00

modular_computers

Modular computer fixes and improvements 2 (#20170)

2016-08-30 10:43:53 +02:00

ninja

Added technology and design disks that can hold more than one entry.

2016-08-24 18:30:07 -07:00

paperwork

Revert "Fixes issues with packagewrap, trashbag, handlabeler, "

2016-09-01 12:18:24 -04:00

power

blacklists lattices from the tesla

2016-08-29 21:11:03 -07:00

procedural_mapping

Adds cult,clockworck and massdelete generators to buildmode

2016-08-04 21:02:40 +02:00

projectiles

Sniper rounds now blow off limbs (#20209)

2016-08-30 08:12:08 -05:00

reagents

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

2016-09-02 15:42:17 -07:00

recycling

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

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

research

fixes

2016-09-02 15:37:14 -07:00

ruins

Merge pull request #20091 from Cruix/bigger_disks

2016-08-29 09:47:13 +02:00

security_levels

Adds dextrous guardian (#19254)

2016-07-13 11:25:00 +12:00

shuttle

Merge pull request #19507 from ChangelingRain/itsimaginablebutitdoesntexistanywherenotanyplanetwereadreamwerebecomingpeoplenootherpeoplehaveeverbeenahumanthathumansarenot

2016-07-28 19:46:26 +12:00

space_transition

Debugging statement commented out

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

spells

New Wizard Armour

2016-08-25 17:32:16 -05:00

stock_market

Update stocks.dm

2016-08-25 21:50:04 -07:00

surgery

Merge pull request #20161 from KorPhaeron/surgery

2016-08-30 10:55:53 +02:00

telesci

Aux Mining Base Tweaks (#20015)

2016-08-23 17:25:01 +12:00

tgui

Adds dextrous guardian (#19254)

2016-07-13 11:25:00 +12:00

tooltip

Clockcult fixes and tweaks (#19795)

2016-08-12 09:06:21 +12:00

uplink

Reworks the uplink interface to drastically reduce loading lag. (#19841)

2016-08-13 22:34:16 +02:00

vehicles

Added some has_buckled_mobs() checks.

2016-08-02 23:39:29 -07:00

VR

allows vr sleepers to specify an outfit datum for the virtual human, defaulting to a coloured jumpsuit+shoes.

2016-07-17 14:58:05 +01:00

zombie

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

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