uraniummeltdown 0c7ec9d330 Merge remote-tracking branch 'remotes/upstream/master' into statues ...

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

2017-02-27 14:27:24 +04:00

..

devices

Merge pull request #6515 from Crazylemon64/fast_servermonitor

2017-02-24 23:25:47 -05:00

mountable_frames

Fix light fixture frame progress bar

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

robot

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

stacks

adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand

2017-02-19 21:48:13 +04:00

weapons

Merge pull request #6468 from tigercat2000/job_refactor_tg

2017-02-25 17:54:01 -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

Various fixes

2017-02-10 18:55:23 +01: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

…