Tigercat2000 0a66ac4ba5 Merge remote-tracking branch 'upstream/master' into HolidayDatums ...

Conflicts:
	code/__DEFINES/misc.dm

2015-05-16 18:40:54 -07:00

..

admin

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

2015-05-16 18:40:54 -07:00

assembly

Infrared Beam Useability

2015-05-11 18:22:09 -04:00

atmos_automation

Better emitter admin logging & a couple minor tweaks

2015-05-15 18:23:17 +02:00

awaymissions

Update map system to -tg- standards

2015-05-11 11:09:18 -07:00

client

Adds two new event species

2015-05-14 22:30:38 -04:00

clothing

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

2015-05-16 05:38:40 -07:00

computer3

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

crafting

…

customitems

Fluff item restoration - Flasks, Lighters

2015-05-16 05:36:56 -07:00

destilery

…

DetectiveWork

…

economy

…

events

Fix: Event manager list index out of bounds

2015-05-12 18:33:24 -07:00

ext_scripts

…

flufftext

…

food

Fixes cooking machinery runtimes

2015-05-16 03:18:43 -04:00

games

…

genetics

…

genetics2

…

holiday

Change holidays into datums

2015-05-15 20:52:39 -07:00

hydroponics

Fixes luminosity checks

2015-05-15 01:07:08 -04:00

icon generation

…

jungle

Lighting overhaul.

2015-05-10 12:03:27 -07:00

karma

…

library

Added rules to upload computer, better logging, cleaned out DB of non-fluff books

2015-05-11 23:28:32 -04:00

lighting

Add ALL the sanity

2015-05-15 23:09:09 -04:00

liquid

…

media

Lighting overhaul.

2015-05-10 12:03:27 -07:00

mining

Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING

2015-05-16 07:52:33 -04:00

mob

Merge pull request #1054 from PJB3005/vg-masterrace

2015-05-16 21:26:54 -04:00

nano

/vg/ Multitool menu port!

2015-05-14 22:34:02 +02:00

ninja

…

organs

Fixes detached organ process() runtime

2015-05-16 06:23:48 -04:00

paperwork

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

2015-05-16 18:40:54 -07:00

power

Merge pull request #1054 from PJB3005/vg-masterrace

2015-05-16 21:26:54 -04:00

procedural mapping

Revert "Manual update"

2015-05-06 20:57:37 -04:00

projectiles

Merge pull request #1010 from tigercat2000/GAAB

2015-05-12 14:35:36 -04:00

reagents

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

2015-05-16 05:38:40 -07:00

recycling

Fix ventcrawling, Fix packages qdelling things

2015-05-13 11:37:11 -07:00

research

Merge pull request #1054 from PJB3005/vg-masterrace

2015-05-16 21:26:54 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

REFACTOR: Most consoles and machinery now use defines for light color

2015-05-16 13:29:29 -07:00

store

…

supermatter

Fixes reported issues.

2015-05-15 10:57:37 -04:00

surgery

Fixes and Tweaks

2015-05-15 21:58:24 -04:00

telesci

…

vehicle

Lighting overhaul.

2015-05-10 12:03:27 -07:00

virus2

Lighting overhaul.

2015-05-10 12:03:27 -07:00