Crazy Lemon f7fc505689 Merge pull request #7821 from Fox-McCloud/blood-volume ...

Limits BLood Volume to 560

2017-07-17 22:30:05 -07:00

..

admin

Removes Disease one and Virology

2017-07-08 23:10:17 -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

…

client

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

clothing

Merge pull request #7801 from imsxz/syndie-soft-suit-description

2017-07-15 06:06:01 -07:00

countdown

Refactors Syndicate Bombs

2017-06-29 18:10:58 -04:00

crafting

chemical bombs

2017-06-29 20:02:27 -04:00

customitems

Merge pull request #7728 from Xantholne/HoodieFluff

2017-07-10 13:28:42 -07:00

detective_work

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

economy

…

error_handler

…

events

virus immunity trait not var

2017-07-13 19:47:23 -04: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 #7724 from shazbot194/Honk

2017-07-12 23:26:51 -04:00

garbage_collection

Adds the garbage controller to the set of rebootable controllers

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

holiday

…

hydroponics

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00

karma

…

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

Merge pull request #7724 from shazbot194/Honk

2017-07-12 23:26:51 -04:00

mob

Merge pull request #7821 from Fox-McCloud/blood-volume

2017-07-17 22:30:05 -07:00

modular_computers

Merge pull request #6516 from fludd12/Grey-Rework

2017-06-30 08:29:31 -07:00

nano

Refactors TK to work a bit more consistently

2017-06-22 23:24:37 -07:00

ninja

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

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

paperwork

Merge pull request #7567 from SamHPurp/re-factors-posters

2017-07-10 18:48:21 -04:00

pda

RnD autolathe removal + tech level overhaul

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

persistence

…

power

Fixes easy cable laying

2017-07-16 16:44:46 -07:00

procedural_mapping

…

projectiles

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

reagents

Limits BLood Volume to 560

2017-07-18 00:10:43 -04:00

recycling

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

research

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

ruins

…

scripting

…

security_levels

…

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

Instruments Refactor and Electric Guitars

2017-07-02 03:52:42 -04:00

surgery

Limits BLood Volume to 560

2017-07-18 00:10:43 -04: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

…