Hubblenaut 5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-02-16 16:16:30 +01:00

..

admin

Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm

2015-02-14 13:38:05 -05:00

assembly

…

awaymissions

…

client

Merge pull request #8135 from Baystation12/master

2015-02-15 22:03:43 +10:30

clothing

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-13 01:57:19 -05:00

customitems

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

detectivework

…

distillery

…

economy

…

events

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

2015-02-03 15:18:27 -08:00

ext_scripts

…

flufftext

…

food

Replaces uplink Donk-pockets with Sin-Pockets.

2015-02-11 09:55:50 +01:00

games

…

genetics

…

holodeck

Missing files added

2015-02-04 20:40:39 +08:00

hydroponics

Merge master into dev.

2015-02-12 23:01:08 +10:30

icon generation

…

library

…

liquid

…

maps

…

mining

Merge master into dev.

2015-02-12 23:01:08 +10:30

mob

Merge remote-tracking branch 'upstream/dev' into sprites

2015-02-16 16:16:30 +01:00

nano

pAI rework

2015-02-09 01:58:54 +00:00

organs

Makes non-edge damage sources less likely to delimb

2015-02-10 20:26:59 -05:00

overmap

…

paperwork

Containers now properly checks types instead of string paths.

2015-02-14 14:16:40 +01:00

power

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

projectiles

Tweaks bullet penetration

2015-02-16 03:04:48 -05:00

random_map

…

reagents

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

supermatter

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

surgery

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00