Aronai Sieyes dc3a587b7f Merge pull request #3390 from Verkister/collors ...

Small Shock/Holo collar tweaks.

2018-04-06 15:11:16 -04:00

..

admin

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

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

alarm

…

assembly

…

awaymissions

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

2018-03-15 22:41:14 -04:00

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 polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

client

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

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

clothing

Merge pull request #3390 from Verkister/collors

2018-04-06 15:11:16 -04:00

customitems

…

detectivework

…

economy

Fix unused variable warnings.

2018-04-01 16:17:35 -04:00

entopics_vr

…

error_handler

POLARIS: Moves daily logs into being folders rather than files

2018-03-13 18:20:59 -04:00

events

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

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

examine

…

ext_scripts

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

2018-03-15 22:41:14 -04:00

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

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

2018-03-15 22:41:14 -04:00

genetics

…

ghosttrap

…

holodeck

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

2018-03-15 22:41:14 -04:00

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 polaris-sync-2018-03-30

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

maps

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

2018-03-15 22:41:14 -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 polaris-sync-2018-03-30

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

multiz

Merge branch 'master' into vplk-port-pipeland-theta

2018-03-28 17:47:21 -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

Fix nif logs

2018-03-21 19:36:24 -04:00

organs

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

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

overmap

…

paperwork

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

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

persistence

…

planet

…

power

Fix light/camera layers for macros and fix constants for them too.

2018-04-01 16:29:52 -04:00

projectiles

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

2018-03-31 09:20:59 -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

Arranges lots of things into planes (#5072)

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

research

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

2018-03-31 09:20:59 -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 polaris-sync-2018-03-30

2018-03-31 09:20:59 -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 polaris-sync-2018-03-30

2018-03-31 09:20:59 -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

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

2018-03-15 22:41:14 -04:00

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

Probably maybe fixes blank lines for prey

2018-03-27 20:22:40 -04:00

xenoarcheaology

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

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

xenobio

Species names should now use defines

2018-03-15 20:24:45 -05:00

xenobio2

…

xgm

…