tigercat2000 93da786d0e Merge pull request #7584 from SamHPurp/slapping-electric-boogaloo ...

Applies a 2s cooldown to slapping

2017-06-23 19:16:44 -07:00

..

admin

Merge pull request #7551 from Kyep/ga_smitebless

2017-06-23 01:08:52 -04:00

alarm

…

arcade

Merges and fixes Conflicts

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

assembly

Adds movement intents

2017-06-10 10:12:14 +01: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 #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

countdown

…

crafting

Luxury Bluespace Capsule & More

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

customitems

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01: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

…

events

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

examine

…

ext_scripts

…

fancytitle

Merges and fixes Conflicts

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

fish

Updates Intents

2017-06-10 09:43:36 +01:00

flufftext

Merges and fixes Conflicts

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

food_and_drinks

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

garbage_collection

Adds the garbage controller to the set of rebootable controllers

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

holiday

…

hydroponics

Fixes 7564

2017-06-20 03:51:21 +01:00

karma

Add config option to completely disable karma

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

library

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

lighting

…

logic

…

martial_arts

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

mining

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

mob

Merge pull request #7584 from SamHPurp/slapping-electric-boogaloo

2017-06-23 19:16:44 -07:00

modular_computers

more unnecessary code, also QDEL_LIST_ASSOC_VAL is cool

2017-06-19 12:34:31 +01:00

nano

Merges and fixes Conflicts

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

ninja

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -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

…

power

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

procedural_mapping

…

projectiles

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

reagents

Updates Intents

2017-06-10 09:43:36 +01:00

recycling

Updates Intents

2017-06-10 09:43:36 +01:00

research

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

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

ruins

…

scripting

…

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

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

station_goals

More GC Define Transitions

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

store

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

surgery

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

telesci

RnD autolathe removal + tech level overhaul

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

tooltip

…

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