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

Conflicts:
	code/game/machinery/rechargestation.dm

2015-02-09 16:15:00 +01:00

..

devices

Defib update, cell path update

2015-02-09 16:12:01 +01:00

robot

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

2015-02-09 16:15:00 +01: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-02-09 16:15:00 +01:00

apc_frame.dm

Switching cable coils to stacks

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

ashtray.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

blueprints.dm

Fix wall smoothing

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

bodybag.dm

Locker sounds update- Instead of an istype() check in closets.dm, it now

2015-02-07 22:43:28 +01:00

candle.dm

…

changestone.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

contraband.dm

Additional Drug Names

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

crayons.dm

…

documents.dm

Ports Antag Objectives from TG

2015-01-30 23:40:41 -05:00

flag.dm

Use station_name proc where possible, mapfix

2015-01-21 23:37:05 +01:00

latexballoon.dm

Fixes FEA temperature_expose() being used...

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

policetape.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

random_items.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

shooting_range.dm

Projectile Laser Update

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

toys.dm

MetaToys

2015-02-06 23:25:13 -05:00

trash.dm

Trash autoignition

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