Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

atmoalter

…

bots

Merge pull request #2612 from Mercenaryblue/master

2014-02-05 18:31:08 +00:00

camera

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

computer

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

doors

Merge pull request #2563 from Razharas/NewTables

2014-02-03 08:46:56 -08:00

embedded_controller

…

kitchen

Semi-final update

2014-01-15 03:46:41 +04:00

pipe

…

telecomms

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

ai_slipper.dm

…

airlock_control.dm

…

alarm.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

atmo_control.dm

A bunch of bug fixes

2014-01-11 18:37:31 +00:00

autolathe.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

Beacon.dm

…

buttons.dm

…

cell_charger.dm

…

cloning.dm

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

2014-02-06 22:05:39 +04:00

constructable_frame.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

cryo.dm

Teleporter fixes and pipes icons

2014-02-01 12:10:55 +04:00

deployable.dm

…

door_control.dm

…

doppler_array.dm

…

drying_rack.dm

Changes drying rack to use color var and removes "_dry" icons

2014-01-17 11:26:24 -05:00

flasher.dm

…

Freezer.dm

Teleporter fixes and pipes icons

2014-02-01 12:10:55 +04:00

hologram.dm

…

igniter.dm

…

lightswitch.dm

…

machinery.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

overview.dm

…

PDApainter.dm

…

portable_turret.dm

Removed some unneccesary whitespace.

2014-02-01 13:05:23 -07:00

recharger.dm

Increased the rate batons are recharged to 1500 a second, so it takes ten seconds to fully recharge the 15k cell inside.

2014-02-03 01:54:04 -05:00

rechargestation.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

recycler.dm

Added a stat check before say().

2014-01-06 20:27:59 +00:00

requests_console.dm

…

robot_fabricator.dm

…

shieldgen.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

Sleeper.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

spaceheater.dm

…

status_display.dm

…

suit_storage_unit.dm

…

syndicatebeacon.dm

…

syndicatebomb.dm

Training bombs are lame anyway

2014-02-02 23:41:49 +11:00

teleporter.dm

Teleporter fixes and pipes icons

2014-02-01 12:10:55 +04:00

transformer.dm

…

turrets.dm

…

vending.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

washing_machine.dm

…

wishgranter.dm

Standardizes and cleans up objective.dm

2014-01-23 16:33:47 -06:00