TheDZD fea52d62b7 Merge pull request #5390 from Fox-McCloud/no-lag ...

Makes Resting Less Laggy

2016-08-10 18:09:31 -04:00

..

admin

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

client

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

clothing

Merge pull request #5268 from Crazylemon64/space_allocation

2016-08-10 17:07:36 -04:00

computer3

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

2016-08-03 13:31:42 -07:00

crafting

…

customitems

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

detective_work

…

economy

Atom Say Refactor

2016-08-06 06:45:20 -04:00

error_handler

…

events

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

Merge conflicts begone

2016-08-01 18:28:47 -07:00

garbage_collection

Makes sure early qdels still call Destroy

2016-08-02 01:56:02 -04:00

holiday

…

hydroponics

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

2016-08-03 13:31:42 -07:00

karma

…

library

Merge conflicts begone

2016-08-01 18:28:47 -07:00

lighting

…

logic

…

martial_arts

Various grammar/spelling fixes

2016-08-05 18:43:33 -04:00

media

…

mining

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

2016-08-10 11:02:05 -07:00

mob

Merge pull request #5390 from Fox-McCloud/no-lag

2016-08-10 18:09:31 -04:00

nano

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

ninja

…

paperwork

Merge conflicts begone

2016-08-01 18:28:47 -07:00

pda

…

persistence

Map writer is now legible in DM, saves 19x faster

2016-08-07 12:02:43 -07:00

pooling

…

power

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

procedural_mapping

…

projectiles

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

reagents

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

recycling

Merge conflicts begone

2016-08-01 18:28:47 -07:00

research

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

ruins

…

scripting

…

security_levels

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

2016-08-03 13:31:42 -07:00

shuttle

…

space_management

…

spacepods

…

store

…

surgery

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

telesci

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

tooltip

…

tram

…

vehicle

…