mwerezak 9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton ...

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.

2014-07-31 14:31:21 -04: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 dev

2014-07-28 20:59:29 +09:30

clothing

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

2014-07-26 17:09:12 -07:00

customitems

Updated body_parts_covered

2014-07-26 17:06:08 -07:00

destilery

…

detectivework

Fixed issue with recognizing covered jumpsuit and gloves

2014-07-26 17:07:34 -07:00

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

…

games

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

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

genetics

…

hydroponics

More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues.

2014-07-29 13:24:52 +09:30

icon generation

…

library

…

liquid

…

maps

…

mining

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-27 03:20:16 +09:30

mob

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00

nano

NanoUI updates.

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

organs

fixes nullpointer caused by broken organ list

2014-07-26 11:54:32 +02:00

paperwork

Merge branch 'dev' into Pics

2014-07-29 16:45:55 +02:00

power

integrate XGM into the code

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

projectiles

Bevy of newhydro fixes.

2014-07-29 00:20:38 +09:30

reagents

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

2014-07-28 20:59:29 +09:30

recycling

Pipe rendering rewrite

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

research

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

2014-07-25 22:34:40 +09:30

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

More train fixes

2014-07-28 20:39:42 +12:00

virus2

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

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