Markolie 0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact ...

# Conflicts:
#	code/game/machinery/doors/firedoor.dm

2017-02-10 18:18:29 +01:00

..

admin

Split admin interaction into regular and advanced, make more devices ghost-interactable

2017-02-09 19:30:36 +01:00

alarm

…

arcade

…

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 admin_interact

2017-02-10 18:18:29 +01:00

clothing

Merge pull request #6321 from uraniummeltdown/aidead

2017-02-06 07:13:05 -08: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

…

detective_work

…

economy

…

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 pull request #6343 from Fox-McCloud/reagent-tank-thingy

2017-02-07 19:58:28 -08:00

garbage_collection

Removes Oudated GC Info

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

holiday

…

hydroponics

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

2017-02-10 18:18:29 +01:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

mining

Merge pull request #6333 from uraniummeltdown/oreboxscanner

2017-02-06 05:10:35 -05:00

mob

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

2017-02-10 18:18:29 +01:00

nano

…

ninja

…

paperwork

Admin interaction fixes

2017-02-10 01:20:01 +01:00

pda

…

persistence

…

power

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

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

procedural_mapping

…

projectiles

On Varedit Fixes

2017-02-07 08:44:50 -05:00

reagents

Reagent Grinder Hotfix

2017-02-08 03:19:50 -05:00

recycling

Merge pull request #6178 from FalseIncarnate/NTPS

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

research

Merge pull request #6366 from uraniummeltdown/quantumpads

2017-02-10 07:28:27 -05:00

ruins

…

scripting

…

security_levels

Merge pull request #5814 from Markolie/ann2

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

shuttle

ported quantum pads from TG and added to RnD

2017-02-09 00:33:07 +04:00

space_management

…

spacepods

…

store

…

surgery

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

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

telesci

…

tooltip

…

tram

…

vehicle

…