mwerezak 79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm

2014-07-24 16:04:41 -04:00

..

admin

added debugging verb support for gas_data

2014-07-22 22:54:12 +01:00

assembly

integrate XGM into the code

2014-07-22 19:52:12 +01:00

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

make gas mask filtering more generic

2014-07-22 20:31:20 +01:00

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

Tries to arrange the ion laws in a more readable way, changes a few laws to be more correct, adds new laws.

2014-07-22 16:16:47 +02:00

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-10 22:20:13 +01:00

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

make gas mask filtering more generic

2014-07-22 20:31:20 +01:00

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-24 16:04:41 -04:00

projectiles

Tweaks shotgun beanbag rounds

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

reagents

integrate XGM into the code

2014-07-22 19:52:12 +01:00

recycling

Pipe rendering rewrite

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

research

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

2014-07-24 16:04:41 -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 remote-tracking branch 'upstream/dev' into power-net

2014-07-24 16:04:41 -04:00

surgery

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

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

vehicles

Fixes in wheelchair and different handling of movement

2014-07-02 22:42:18 +02:00

virus2

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

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