Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

2016-12-23 19:32:19 +01:00

..

admin

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

2016-12-23 19:32:19 +01:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

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

2016-12-23 19:32:19 +01:00

client

Merge pull request #5962 from KasparoVy/fixes-monochromatic-bugs

2016-12-23 07:19:06 -05:00

clothing

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

computer3

Switches reset_view to reset_perspective

2016-12-21 17:59:08 -08:00

countdown

…

crafting

Fixes ED-209 Crafting Oversight

2016-12-13 09:15:03 -05:00

customitems

Adds floof

2016-12-06 11:42:10 +01:00

detective_work

…

economy

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

error_handler

…

events

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

2016-12-23 19:32:19 +01:00

examine

…

ext_scripts

…

fish

…

flufftext

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

food_and_drinks

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

2016-12-23 19:32:19 +01:00

garbage_collection

…

holiday

…

hydroponics

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

karma

Switching karma back to the "OOC" tab

2016-12-07 16:52:10 +01:00

library

…

lighting

…

logic

…

martial_arts

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

mining

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

2016-12-23 19:32:19 +01:00

mob

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

2016-12-23 19:32:19 +01:00

nano

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

ninja

…

paperwork

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

pda

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

persistence

…

pooling

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

power

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

2016-12-23 19:32:19 +01:00

procedural_mapping

…

projectiles

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

2016-12-23 19:32:19 +01:00

reagents

Merge pull request #5985 from Fox-McCloud/wall-rot

2016-12-21 17:43:45 -08:00

recycling

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

research

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

ruins

…

scripting

…

security_levels

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

shuttle

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

space_management

…

spacepods

No charge-free shooting for pods, take 2

2016-12-12 13:45:38 +01:00

store

…

surgery

Merge pull request #5840 from Crazylemon64/adds_reset_perspective

2016-12-23 07:27:36 -05:00

telesci

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

tooltip

…

tram

…

vehicle

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00