Cheridan 6bfbbaa65b Merge pull request #7390 from Steelpoint/SecBorgDisabler ...

[BALANCE|NERF] Replace's Sec Borg's AdvTaser with a Disabler

2015-02-07 08:46:57 -06:00

..

admin

Merge pull request #7239 from paprka/ointmentandshit

2015-02-03 16:30:42 -06:00

assembly

Makes assembly parts work with wires

2015-01-17 18:08:55 +01:00

awaymissions

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

client

Adds chemical heater nanoUI & construction/upgrade

2015-01-14 22:41:53 -03:00

clothing

Merge pull request #7546 from TZK13/Purple-Shorts

2015-02-05 18:16:14 +01:00

crafting

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06:00

detectivework

some updates

2015-01-23 21:00:09 -08:00

emoji

…

events

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

flufftext

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

food&drinks

Note: Compile before you commit ffs

2015-02-07 00:31:12 -06:00

holiday

…

hydroponics

Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis.

2015-02-06 05:22:53 -06:00

library

Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.

2015-01-14 14:04:21 +01:00

mining

Merge pull request #7065 from phil235/GibtoniteLogFix

2015-01-25 00:29:18 -06:00

mob

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

2015-02-06 13:19:15 +08:00

nano

…

paperwork

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00

power

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

projectiles

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

2015-02-06 13:19:15 +08:00

reagents

Merge pull request #7568 from TheVekter/typofix

2015-02-06 21:55:09 -08:00

recycling

* Cleaned the disposals code a bit (making it uses the defines !)

2015-01-19 01:53:19 +01:00

research

MergeConflict

2015-02-06 13:21:23 +08:00

scripting

…

security levels

…

shuttle

Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration.

2015-01-19 18:48:52 +00:00

surgery

…

telesci

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00