Leshana ef3df27528 VOREStation Specific Merge Changes ...

* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.

2018-02-17 16:56:31 -05:00

..

admin

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

2018-02-17 00:35:29 -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

…

busy_space

…

client

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

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

clothing

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -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-16

2018-02-17 00:35:29 -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-16

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

media

Initialize procs for virgo

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

metric

…

mining

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

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

mob

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -05:00

multiz

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

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

nano

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

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

nifsoft

Fixes #2810

2018-02-15 03:42:49 -06:00

organs

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -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-16

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

planet

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

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

power

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

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

projectiles

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -05:00

random_map

…

reagents

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

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

recycling

…

research

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

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

resleeving

Initialize procs for virgo

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

rogueminer_vr

VOREStation updates related to merged changes from polaris.

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

scripting

…

security levels

…

shieldgen

Tweaks Shield Generators

2018-02-08 05:37:56 -05:00

shuttles

Should fix #4740.

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

spells

…

surgery

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

2018-02-07 19:30:50 -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

…

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

Adjust VOREStation guns for PolarisSS13/Polaris/#4185

2018-02-17 16:56:30 -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

…

xgm

…