FlattestGuitar 0e4c51d6fe Easier communications report cancelling

2017-03-15 19:49:27 +01:00

..

admin

Easier communications report cancelling

2017-03-15 19:49:27 +01: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

Merge pull request #6734 from uraniummeltdown/plastic

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

Runtime fix.

2017-03-09 12:22:25 -03: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

…

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 pull request #6734 from uraniummeltdown/plastic

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

modular_computers

…

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

…

security_levels

…

shuttle

increased time, wirecutter is now a welder

2017-03-14 18:21:21 +04:00

space_management

…

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