Citinited c31b0fcadf Merge branch 'master' into bad-karma

2017-06-10 19:16:13 +01:00

..

admin

Merge pull request #7494 from FalseIncarnate/swords-yea-swords

2017-06-09 23:57:17 -04:00

alarm

…

arcade

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00

assembly

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

atmos_automation

…

awaymissions

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace

2017-04-14 18:15:12 +02:00

client

ViewMods - Allows custom view ranges.

2017-06-07 19:39:33 -07:00

clothing

Merge pull request #7506 from FlattestGuitar/nice-gloves-whered-you-get-these

2017-06-09 17:44:19 -04:00

countdown

…

crafting

Luxury Bluespace Capsule & More

2017-06-07 11:17:44 -07:00

customitems

Merge branch 'master' into midnight-fluffles

2017-05-29 15:37:40 +02:00

detective_work

Merge pull request #7506 from FlattestGuitar/nice-gloves-whered-you-get-these

2017-06-09 17:44:19 -04:00

economy

Merge branch 'master' into findnreplace

2017-03-15 16:02:14 +01:00

error_handler

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

events

Merge pull request #7130 from FalseIncarnate/bugfix

2017-04-26 00:10:26 -04:00

examine

…

ext_scripts

…

fancytitle

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

fish

just in case

2017-05-31 17:18:23 -04:00

flufftext

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

food_and_drinks

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

garbage_collection

Adds the garbage controller to the set of rebootable controllers

2017-05-13 17:04:45 -07:00

holiday

…

hydroponics

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00

karma

Add config option to completely disable karma

2017-04-21 17:06:43 -07:00

library

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00

lighting

…

logic

…

martial_arts

can_use_guns -> no_guns

2017-06-09 21:39:50 -04:00

mining

Luxury Bluespace Capsule & More

2017-06-07 11:17:44 -07:00

mob

Merge pull request #7162 from Allfd/catforever

2017-06-10 00:02:02 -04:00

modular_computers

More GC Define Transitions

2017-05-13 04:24:05 -04:00

nano

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

ninja

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

paperwork

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

pda

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

persistence

Adds extra documentation for json_to_object

2016-08-10 23:54:17 -07:00

power

Fix infinite glass exploit

2017-06-06 23:12:50 +01:00

procedural_mapping

Mass replace

2016-07-07 19:34:02 -07:00

projectiles

Fox request

2017-06-05 22:07:06 -07:00

reagents

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

recycling

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00

research

Merge pull request #7501 from Fox-McCloud/illegal-implants

2017-06-09 14:49:38 -07:00

ruins

…

scripting

Refactors tcomms stuff a little

2017-02-24 18:10:08 -08:00

security_levels

More GC and Performance Fixes (#7248)

2017-05-06 23:48:18 -07:00

shuttle

Merge branch 'master' into bad-karma

2017-06-10 19:16:13 +01:00

space_management

More GC Define Transitions

2017-05-13 04:24:05 -04:00

spacepods

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

station_goals

More GC Define Transitions

2017-05-13 04:24:05 -04:00

store

Nano-Mob Hunter GO! WIP commit 3: The committening

2016-09-06 04:15:44 -04:00

surgery

Cloning no longer stops the heart

2017-06-04 00:32:03 -07:00

telesci

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

tooltip

Mass replace

2016-07-07 19:34:02 -07:00

tram

…

vehicle

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

vr

Fixes capitalization of the VR module path

2017-04-21 13:50:28 -07:00