Giacomand e67e691b27 Merge branch 'blobrevamp' of https://github.com/Giacomand/vgstation13 into Bleeding-Edge ...

Conflicts:
	html/changelog.html

2013-08-25 02:55:15 +01:00

..

devices

Adding new traitor item, camera bugs and a handheld tv. Screw open a camera and place bug inside for later viewing. Removal: screw open camera and crowbar that fucker out.

2013-07-04 13:07:03 -05:00

robot

Merged from ririchiyo/vgstation13

2013-08-08 20:26:23 -05:00

stacks

Fix some things.

2013-08-21 22:41:42 -07:00

weapons

Merge branch 'blobrevamp' of https://github.com/Giacomand/vgstation13 into Bleeding-Edge

2013-08-25 02:55:15 +01:00

apc_frame.dm

Recycling Added, and fixed some admin things.

2013-08-21 21:26:01 -07: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

…

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

…