Mloc-Hibernia a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm

2014-07-26 14:25:24 +00:00

..

admin

Merge remote-tracking branch 'upstream/pr/5689' into dev

2014-07-26 14:25:24 +00: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

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

2014-07-25 19:37:10 -07:00

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

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

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

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

2014-07-26 15:39:25 +09:30

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

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

2014-07-25 17:19:59 -07:00

paperwork

Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping

2014-07-21 12:08:51 +02:00

power

integrate XGM into the code

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

projectiles

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

2014-07-26 15:39:25 +09:30

reagents

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

recycling

Pipe rendering rewrite

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

research

integrate XGM into the code

2014-07-22 19:52:12 +01: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

integrate XGM into the code

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

surgery

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

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

vehicles

Cargo train fixes

2014-07-24 20:14:58 +12:00

virus2

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

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