mwerezak 09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/game/machinery/recharger.dm

2014-07-21 19:40:23 -04:00

..

admin

Merge resolution.

2014-07-21 16:34:38 +09:30

assembly

…

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

Trying to fix the loadout spawn issue, at least this will make it more informative.

2014-07-12 10:35:31 +09:30

clothing

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-07-21 16:30:01 +09:30

customitems

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-07-17 20:57:06 +09:30

destilery

…

detectivework

…

economy

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

events

Fixes lingering reference to organ_failure

2014-07-18 12:02:39 -04:00

ext_scripts

…

flufftext

blocks hallucination on clientless mobs

2014-07-19 23:00:42 +02:00

food

…

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.

2014-07-20 16:29:18 +09:30

mob

Merge resolution.

2014-07-21 16:34:38 +09:30

nano

Layout update for NanoUI.

2014-07-15 01:08:06 +01:00

organs

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-07-18 13:08:12 +00:00

paperwork

…

power

Merge remote-tracking branch 'upstream/dev' into power-net

2014-07-18 15:02:07 -04:00

projectiles

Tweaks shotgun beanbag rounds

2014-07-18 16:03:54 -04:00

reagents

Merge resolution.

2014-07-21 16:34:38 +09:30

recycling

Pipe rendering rewrite

2014-07-18 13:39:39 +00:00

research

Merge remote-tracking branch 'upstream/dev' into power-net

2014-07-18 15:02:07 -04:00

scripting

…

security levels

…

shuttles

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

supermatter

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

surgery

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-07-16 19:32:00 +09:30

vehicles

…

virus2

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2014-07-16 19:30:41 +09:30