Tigercat2000 12911463e7 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/objective.dm

2015-12-17 18:46:50 -08:00

..

admin

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-13 09:25:04 -08:00

alarm

…

arcade

Claw Game Fix 2

2015-12-12 01:22:39 -05:00

assembly

added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support

2015-12-13 04:36:41 -05:00

atmos_automation

…

awaymissions

Fixes mistakes with using /improper instead of \improper

2015-12-08 10:37:42 +01:00

client

Emergency patch, fixes asset_cache interfering with verbs

2015-12-13 21:09:48 -08:00

clothing

Merge pull request #2825 from Tastyfish/coughsplosion

2015-12-14 20:47:33 -05:00

computer3

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-09 10:08:28 -08:00

crafting

…

customitems

…

destilery

…

detective_work

…

economy

Made slot machine have reactive ui, use bank correctly

2015-12-10 17:35:32 -05:00

events

Shuttles: Research + Mining fixes

2015-12-15 18:19:34 -08:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food

…

games

…

garbage_collection

…

holiday

…

hydroponics

Death Nettle Fix

2015-12-09 18:53:24 -05:00

jungle

…

karma

…

library

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

lighting

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

liquid

…

media

…

mining

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-13 09:25:04 -08:00

mob

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-17 07:26:41 -08:00

nano

/vg/ / -tg- asset_cache

2015-12-12 21:25:04 -08:00

ninja

/vg/ / -tg- asset_cache

2015-12-12 21:25:04 -08:00

organs

Merge pull request #2742 from ZomgPonies/blood

2015-12-07 01:03:06 -05:00

paperwork

Merge pull request #2825 from Tastyfish/coughsplosion

2015-12-14 20:47:33 -05:00

pooling

…

power

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-03 11:03:01 -08:00

procedural_mapping

…

projectiles

balance

2015-12-17 18:24:03 -05:00

reagents

Merge pull request #2825 from Tastyfish/coughsplosion

2015-12-14 20:47:33 -05:00

recycling

…

research

TG Mining Update

2015-12-10 21:35:02 -05:00

scripting

…

security_levels

…

shieldgen

…

shuttle

Last fixes

2015-12-17 18:38:13 -08:00

space_transition

…

store

…

surgery

Intensive care can now rescue dethrall malpractice

2015-12-06 00:21:33 -08:00

telesci

TG Mining Update

2015-12-10 21:35:02 -05:00

tram

…

vehicle

…

virus2

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00