Markolie a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi

2017-01-23 17:36:37 +01:00

..

admin

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

2017-01-23 17:36:37 +01:00

alarm

…

arcade

Fixes up battle terminal connections

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

assembly

…

atmos_automation

…

awaymissions

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

2017-01-20 23:43:35 +01:00

client

Reduced redundancy.

2017-01-18 19:39:49 -05:00

clothing

Removes the joy mask

2017-01-12 16:19:12 +13:00

computer3

Announcement fixes

2017-01-19 15:12:20 +01:00

countdown

…

crafting

…

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

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

2017-01-20 23:43:35 +01:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

Tiger's comments

2017-01-22 19:15:26 +01:00

garbage_collection

…

holiday

…

hydroponics

Allows shovels/spades to remove soil patches

2017-01-22 03:24:52 -05:00

karma

…

library

Makes new book sprites available for Bookbinder

2017-01-16 19:43:14 +01:00

lighting

…

logic

…

martial_arts

…

mining

Tiger's comments

2017-01-22 19:15:26 +01:00

mob

If check spaces

2017-01-22 19:18:13 +01:00

nano

Fixes both pai resting jankiness, pai body re-entering

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

ninja

…

paperwork

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

pda

Adds a ui_key arg to ui_data

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

persistence

…

pooling

…

power

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

2017-01-20 23:43:35 +01:00

procedural_mapping

…

projectiles

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

2017-01-23 17:36:37 +01:00

reagents

Implement Fox's changes for tinlux

2017-01-21 00:44:10 +01:00

recycling

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

research

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

2017-01-20 23:43:35 +01:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

shuttle

Merge pull request #5814 from Markolie/ann2

2017-01-18 19:17:30 -08:00

space_management

…

spacepods

Switches over to the new system

2017-01-17 13:57:07 +01:00

store

…

surgery

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

2017-01-20 23:43:35 +01:00

telesci

…

tooltip

…

tram

Switches over to the new system

2017-01-17 13:57:07 +01:00

vehicle

…