Spades d47b9d5df1 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof ...

# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
#	icons/mob/vore64x32.dmi

2017-07-05 11:33:24 -04:00

..

admin

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

2017-06-30 22:31:43 -04:00

alarm

…

assembly

…

awaymissions

Merge remote-tracking branch 'refs/remotes/origin/master' into guns

2017-07-02 00:30:23 -04:00

blob

…

busy_space

…

client

Taur and borgo feature shieet!

2017-07-03 21:05:17 +03:00

clothing

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

2017-06-30 22:31:43 -04:00

customitems

…

detectivework

Some more types which need Destroy to return qdel hints!

2017-06-14 01:13:54 -04:00

economy

…

error_handler

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Some more types which need Destroy to return qdel hints!

2017-06-14 01:13:54 -04:00

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

…

library

…

lighting

Converts the lighting process controller to a StonedMC subsystem

2017-06-16 23:08:41 -04:00

lore_codex

sleepy commit

2017-07-04 06:38:32 -04:00

maps

…

materials

…

media

…

metric

…

mining

…

mob

Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof

2017-07-05 11:33:24 -04:00

multiz

…

nano

…

nifsoft

Merge pull request #1753 from VOREStation/aro-sccost

2017-06-17 18:09:39 -04:00

organs

…

overmap

…

paperwork

…

planet

…

power

…

projectiles

Final additions and fixes

2017-07-04 20:01:38 -04:00

random_map

…

reagents

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

2017-06-30 22:31:43 -04:00

recycling

…

research

…

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

Switch tether shuttles over to self-initializing shuttle paradigm

2017-06-14 19:34:01 -04:00

spells

…

supermatter

…

surgery

…

tables

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

2017-06-30 22:31:43 -04:00

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Adds in Icowom's custom items

2017-07-02 03:21:48 -04:00

xenoarcheaology

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

2017-06-30 22:31:43 -04:00

xenobio2

…

xgm

…