Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/pooling/pool.dm

2017-01-27 17:28:14 +01:00

..

devices

Merge pull request #6226 from Fox-McCloud/debug-this

2017-01-25 04:15:18 -08:00

mountable_frames

Fix light fixture frame progress bar

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

robot

Fully rips out cyborg sight modules

2017-01-10 00:32:11 -08:00

stacks

Tiger's comments

2017-01-22 19:15:26 +01:00

weapons

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

2017-01-27 17:28:14 +01:00

ashtray.dm

…

blueprints.dm

Add Colossus, add outdoors variable to areas and update fireball targeting

2016-10-25 04:10:52 +02:00

bodybag.dm

…

candle.dm

Merge conflicts begone

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

changestone.dm

…

contraband.dm

…

control_wand.dm

Better Destroys

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

crayons.dm

Graffiti prints are now hidden

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

dehy_carp.dm

…

documents.dm

…

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

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

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

2016-12-01 22:38:35 -05:00

trash.dm

Merge conflicts begone

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