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

..

devices

Canister, Tank & Tank Transfer Value NanoUIs.

2014-01-15 01:53:51 -05:00

robot

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05:00

stacks

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

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

weapons

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

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

apc_frame.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

blueprints.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

bodybag.dm

This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).

2013-06-29 16:49:48 -04:00

candle.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

contraband.dm

Added missing contraband.dm file

2013-01-03 08:20:08 +04:00

crayons.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

latexballoon.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

shooting_range.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

toys.dm

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

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

trash.dm

Expansion of every "icon = ''" path.

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