Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 ...

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm

2018-04-15 14:19:36 -04:00

..

admin

Set appropriate vars for persisting adminspawned characters

2018-04-09 20:47:44 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

blob2

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

busy_space

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

busy_space_vr

Lore updates (#3430)

2018-04-14 12:58:42 -04:00

client

Merge pull request #3407 from Little-119/rings-fix

2018-04-08 07:26:38 -04:00

clothing

Merge branch 'master' into SILENCEDMP5A5_FLUFF

2018-04-11 00:37:26 -04:00

customitems

…

detectivework

…

economy

Kills the Vir Times and replaces the economic destination list with Polaris locations. (#5132)

2018-04-06 13:32:43 -05:00

entopics_vr

…

error_handler

…

events

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

examine

…

ext_scripts

…

flufftext

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

icon generation

…

integrated_electronics

…

library

…

lighting

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

lore_codex

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

maps

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

materials

…

media

…

metric

…

mining

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

multiz

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

nano

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

nifsoft

Fixed mesons NIFSoft overlay not highlighting open spaces above

2018-04-09 10:57:23 +10:00

organs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

overmap

…

paperwork

Lore updates (#3430)

2018-04-14 12:58:42 -04:00

persistence

…

planet

…

power

Optimizes Powercell Update Icons

2018-04-12 18:53:47 -04:00

projectiles

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

random_map

…

reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

recycling

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

research

Merge pull request #3325 from VOREStation/Cameron653-patch-1

2018-04-08 20:41:11 -04:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

shuttles

POLARIS: Silly piloting helmet animation

2018-03-20 22:52:49 -04:00

spells

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

surgery

Fixes infinite loop in FBP naming w/o client

2018-03-29 23:46:19 -04:00

tables

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

telesci

…

tension

…

tooltip

POLARIS: Tooltip framework, and mob tooltips

2018-03-20 22:42:16 -04:00

turbolift

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

vehicles

…

ventcrawl

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

virus2

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

vore

Modified LeMat Fluff Weapon (#3337)

2018-04-14 19:41:19 -04:00

xenoarcheaology

Merge pull request #3325 from VOREStation/Cameron653-patch-1

2018-04-08 20:41:11 -04:00

xenobio

…

xenobio2

…

xgm

…