TehZombehz 0f26065c64 HOPEFULLY removes conflicts ...

First attempt ev

2016-03-30 17:12:55 -05:00

..

admin

Revert "Adds mentorhelp"

2016-03-25 01:48:27 -03:00

assembly

…

atmospherics

fixes a LINDA bug

2016-03-23 09:41:01 -06:00

awaymissions

Ghost nullspace

2016-03-26 13:26:34 -05:00

cargo

Merge pull request #16417 from Xhuis/fix_bundle_2

2016-03-28 10:39:24 -05:00

client

Fix Preference toggles and button name.

2016-03-28 03:29:31 +02:00

clothing

Merge pull request #16472 from coiax/gieger-in-suit-storage

2016-03-30 02:28:47 -05:00

crafting

Adds craftable paper sacks

2016-03-27 23:37:43 -05:00

detectivework

…

emoji

makes emoji parsing return the text if they runtime

2016-03-16 21:28:36 -07:00

events

Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues

2016-03-26 21:06:00 -05:00

flufftext

Chaotic

2016-03-14 15:24:57 -05:00

food&drinks

HOPEFULLY removes conflicts

2016-03-30 17:12:55 -05:00

games

…

holiday

…

holodeck

icon smooth ss

2016-03-12 23:57:45 +00:00

html_interface

…

hydroponics

Bee fixes and updates!

2016-03-27 21:07:53 +01:00

jobs

Adds random ingredient food packages to chefs

2016-03-28 22:58:03 -05:00

library

…

lighting

…

mining

Merge pull request #16357 from Iamgoofball/fast

2016-03-29 20:06:55 -06:00

mob

Merge pull request #16468 from PKPenguin321/patch-16

2016-03-30 02:27:59 -05:00

ninja

…

paperwork

…

power

Merge pull request #16188 from Robustin/zap

2016-03-22 19:18:45 +01:00

procedural mapping

Explosions and singulo use spiral range (and other changes)

2016-03-15 03:39:41 -07:00

projectiles

Fixes animated statues being invisible

2016-03-29 19:56:33 -04:00

reagents

Bee fixes and updates!

2016-03-27 21:07:53 +01:00

recycling

Merge pull request #16357 from Iamgoofball/fast

2016-03-29 20:06:55 -06:00

research

removes evil fucking comma from experimentor.dm

2016-03-19 22:24:03 -07:00

ruins

FREE GOLEM

2016-03-25 22:25:18 -05:00

security levels

…

shuttle

Merge pull request #16067 from xxalpha/silky_smooth

2016-03-15 04:59:48 -05:00

space transition

…

spells

Merge pull request #16403 from optimumtact/wizared_mute_fix

2016-03-27 15:57:23 -05:00

stock_market

You must be 18 or older to play

2016-03-27 22:21:34 -04:00

surgery

Cleans up some text formatting

2016-03-27 14:13:16 -05:00

telesci

Fixes issues put forth by maintainers.

2016-03-19 01:09:32 -07:00

tgui

…

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

Merge pull request #16260 from Bawhoppen/grenadesholyshithelp

2016-03-22 19:35:43 +01:00

vehicles

Merge pull request #16375 from ChangelingRain/fastbike

2016-03-26 20:46:35 -05:00