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

Conflicts:
	maps/cyberiad.dmm

2015-01-10 06:24:55 +01:00

..

devices

Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port

2015-01-07 15:48:29 -05:00

robot

Production and Mecha Tweaks

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

stacks

Vox Heist port from Bay

2015-01-10 06:21:21 +01:00

weapons

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

2015-01-10 06:24:55 +01:00

apc_frame.dm

…

blueprints.dm

Fix wall smoothing

2015-01-08 19:44:56 +01:00

bodybag.dm

Stasis Bag lock added

2014-06-18 16:20:31 +01:00

candle.dm

…

contraband.dm

…

crayons.dm

…

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