Spades b59fd4b551 Merge pull request #4122 from VOREStation/upstream-merge-5464 ...

[MIRROR] Makes arcing projectiles exist in the code.

2018-09-17 14:11:46 -04:00

..

admin

Merge pull request #5416 from Anewbe/aooc_fix

2018-07-18 15:11:41 -04:00

alarm

…

artifice

Merge pull request #5426 from Anewbe/deadringer_fixes

2018-07-22 00:26:47 -04:00

assembly

Merge pull request #5391 from VOREStation/pol-infra

2018-07-06 19:34:44 -04:00

awaymissions

…

blob

…

blob2

…

busy_space

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

busy_space_vr

…

client

Merge pull request #4099 from VOREStation/upstream-merge-5450

2018-09-01 17:31:06 -04:00

clothing

Merge pull request #5406 from Mewchild/MC-Toysuit

2018-07-12 14:17:28 -04:00

customitems

…

detectivework

…

economy

…

entopics_vr

…

error_handler

…

events

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst

2018-06-06 18:50:34 -04:00

icon generation

…

integrated_electronics

Merge pull request #5445 from Anewbe/memory_circuit_sprite

2018-07-27 02:16:47 -04:00

library

…

lighting

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

lore_codex

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

maps

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

materials

Adds roofing tiles (#5409)

2018-07-14 15:24:33 -04:00

media

…

metric

…

mining

Merge pull request #5421 from Anewbe/IWouldLikeWallsToLookNiceNowPlease

2018-07-20 21:45:56 -04:00

mob

Merge pull request #4092 from VOREStation/upstream-merge-5443

2018-09-10 12:32:59 -04:00

multiz

Fixes Stairs in BYOND 512.1436

2018-07-12 23:23:34 -04:00

nano

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

nifsoft

Fix promthean NIF shoving

2018-05-23 22:47:29 -04:00

organs

Merge branch 'master' into synthmarking

2018-08-14 09:09:14 +03:00

overmap

…

paperwork

Merge branch 'master' into upstream-merge-5432

2018-09-09 17:57:31 -04:00

persistence

…

planet

Weather is shorter, hail is less deadly.

2018-06-16 14:02:09 -04:00

power

Merge pull request #4120 from VOREStation/upstream-merge-5460

2018-09-17 14:06:42 -04:00

projectiles

Merge pull request #4122 from VOREStation/upstream-merge-5464

2018-09-17 14:11:46 -04:00

random_map

…

reagents

Merge pull request #5449 from Anewbe/booze

2018-07-29 02:55:16 -04:00

recycling

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

research

Saber fix. (#5384)

2018-07-11 00:49:32 -04:00

resleeving

Fix virgo implant stuff

2018-07-21 14:21:17 -04:00

rogueminer_vr

…

scripting

…

security levels

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

shieldgen

Recharger refactor

2018-06-16 17:15:59 -04:00

shuttles

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

spells

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

surgery

Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry

2018-07-14 15:57:52 -04:00

tables

…

telesci

…

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Merge pull request #3940 from Verkister/buttmount

2018-09-01 17:25:23 -04:00

xenoarcheaology

Merge pull request #5428 from Mechoid/Fix_Anom_Suits_4_Realsies

2018-07-21 04:28:43 -04:00

xenobio

…

xenobio2

…

xgm

…