Aurorablade 5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie

2017-01-11 23:41:06 -05:00

..

admin

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

2017-01-06 05:15:11 -08:00

alarm

…

arcade

Fixes up battle terminal connections

2016-12-30 00:12:02 -05:00

assembly

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

atmos_automation

…

awaymissions

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

2017-01-06 05:01:43 -08:00

client

Merge pull request #6138 from Puckaboo2/masterbackup

2017-01-11 16:36:44 -05:00

clothing

updated flags

2017-01-10 20:43:55 +04:00

computer3

Computer3 machines no longer set the user's machine to a datum

2016-12-23 18:09:40 -08:00

countdown

…

crafting

Fixes ED-209 Crafting Oversight

2016-12-13 09:15:03 -05:00

customitems

Adds a fluff item for ComputerlessCitizen

2017-01-10 14:31:27 +01:00

detective_work

…

economy

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

error_handler

…

events

Removes Event Procs

2016-11-16 07:14:08 -05:00

examine

…

ext_scripts

…

fish

…

flufftext

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

food_and_drinks

Merge pull request #6085 from Fox-McCloud/food-rework

2017-01-10 12:11:17 -08:00

garbage_collection

....Well i fixed IKEA shuttles anyway....

2016-12-05 22:07:54 -05:00

holiday

…

hydroponics

Merge pull request #6085 from Fox-McCloud/food-rework

2017-01-10 12:11:17 -08:00

karma

Switching karma back to the "OOC" tab

2016-12-07 16:52:10 +01:00

library

…

lighting

…

logic

…

martial_arts

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

mining

Mining drones now are able to use meson sight again

2017-01-10 23:37:49 -08:00

mob

Merge pull request #6133 from Crazylemon64/fix_custom_open_borgpanels

2017-01-11 08:53:31 -05:00

nano

Fixes both pai resting jankiness, pai body re-entering

2017-01-09 15:14:26 -08:00

ninja

…

paperwork

Fixes video cam's networkless camera

2017-01-06 04:56:10 -05:00

pda

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

persistence

Adds extra documentation for json_to_object

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

pooling

…

power

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

2017-01-11 23:41:06 -05:00

procedural_mapping

…

projectiles

Merge pull request #6085 from Fox-McCloud/food-rework

2017-01-10 12:11:17 -08:00

reagents

Fixing Food Runtime

2017-01-10 21:40:54 -05:00

recycling

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

research

added category for atmos consoles

2017-01-11 09:56:16 +04:00

ruins

…

scripting

…

security_levels

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

shuttle

Merge pull request #6051 from Crazylemon64/pai_ui_fix

2017-01-06 03:08:27 -05:00

space_management

…

spacepods

Fixes a runtime when attempting to assemble an incomplete pod frame

2016-12-30 00:10:35 -08:00

store

…

surgery

Fixes a few limb removal runtimes

2017-01-10 18:59:33 -08:00

telesci

…

tooltip

Mass replace

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

tram

…

vehicle

…