Markolie d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace ...

# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm

2017-04-14 18:15:12 +02:00

..

admin

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

2017-04-14 18:15:12 +02:00

alarm

…

arcade

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

assembly

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

2017-04-14 18:15:12 +02:00

atmos_automation

…

awaymissions

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

2017-04-14 18:15:12 +02:00

client

Merge branch 'master' into findnreplace

2017-04-01 23:51:58 +02:00

clothing

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

2017-04-14 18:15:12 +02:00

computer3

Merge branch 'master' into findnreplace

2017-03-09 17:32:42 +01:00

countdown

…

crafting

Merge pull request #6705 from davipatury/crafting-ui

2017-03-21 18:00:34 -07:00

customitems

Adds a fluff item for DesolateG

2017-04-12 00:41:20 +02:00

detective_work

Implement usesound/toolspeed

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

economy

Merge branch 'master' into findnreplace

2017-03-15 16:02:14 +01:00

error_handler

…

events

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

2017-04-14 18:15:12 +02:00

examine

…

ext_scripts

…

fish

Merge pull request #6699 from FalseIncarnate/fish

2017-03-23 16:02:27 -04:00

flufftext

Change Door Sounds

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

food_and_drinks

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

2017-04-14 18:15:12 +02:00

garbage_collection

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

2017-04-14 18:15:12 +02:00

holiday

…

hydroponics

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

karma

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

2017-04-14 18:15:12 +02: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 findnreplace

2017-04-14 18:15:12 +02:00

mob

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

2017-04-14 18:15:12 +02:00

modular_computers

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

nano

Merge pull request #6705 from davipatury/crafting-ui

2017-03-21 18:00:34 -07:00

ninja

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

paperwork

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

2017-04-14 18:15:12 +02:00

pda

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

persistence

…

power

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

2017-04-14 18:15:12 +02:00

procedural_mapping

…

projectiles

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

reagents

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

2017-04-14 18:15:12 +02:00

recycling

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

2017-04-14 18:15:12 +02:00

research

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

2017-04-14 18:15:12 +02:00

ruins

…

scripting

…

security_levels

Merge branch 'master' into findnreplace

2017-03-15 16:02:14 +01:00

shuttle

effect/spider to structure/spider

2017-03-27 19:01:25 -03:00

space_management

Ports Monster's finishing of the space allocator

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

spacepods

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

2017-04-14 18:15:12 +02:00

station_goals

conflict fixing.

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

store

…

surgery

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

2017-04-14 18:15:12 +02:00

telesci

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

2017-04-14 18:15:12 +02:00

tooltip

…

tram

…

vehicle

conflict fixing.

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