Jovan 22db913d9f conflict fixing.

2017-03-11 05:08:19 -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

conflict fixing.

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

computer3

Implement usesound/toolspeed

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

countdown

…

crafting

…

customitems

Implement usesound/toolspeed

2017-03-07 16:46:28 +01: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

Lighting performance/profiling tweaks

2017-02-19 23:37:54 -05:00

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

nano

Allows IPCs to express themselves as a gender again

2017-02-26 12:06:16 -08: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

Implement usesound/toolspeed

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

recycling

conflict fixing.

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

research

Implement usesound/toolspeed

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

ruins

…

scripting

Refactors tcomms stuff a little

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

security_levels

…

shuttle

Some changes!

2017-02-18 22:18:01 -02:00

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