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

Mass replace

2016-07-07 19:34:02 -07:00

blueprints.dm

Merge branch 'master' into lavaland_megafauna

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

bodybag.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

candle.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

changestone.dm

Mass replace

2016-07-07 19:34:02 -07:00

contraband.dm

random drugs

2016-05-05 22:50:46 -04:00

control_wand.dm

Better Destroys

2016-08-02 23:59:23 -04:00

crayons.dm

Various fixes

2017-02-10 18:55:23 +01:00

dehy_carp.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

documents.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

flag.dm

Fixes the flag sometimes not deleting right away.

2016-08-11 12:02:03 -07:00

latexballoon.dm

Better Destroys

2016-08-02 23:59:23 -04:00

misc.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

policetape.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

random_items.dm

Ports /tg/ Foam Force guns

2016-04-22 23:35:55 +02:00

shooting_range.dm

Mass replace

2016-07-07 19:34:02 -07:00

toys.dm

Refactors Reagent Tanks--Adds High Capacity Water Tank

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

trash.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00