ZomgPonies ed8714550c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master ...

Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html

2013-09-05 13:29:34 -04:00

..

devices

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

robot

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

stacks

Expansion of every "icon = ''" path.

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

weapons

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01: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

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

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

…

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

Clown fixes: Access, Waterflower can be filled with anything

2013-08-20 18:37:47 -04:00

trash.dm

Expansion of every "icon = ''" path.

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