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

Conflicts:
	code/game/objects/structures/window.dm

2014-12-13 02:15:05 +01:00

..

devices

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

2014-12-13 02:15:05 +01: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

Telescience port from /tg/

2014-12-11 17:10:40 +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

…

contraband.dm

Additional Drug Names

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

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