Markolie 50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	maps/cyberiad.dmm

2014-12-18 17:13:18 +01:00

..

devices

Defib Unit

2014-12-15 04:55:02 -05:00

robot

Production and Mecha Tweaks

2014-12-03 18:20:51 -05:00

stacks

Bug fixes

2014-12-10 04:47:24 +01:00

weapons

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2014-12-18 17:13:18 +01:00

apc_frame.dm

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

blueprints.dm

Station Blueprints fix

2014-08-09 09:24:02 +02:00

bodybag.dm

Stasis Bag lock added

2014-06-18 16:20:31 +01: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

Additional Drug Names

2014-01-23 19:26:32 -05:00

crayons.dm

Pretty much all new click code

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

flag.dm

4th Nations commit, Finished framework. Rest of gameplay code is within the flag object's attackby and dropped procs.

2014-05-27 01:20:20 -04:00

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 02:03:42 -04:00

shooting_range.dm

Projectile Laser Update

2014-11-26 19:16:21 -05:00

toys.dm

AI, PDA, and Other changes

2014-11-26 01:18:49 -05:00

trash.dm

Trash autoignition

2014-07-20 10:59:44 -04:00