Fox McCloud 724683a8cd Merge pull request #5487 from lordpidey/slimebrain_fix ...

Slimebrains are now properly an internal organ.

2016-08-18 17:42:06 -04:00

..

admin

Merge pull request #5385 from GeneralChaos81/MechBay

2016-08-18 01:40:28 -04:00

alarm

…

arcade

Adds in Fast Processing

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

assembly

Objects can no longer trigger proximity sensors

2016-08-16 14:13:57 +01:00

atmos_automation

…

awaymissions

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

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

client

Merge pull request #5447 from Crazylemon64/serialization_eyes_fix

2016-08-17 20:10:24 -04:00

clothing

Merge pull request #5454 from Fox-McCloud/object-verbs

2016-08-17 17:42:24 -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

Typos, kids.

2016-08-16 10:57:00 +02:00

detective_work

Removes A Few Object Verbs

2016-08-14 21:37:24 -04:00

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

Process deferral and profiling improvements

2016-08-17 02:10:39 -04:00

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

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

mining

/tg/ mecha - Part 1

2016-08-12 06:14:00 -07:00

mob

Merge pull request #5487 from lordpidey/slimebrain_fix

2016-08-18 17:42:06 -04:00

nano

Removes eye color vars on the human, stores it on the eyes

2016-08-13 23:05:32 -07: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

Crutch Refactor

2016-08-17 21:45:55 -04: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 #5429 from tigercat2000/mecha

2016-08-17 17:30:00 -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

Adds Syndicate Infiltration Team (#4816)

2016-08-17 17:21:51 -04:00

space_management

Removes eye color vars on the human, stores it on the eyes

2016-08-13 23:05:32 -07:00

spacepods

Merge pull request #5391 from tristan1333/master

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

store

…

surgery

Naked fat people are fat.

2016-08-17 20:48:57 -07: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

…