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

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

..

admin

Iiiiit's merge conflict time!

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

alarm

…

arcade

…

assembly

Action Button Update

2016-07-18 13:23:01 -07:00

atmos_automation

…

awaymissions

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -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 branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation

2016-08-10 11:02:05 -07: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

Improves caught exception logging

2016-07-14 15:44:28 -04:00

events

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -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

Removes most hard-coded z level checks

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

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

Merge pull request #4780 from Crazylemon64/space_ruins

2016-07-15 22:55:51 -04:00

mining

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

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

mob

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

2016-08-10 11:02:05 -07: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

Removes most hard-coded z level checks

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

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

Fix for #5386

2016-08-09 16:14:58 -05: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

Removes most hard-coded z level checks

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

space_management

Left a var abandoned, whoops

2016-07-31 21:42:25 -07:00

spacepods

Changes Damage Check and Adds Weapon Melee Damage

2016-07-20 04:41:26 -05:00

store

Removes most hard-coded z level checks

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

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

…