Markolie 7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction ...

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

2017-02-08 19:21:57 +01:00

..

devices

Tank Transfer Valve Cleanup and In-Hands

2017-02-06 12:19:57 -05:00

mountable_frames

Fix light fixture frame progress bar

2016-10-15 12:47:38 +02:00

robot

sprite and code fixes

2017-01-22 23:25:56 -05:00

stacks

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

2017-02-08 19:21:57 +01:00

weapons

Merge pull request #6357 from Fox-McCloud/var-edit-fixes

2017-02-07 20:01:32 -08:00

ashtray.dm

…

blueprints.dm

Merge branch 'master' into lavaland_megafauna

2017-02-02 20:17:31 +01:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

control_wand.dm

…

crayons.dm

Graffiti prints are now hidden

2017-01-12 20:24:17 +00:00

dehy_carp.dm

…

documents.dm

…

flag.dm

…

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

Refactors Reagent Tanks--Adds High Capacity Water Tank

2017-02-05 13:58:24 -05:00

trash.dm

…