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

# Conflicts:
#	code/_globalvars/lists/objects.dm

2016-12-31 17:54:06 +01:00

..

devices

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

2016-12-23 19:04:35 +01:00

mountable_frames

Fix light fixture frame progress bar

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

robot

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

stacks

Merge pull request #5642 from Krausus/UniqueIDs

2016-09-12 15:32:20 -04:00

weapons

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

ashtray.dm

…

blueprints.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04: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

Ports over the status effect unification

2016-10-23 15:45:35 -07: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