KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2016-03-01 19:18:29 -06:00

..

devices

Merge pull request #15707 from Core0verload/breathing_implant

2016-02-29 14:53:42 +11: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 #15837 from MMMiracles/Whetstone

2016-03-01 21:30:48 -03:00

apc_frame.dm

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

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

Adds large cardboard boxes to the game, constructable from five sheets of cardboard.

2015-09-10 19:29:19 -04:00

candle.dm

Fixes

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

control_wand.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand

2016-03-01 19:18:29 -06: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

So I must bury it.

2015-11-10 23:46:17 +00:00

documents.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

latexballoon.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

nuke_tools.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

shooting_range.dm

Adds extra HONK. Tweaks sprite.

2015-09-09 16:27:21 -04:00

toys.dm

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

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

trash.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00