Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +01:00

..

admin

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

2017-01-31 17:44:38 +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

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

2017-02-06 20:37:03 +01:00

clothing

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

2017-02-06 20:37:03 +01:00

computer3

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-23 01:01:09 -05:00

countdown

…

crafting

Merge remote-tracking branch 'upstream/master' into stunprod

2017-02-06 05:35:59 -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

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

examine

…

ext_scripts

…

fish

fixes, comfrey, and aloe

2017-01-23 05:25:42 -05:00

flufftext

…

food_and_drinks

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

garbage_collection

Removes Oudated GC Info

2017-01-30 03:01:29 -05:00

holiday

…

hydroponics

fungus among us

2017-02-04 05:01:03 -05:00

karma

Switching karma back to the "OOC" tab

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

library

Makes new book sprites available for Bookbinder

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

lighting

Makes Reagents Holder Process and Refactors NOREACT

2017-01-14 20:09:49 -05:00

logic

…

martial_arts

…

mining

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

2017-02-06 20:37:03 +01:00

mob

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

2017-02-06 20:37:03 +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

…

power

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

procedural_mapping

…

projectiles

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

reagents

Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord

2017-02-06 01:42:32 +01:00

recycling

Merge pull request #6178 from FalseIncarnate/NTPS

2017-01-31 01:26:21 -05:00

research

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

2017-02-06 20:37:03 +01:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

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

shuttle

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

2017-02-06 20:37:03 +01:00

space_management

…

spacepods

Switches over to the new system

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

store

…

surgery

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -05:00

telesci

…

tooltip

…

tram

Switches over to the new system

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

vehicle

…