Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 ...

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

2018-02-24 13:19:10 -05:00

..

admin

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

2018-02-23 21:55:42 -05:00

alarm

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

2018-02-17 00:35:29 -05:00

assembly

…

awaymissions

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

blob

…

blob2

Slimes should no longer /list you.

2018-02-20 01:58:49 -06:00

busy_space

…

client

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

2018-02-24 13:19:10 -05:00

clothing

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

2018-02-24 13:19:10 -05:00

customitems

…

detectivework

…

economy

…

entopics_vr

…

error_handler

…

events

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

examine

Make light switches constructable

2018-02-14 21:26:00 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

genetics

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

ghosttrap

…

holodeck

…

holomap

Initialize procs for virgo

2018-02-03 01:00:57 -05:00

hydroponics

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

icon generation

…

integrated_electronics

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

library

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

lighting

Implement SSatoms

2018-02-05 15:50:06 -05:00

lore_codex

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

2018-02-24 13:19:10 -05:00

maps

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

materials

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

2018-02-23 21:55:42 -05:00

media

Initialize procs for virgo

2018-02-03 01:00:57 -05:00

metric

…

mining

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

2018-02-23 21:55:42 -05:00

mob

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

2018-02-24 13:19:10 -05:00

multiz

POLARIS: zshadows should be as invisible as their origin

2018-02-22 22:36:39 -05:00

nano

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

2018-02-23 21:55:42 -05:00

nifsoft

VS: Fix serveral Destroy()s, VS edition

2018-02-20 00:21:29 -05:00

organs

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

2018-02-23 21:55:42 -05:00

overmap

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

paperwork

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

2018-02-23 21:55:42 -05:00

planet

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

2018-02-23 21:55:42 -05:00

power

Merge pull request #4926 from VOREStation/vplk-gas-turbine

2018-02-23 13:16:56 -06:00

projectiles

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

2018-02-23 21:55:42 -05:00

random_map

…

reagents

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

2018-02-24 13:19:10 -05:00

recycling

…

research

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

2018-02-23 21:55:42 -05:00

resleeving

VS: Fix a destroy by creating a subsystem

2018-02-20 00:23:37 -05:00

rogueminer_vr

VOREStation updates related to merged changes from polaris.

2018-02-07 20:08:10 -05:00

scripting

…

security levels

…

shieldgen

Should squash two runtimes (#4868)

2018-02-18 11:46:50 -08:00

shuttles

Should fix #4740.

2018-02-06 11:28:26 -06:00

spells

…

surgery

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

2018-02-23 21:55:42 -05:00

tables

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

telesci

Initialize procs for virgo

2018-02-03 01:00:57 -05:00

tension

…

turbolift

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

vehicles

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

ventcrawl

Fix HUD creation and ventcrawling

2018-02-21 17:47:19 -05:00

virus2

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

2018-02-17 00:35:29 -05:00

vore

BeyondMyLife's custom fluff items

2018-02-23 15:10:35 -05:00

xenoarcheaology

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

2018-02-17 00:35:29 -05:00

xenobio

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

xenobio2

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

2018-02-23 21:55:42 -05:00

xgm

…