Nerd Lord 6bd6b7ccf5 Conflixed

2015-12-02 20:30:38 -05:00

..

admin

Fixes jobban_isbanned() runtime

2015-11-29 17:31:19 -03:00

assembly

…

awaymissions

Merge pull request #13311 from KorPhaeron/wild_west

2015-11-30 07:12:05 -06:00

client

quant --> quaint

2015-11-29 08:00:33 -08:00

clothing

fix

2015-12-01 21:52:35 -06:00

crafting

Merged upstream

2015-11-28 15:49:41 -08:00

detectivework

…

emoji

…

events

Merge pull request #13236 from MrStonedOne/patch-71

2015-11-29 12:04:21 +03:00

flufftext

…

food&drinks

Merge pull request #13335 from Incoming5643/fudge_dice

2015-12-02 16:40:25 -06:00

games

…

holiday

…

holodeck

Changes flag name from ABSTRACT to NODECONSTRUCT

2015-11-30 20:26:03 -05:00

html_interface

Asset cache Fixes

2015-11-29 07:19:49 -08:00

hydroponics

…

json

Optimizes json writer, attempt 2

2015-12-02 03:50:04 -08:00

library

Fixes library computer's next page not working.

2015-11-30 18:40:42 -08:00

lighting

…

mining

Updates mine turfs to be slightly more modular

2015-11-28 18:49:40 -06:00

mob

Conflixed

2015-12-02 20:30:38 -05:00

nano

Merge pull request #13348 from neersighted/spooky_nanoui

2015-12-02 14:15:33 +00:00

ninja

…

paperwork

Merge pull request #13149 from Firecage/toolspeed

2015-11-29 21:06:15 +11:00

power

Merge pull request #13296 from neersighted/nanoui_checks

2015-11-29 18:36:18 -06:00

procedural mapping

Academy Update

2015-11-28 12:35:41 +01:00

projectiles

Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device

2015-11-30 18:18:22 +03:00

reagents

Remove an unused var from Chemistry-Machinery

2015-12-01 17:09:03 -06:00

recycling

…

research

Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX

2015-11-27 20:58:03 +00:00

security levels

…

shuttle

Makes shuttle turf copy use proper helper.

2015-11-25 21:19:36 +01:00

space transition

…

surgery

…

telesci

…

tooltip

…