Chinsky f22749df04 Merge branch 'adminstuff' ...

Conflicts:
	code/modules/admin/admin_verbs.dm

2013-01-12 23:48:03 +04:00

..

__HELPERS

cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished)

2013-01-07 21:39:34 +10:00

ATMOSPHERICS

alright, 4-way manifolds, manual t-valves, pipe caps.

2013-01-05 21:39:39 -08:00

controllers

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

datums

Fixed eternal disfigurement (got quite spammy in fires)

2013-01-11 00:29:10 +04:00

defines

Added wearable toddler.

2013-01-10 14:23:45 +04:00

FEA

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +00:00

game

Merge branch 'secfashion'

2013-01-12 22:50:22 +04:00

js

…

modules

Merge branch 'adminstuff'

2013-01-12 23:48:03 +04:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

WorkInProgress

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-01-09 12:45:04 +04:00

ZAS

Fix for runtime in airflow for godmode mobs.

2013-01-11 04:55:31 +04:00

global.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

hub.dm

…

names.dm

…

setup_3d.dm

…

setup.dm

compile fixes and cleanup

2013-01-07 02:36:52 +10:00

stylesheet.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

world.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

ZAS_defines.dm

…