Rob NelsonandZomgPonies db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA ...

Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm

2014-01-20 00:43:19 -05:00

..

__HELPERS

Maybe fix #288

2014-01-17 13:10:18 -05:00

_onclick

Moar Xeno bugfixes

2014-01-19 19:16:52 -05:00

ATMOSPHERICS

Fixes some sounds

2014-01-16 05:23:32 -05:00

controllers

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-09 20:56:38 -05:00

datums

NEW BOO SYSTEM!

2014-01-19 05:22:20 -05:00

defines

Updated all suicide_act()s to use a new span class, 'suicide'.

2014-01-19 21:25:47 -05:00

FEA

Adding Ice back to vanilla BS12 ZAS

2013-11-07 06:48:47 -05:00

game

SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA

2014-01-20 00:43:19 -05:00

js

…

modules

SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA

2014-01-20 00:43:19 -05:00

TriDimension

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unused

Major Ninja Patch

2014-01-09 20:39:29 -05:00

WorkInProgress

Powers fix right file

2014-01-19 21:14:06 -05:00

ZAS

Runtime fix

2014-01-16 17:14:57 +01:00

ZAS - vg

Going back to BS12 ZAS, permanently

2013-11-08 09:51:22 -05:00

global.dm

Ninja / CentComm changes

2014-01-18 00:34:24 -05:00

hub.dm

Config files, rules, etc

2013-08-20 23:22:58 +04:00

names.dm

Fixed the way Dionas get their names. Should help fluff.

2014-01-07 04:20:57 -05:00

setup.dm

Add ghost radio

2014-01-17 13:10:00 -05:00

stylesheet.dm

Updated all suicide_act()s to use a new span class, 'suicide'.

2014-01-19 21:25:47 -05:00

world.dm

Add ghost radio

2014-01-17 13:10:00 -05:00