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

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

..

admin

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

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

alarm

…

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

…

awaymissions

Removes most hard-coded z level checks

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

client

Removes dels and unused code that contains dels

2016-08-02 01:33:19 -04:00

clothing

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

2016-08-03 13:31:42 -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

Removes pointless src. Again

2016-07-29 10:24:14 +01:00

error_handler

Improves caught exception logging

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

events

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

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

examine

…

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

…

library

Merge conflicts begone

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

lighting

…

logic

…

martial_arts

…

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

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

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

nano

Merge conflicts begone

2016-08-01 18:28:47 -07: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

Merge conflicts begone

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

pooling

…

power

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

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

procedural_mapping

…

projectiles

Makes things more consistent

2016-08-02 11:27:28 -07:00

reagents

Merge conflicts begone

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

recycling

Merge conflicts begone

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

research

Merge conflicts begone

2016-08-01 18:28:47 -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

Merge conflicts begone

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

telesci

Removes most hard-coded z level checks

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

tooltip

…

tram

…

vehicle

…