tkdrg f00e9588fd Merge pull request #14992 from KorPhaeron/flashlights ...

Adds laserguns with rechargeable, swappable magazines

2016-02-06 16:36:03 -03:00

..

admin

Stub regex.Replace, re-implement SQL note conversion

2016-02-04 17:19:46 -06:00

assembly

Merge conflict fix

2016-01-27 17:38:42 +02:00

atmospherics

comment style is important

2016-02-06 12:15:21 -06:00

awaymissions

Get the code running on 510

2016-02-04 17:19:40 -06:00

cargo

Fix shuttles not correctly buying/selling

2016-02-06 02:01:38 -06:00

client

Merge pull request #15121 from neersighted/hotkeys

2016-02-05 14:52:34 -03:00

clothing

Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF

2016-01-31 22:00:43 -03:00

crafting

Some assembly requaired

2016-01-26 02:43:08 +03:00

detectivework

Get the code running on 510

2016-02-04 17:19:40 -06:00

emoji

Fixes emoji issues to do with adminPM and OOC formatting

2016-01-31 12:57:43 -05:00

events

colon never actually got in

2016-02-01 07:30:43 -05:00

flufftext

Get the code running on 510

2016-02-04 17:19:40 -06:00

food&drinks

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

games

…

holiday

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

holodeck

Fix bad checks in holodeck

2016-02-04 16:29:23 -06:00

html_interface

…

hydroponics

Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot

2016-02-02 19:04:20 -06:00

jobs

Merge pull request #15191 from KorPhaeron/chaplain

2016-02-05 14:54:15 -03:00

library

…

lighting

…

mining

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

mob

Merge pull request #15217 from neersighted/flashy

2016-02-06 14:21:14 -03:00

ninja

Get the code running on 510

2016-02-04 17:19:40 -06:00

paperwork

Merge pull request #14698 from Firecage/absolutepathsandifs

2016-01-29 03:15:12 +03:00

power

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

procedural mapping

Get the code running on 510

2016-02-04 17:19:40 -06:00

projectiles

Merge pull request #14992 from KorPhaeron/flashlights

2016-02-06 16:36:03 -03:00

reagents

Merge pull request #15219 from neersighted/reagents_aaaaaaa

2016-02-06 16:15:50 -03:00

recycling

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

research

tgui cargo console

2016-02-05 17:06:07 -06:00

ruins

…

security levels

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

shuttle

Fix shuttles not correctly buying/selling

2016-02-06 02:01:38 -06:00

space transition

…

spells

Re-implement screen overlays

2016-02-04 17:19:44 -06:00

surgery

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

telesci

…

tgui

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

tooltip

…

uplink

Merge pull request #15216 from KorPhaeron/fixes_bulldogs

2016-02-06 14:19:35 -03:00

vehicles

…