Crazylemon64 031dd2bb3d Iiiiit's merge conflict time! ...

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

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

..

admin

Iiiiit's merge conflict time!

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

alarm

Mass replace

2016-07-07 19:34:02 -07:00

arcade

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

assembly

Action Button Update

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

atmos_automation

Mass replace

2016-07-07 19:34:02 -07:00

awaymissions

Iiiiit's merge conflict time!

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

client

Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses

2016-08-07 23:06:20 -04:00

clothing

Iiiiit's merge conflict time!

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

Fixes Slow Action Buttons, Removes Verbs

2016-07-20 02:44:34 -04:00

detective_work

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

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

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

ext_scripts

…

fish

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

flufftext

Plastic Explosives Update

2016-07-13 22:04:23 -04:00

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

Mass replace

2016-07-07 19:34:02 -07:00

library

Merge conflicts begone

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

lighting

Fixes a bug involving a map template resetting the map loader's

2016-07-06 22:51:48 -07:00

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 conflicts begone

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

mob

Iiiiit's merge conflict time!

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

nano

Merge conflicts begone

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

ninja

Mass replace

2016-07-07 19:34:02 -07:00

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

Mass replace

2016-07-07 19:34:02 -07:00

power

Iiiiit's merge conflict time!

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

procedural_mapping

Mass replace

2016-07-07 19:34:02 -07:00

projectiles

Iiiiit's merge conflict time!

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

reagents

Makes holy water stutters non-op

2016-08-05 00:38:31 +02: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

Adds a system to give each ruin a separate area

2016-06-25 01:44:08 -07:00

scripting

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

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

Oh

2016-08-05 18:58:38 -04:00

telesci

Iiiiit's merge conflict time!

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

tooltip

Mass replace

2016-07-07 19:34:02 -07:00

tram

…

vehicle

Stops vehicles unintentionally being space vehicles (#4805)

2016-06-28 15:55:14 -04:00