mwerezak 6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary ...

Conflicts:
	code/game/objects/items/devices/uplinks.dm

2015-02-22 20:44:43 -05:00

..

admin

Icarus cannon admin logs.

2015-02-20 19:54:15 +01:00

assembly

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Merge pull request #8179 from comma/undies

2015-02-20 17:01:25 +10:30

clothing

Adds a mostly module-less merc rig type

2015-02-20 19:21:32 -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

examine

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05:00

ext_scripts

…

flufftext

…

food

Replaces uplink Donk-pockets with Sin-Pockets.

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

games

…

genetics

…

holodeck

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

hydroponics

Gear again

2015-02-18 15:35:37 -05:00

icon generation

…

library

…

liquid

…

maps

…

mining

Merge master into dev.

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

mob

Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor

2015-02-22 11:32:32 +03:00

nano

Allows exosuits to interface with adjacent airlock controllers and buttons.

2015-02-21 20:54:01 -05:00

organs

Master<dev

2015-02-21 19:57:31 +10:30

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

Containers now properly checks types instead of string paths.

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

power

Merge pull request #8175 from Kelenius/ofBorgsAndSynths

2015-02-21 11:43:39 +03:00

projectiles

Nerfs merc sniper rifle and makes it uplink purchasable

2015-02-22 20:27:06 -05:00

random_map

…

reagents

Merge pull request #8203 from Baystation12/master

2015-02-22 18:24:47 +10:30

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

Surgery now shows up on mob, in all gory glory.

2015-02-21 16:31:44 +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