Chinsky b5dda2b793 Merge pull request #8180 from mwerezak/mercenary ...

Map updates and fixes, plus hardsuit icons

2015-02-23 15:27:35 +03:00

..

admin

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

2015-02-22 21:13:20 -05: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 remote-tracking branch 'upstream/dev' into runtime

2015-02-22 21:13:20 -05:00

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

distillery

…

economy

Merge resolution.

2015-01-12 07:17:02 +10:30

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

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

2015-02-22 21:13:20 -05:00

icon generation

…

library

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

…

mining

Merge master into dev.

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

mob

Merge pull request #8200 from mwerezak/devfixes

2015-02-23 10:15:42 +01:00

nano

Allows exosuits to interface with adjacent airlock controllers and buttons.

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

organs

Makes IB no longer contribute to overall damage

2015-02-21 16:56:25 -05:00

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

Merge pull request #8180 from mwerezak/mercenary

2015-02-23 15:27:35 +03:00

random_map

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

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