Jovan 65cb35fbb2 please no merge conflict.

2017-03-11 19:21:06 -05:00

..

admin

conflict fixing.

2017-03-11 05:08:19 -05:00

alarm

…

arcade

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

2017-03-08 10:45:16 +01:00

assembly

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

atmos_automation

…

awaymissions

rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands

2017-03-07 20:55:43 +04:00

client

conflict fixing.

2017-03-11 05:08:19 -05:00

clothing

please no merge conflict.

2017-03-11 19:21:06 -05:00

computer3

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

countdown

…

crafting

…

customitems

Merge pull request #6710 from uraniummeltdown/coverflags

2017-03-11 04:57:15 -05:00

detective_work

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

economy

conflict fixing.

2017-03-11 05:08:19 -05:00

error_handler

…

events

Changed Traders chance back to 0

2017-03-07 21:41:18 -08:00

examine

…

ext_scripts

…

fish

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

flufftext

…

food_and_drinks

Merge pull request #6678 from LordJike/carrot-tweaks

2017-03-09 21:36:40 -05:00

garbage_collection

…

holiday

…

hydroponics

conflict fixing.

2017-03-11 05:08:19 -05:00

karma

Makes karma and whitelist tables use ckeys

2017-02-27 23:50:40 -05:00

library

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

lighting

…

logic

…

martial_arts

…

mining

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

2017-03-08 10:45:16 +01:00

mob

conflict fixing.

2017-03-11 05:08:19 -05:00

modular_computers

Layout fix.

2017-03-04 22:02:36 -03:00

nano

Fix conflicts.

2017-03-08 12:57:45 -03:00

ninja

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

paperwork

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

pda

conflict fixing.

2017-03-11 05:08:19 -05:00

persistence

…

power

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

2017-03-08 10:45:16 +01:00

procedural_mapping

…

projectiles

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

reagents

Merge pull request #6710 from uraniummeltdown/coverflags

2017-03-11 04:57:15 -05:00

recycling

conflict fixing.

2017-03-11 05:08:19 -05:00

research

please no merge conflict.

2017-03-11 19:21:06 -05:00

ruins

…

scripting

Refactors tcomms stuff a little

2017-02-24 18:10:08 -08:00

security_levels

…

shuttle

…

space_management

Ports Monster's finishing of the space allocator

2017-03-03 17:47:10 -08:00

spacepods

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

station_goals

conflict fixing.

2017-03-11 05:08:19 -05:00

store

…

surgery

conflict fixing.

2017-03-11 05:08:19 -05:00

telesci

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

tooltip

…

tram

…

vehicle

conflict fixing.

2017-03-11 05:08:19 -05:00