HugoLuman e4a3f3a4b4 Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into disguise

2016-05-16 19:00:26 -07:00

..

admin

Merge pull request #4331 from KasparoVy/voxhair

2016-05-13 15:36:34 -04:00

alarm

…

arcade

…

assembly

…

atmos_automation

Replaces in-script json encoder/decoder with the native 510 procs

2016-04-30 19:15:07 -04:00

awaymissions

Fixes ignoreRest param, AStar

2016-05-08 23:47:51 -04:00

client

Merge branch 'temp2' into temp

2016-05-10 00:10:15 -04:00

clothing

Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into disguise

2016-05-16 19:00:26 -07:00

computer3

…

crafting

…

customitems

…

detective_work

…

economy

…

events

…

examine

Tesla Gun Implementation and Small R&D Change

2016-05-04 17:13:28 -04:00

ext_scripts

…

fish

…

flufftext

…

food

…

garbage_collection

…

holiday

…

hydroponics

Merge pull request #4356 from FalseIncarnate/botany

2016-05-06 23:28:11 -04:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

media

Replaces in-script json encoder/decoder with the native 510 procs

2016-04-30 19:15:07 -04:00

mining

Merge pull request #4380 from Fox-McCloud/simple-animal-damage

2016-05-09 21:23:50 -04:00

mob

Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into disguise

2016-05-16 19:00:26 -07:00

nano

Merge branch 'temp2' into temp

2016-05-10 00:10:15 -04:00

ninja

…

paperwork

…

pda

Unbroke the pda manifest

2016-05-05 20:36:32 -04:00

pooling

…

power

Merge pull request #4371 from tigercat2000/better_blueprints

2016-05-07 22:54:52 -04:00

procedural_mapping

…

projectiles

Refactors Species Gun Handling

2016-05-09 16:31:51 -04:00

reagents

Merge pull request #4423 from Fox-McCloud/foam

2016-05-16 20:15:39 -04:00

recycling

Ports holomap blueprints from tg/vg.

2016-05-05 22:05:39 -07:00

research

Merge pull request #4287 from Fox-McCloud/science-update-II

2016-05-08 13:02:04 -04:00

scripting

Merge pull request #4231 from monster860/concurrency

2016-05-13 15:34:15 -04:00

security_levels

…

shuttle

removes the fun part

2016-05-15 10:30:19 -04:00

space_transition

…

store

Adds a banner/flag for the Drask, like the other races have

2016-05-06 20:50:31 -07:00

surgery

Merge pull request #4423 from Fox-McCloud/foam

2016-05-16 20:15:39 -04:00

telesci

…

tooltip

…

tram

…

vehicle

…