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

2017-03-16 22:36:00 +01:00

..

admin

Fixes admin bwoink preference

2017-03-10 19:46:35 -05:00

alarm

AI Restorer and Alarm Monitor.

2017-02-20 11:44:34 -03:00

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

Merge pull request #6527 from davipatury/modular_computers

2017-03-11 04:51:49 -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

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

events

Merge pull request #6734 from uraniummeltdown/plastic

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

examine

…

ext_scripts

send2irc Multi-Host upgrade

2016-02-11 11:24:30 -08:00

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

Removes Oudated GC Info

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

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

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

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

2017-03-10 12:42:37 +01:00

persistence

…

power

Fix conflicts.

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

procedural_mapping

Mass replace

2016-07-07 19:34:02 -07:00

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

Comms program.

2017-02-21 12:37:28 -03:00

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

Nano-Mob Hunter GO! WIP commit 3: The committening

2016-09-06 04:15:44 -04:00

surgery

Merge branch 'master' into zefix

2017-03-09 17:20:31 +01:00

telesci

Implement usesound/toolspeed

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

tooltip

Mass replace

2016-07-07 19:34:02 -07:00

tram

…

vehicle

conflict fixing.

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