GeneralChaos81 825670e29c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MechBay ...

commit.

2016-08-17 14:47:24 +10:00

..

admin

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

2016-08-17 14:47:24 +10: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

Removes Mutiny

2016-08-12 22:44:11 -04:00

clothing

Merge pull request #5382 from Ty-Omaha/Features

2016-08-14 22:28:56 -04:00

computer3

…

crafting

…

customitems

Goshdurn catbeets.

2016-08-09 20:22:15 +02: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

…

garbage_collection

…

holiday

…

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

…

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

Fixes talking swords being unable to their wielders, or anyone

2016-08-14 13:48:54 -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

…

persistence

Adds extra documentation for json_to_object

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

pooling

…

power

Merge pull request #5418 from Fox-McCloud/malf-ai-rework

2016-08-12 18:30:41 -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

Merge pull request #5398 from FlattestGuitar/attack-log

2016-08-12 20:50:09 -04:00

ruins

…

scripting

…

security_levels

…

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

Merge pull request #5391 from tristan1333/master

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

store

…

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

…