Joan Lung 86c72e845b Merge pull request #15741 from PKPenguin321/patch-18 ...

sharpening blocks hotfix

2016-02-25 20:08:45 -05:00

..

devices

Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA

2016-02-23 21:06:36 -08:00

robot

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +01:00

stacks

Splits beds and chairs

2016-02-18 17:55:38 +01:00

weapons

Merge pull request #15741 from PKPenguin321/patch-18

2016-02-25 20:08:45 -05:00

apc_frame.dm

…

blueprints.dm

Merge remote-tracking branch 'upstream/master' into blueprintsarea

2016-01-30 01:29:26 +00:00

body_egg.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

bodybag.dm

…

candle.dm

Fixes

2016-02-21 15:46:16 -08:00

crayons.dm

- I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)

2016-02-07 18:50:18 +01:00

dehy_carp.dm

…

documents.dm

…

latexballoon.dm

…

nuke_tools.dm

…

shooting_range.dm

…

toys.dm

Merge remote-tracking branch 'upstream/master' into urange

2016-02-17 14:21:29 +00:00

trash.dm

…