Crazy Lemon 4e9236090e Merge pull request #6776 from FlattestGuitar/shoes ...

Ports tg's winter boots 👞

2017-03-16 17:46:27 -07: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

Change Door Sounds

2017-03-13 06:25:19 -04:00

client

Merge pull request #6776 from FlattestGuitar/shoes

2017-03-16 17:46:27 -07:00

clothing

Adds winter boots; adds workboots to the loadout system

2017-03-15 19:45:40 +01:00

computer3

Implement usesound/toolspeed

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

countdown

…

crafting

plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines

2017-03-12 06:09:29 +04:00

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

Merge pull request #6734 from uraniummeltdown/plastic

2017-03-15 06:33:02 -04:00

examine

…

ext_scripts

…

fish

Implement usesound/toolspeed

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

flufftext

Change Door Sounds

2017-03-13 06:25:19 -04:00

food_and_drinks

plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines

2017-03-12 06:09:29 +04: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

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

2017-03-16 22:36:00 +01: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

Fix conflicts.

2017-03-09 12:01:50 -03:00

procedural_mapping

…

projectiles

Merge pull request #6689 from Fox-McCloud/nerf-shotguns

2017-03-11 15:26:58 -08:00

reagents

Merge pull request #6734 from uraniummeltdown/plastic

2017-03-15 06:33:02 -04: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

increased time, wirecutter is now a welder

2017-03-14 18:21:21 +04: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