jack-fractal 29bffb0c20 Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

2013-06-06 21:32:08 -04:00

..

devices

Merge branch 'master' into bleeding-edge-freeze

2013-06-06 21:32:08 -04:00

robot

UNadded robotic hands and feet because there was no point in doing this in the first place.

2013-05-31 22:32:39 -04:00

stacks

Renamed bruise pack back to gauze.

2013-05-22 14:05:53 +04:00

weapons

Map conflict, using BEF.

2013-06-06 10:40:22 +09:30

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

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

bodybag.dm

Added stasis bag.

2013-05-19 07:48:43 +02: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

…

latexballoon.dm

…

shooting_range.dm

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

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

tk_grab.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-06-04 13:47:26 +04:00

toys.dm

fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me.

2013-05-02 02:00:04 -07:00

trash.dm

…