Fox McCloud bc712f991e Merge pull request #5423 from LittleBigKid2000/shuttle-request-fix ...

Fixes centcom ferry requests being displayed to all admins and mentors

2016-08-12 18:24:54 -04:00

..

admin

Merge pull request #5403 from monster860/red-blue-fix-4real

2016-08-11 17:36:52 -04:00

alarm

…

arcade

Adds in Fast Processing

2016-08-09 06:55:00 -04:00

assembly

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

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 #5424 from Fox-McCloud/sunglasses-fix

2016-08-12 18:21:28 -04:00

computer3

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

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

crafting

tweakssss

2016-07-26 13:21:06 -04:00

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 pull request #5394 from Fox-McCloud/clientless-mobs

2016-08-10 18:21:29 -04: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

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

hydroponics

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

karma

Karma spending tweaks/refactoring

2016-08-09 15:24:09 -04:00

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

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

mining

Merge pull request #5393 from Fox-McCloud/fast-processing

2016-08-10 18:21:00 -04:00

mob

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -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

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

pda

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

persistence

Adds extra documentation for json_to_object

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

pooling

…

power

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

procedural_mapping

…

projectiles

Iiiiit's merge conflict time!

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

reagents

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

recycling

Adds in Fast Processing

2016-08-09 06:55:00 -04:00

research

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04: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

Oh man I am not good with code pls to halp

2016-08-11 17:56:48 -04:00

space_management

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

2016-08-10 15:25:25 -07:00

spacepods

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

store

Removes most hard-coded z level checks

2016-07-31 21:29:03 -07:00

surgery

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

telesci

Iiiiit's merge conflict time!

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

tooltip

…

tram

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

vehicle

…