phil235 4df2a92f88 Merge pull request #7824 from Delimusca/zipzaps ...

replaces broken turret gun

2015-02-23 23:38:10 +01:00

..

admin

Merge pull request #7544 from Incoming5643/popcapgames

2015-02-23 17:20:02 +01:00

assembly

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

awaymissions

…

client

* Converted solar control computers interfaces to NanoUI

2015-02-15 02:39:48 +01:00

clothing

Merge pull request #7684 from dannno/sechardsuitresprite

2015-02-23 16:02:51 -05:00

crafting

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

2015-02-11 16:13:04 +01:00

detectivework

…

emoji

…

events

Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2

2015-02-22 11:59:09 +01:00

flufftext

Adds a slurring filter, replaces stutter filter where appropriate

2015-02-10 16:39:17 -05:00

food&drinks

Merge pull request #7808 from phil235/CookingTweaks

2015-02-20 12:02:04 -06:00

holiday

…

hydroponics

Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix

2015-02-15 10:27:50 -06:00

library

Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo

2015-02-18 18:26:39 -08:00

mining

changelog and compile fix

2015-02-14 19:40:11 -08:00

mob

Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding

2015-02-24 01:22:01 +03:00

nano

…

paperwork

Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.

2015-02-22 12:14:14 -05:00

power

Revert "Allows portable machines to be mounted on any turf that can have cables."

2015-02-21 02:29:29 +03:00

projectiles

Merge pull request #7824 from Delimusca/zipzaps

2015-02-23 23:38:10 +01:00

reagents

Merge pull request #7874 from phil235/SlimecoreMobSpawnFix

2015-02-22 20:17:55 -08:00

recycling

…

research

Merge pull request #7721 from paprka/miening

2015-02-22 20:17:24 -08:00

scripting

…

security levels

Allow station self destruct with captains identity card

2015-02-15 12:09:09 +13:00

shuttle

…

surgery

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

2015-02-19 18:16:33 +00:00

telesci

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00