Leshana f50d5153ff Merge pull request #2681 from VOREStation/aro-nsfwhos ...

Gives the HoS a KHI-102b NSFW

2018-01-05 14:21:59 -05:00

..

admin

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

alarm

…

assembly

…

awaymissions

Polaris sync

2017-12-21 04:01:07 -05:00

blob

…

blob2

…

busy_space

…

client

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

clothing

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

customitems

…

detectivework

Fix runtimes in MouseDrop when dragging out of the screen

2017-12-30 11:26:41 -05:00

economy

…

error_handler

…

events

this here stuff

2017-12-29 20:01:23 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

2017-12-26 23:07:58 -05:00

genetics

…

ghosttrap

…

holodeck

…

holomap

Replaced world.tick_usage with TICK_USAGE macro in VOREStation code

2018-01-04 22:57:00 -05:00

hydroponics

Polaris sync

2017-12-21 04:01:07 -05:00

icon generation

…

integrated_electronics

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

library

…

lighting

…

lore_codex

…

maps

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

materials

Polaris sync

2017-12-21 04:01:07 -05:00

media

…

metric

…

mining

…

mob

Merge pull request #2664 from Verkister/buppers

2018-01-05 10:11:13 -05:00

multiz

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

nano

…

nifsoft

Update 13_soulcatcher.dm

2017-12-29 12:26:54 -05:00

organs

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

overmap

…

paperwork

Polaris sync

2017-12-21 04:01:07 -05:00

planet

Polaris sync

2017-12-21 04:01:07 -05:00

power

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

projectiles

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

random_map

Polaris sync

2017-12-21 04:01:07 -05:00

reagents

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

recycling

Mechs don't fit in disposal chutes

2017-12-31 17:17:23 -05:00

research

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

resleeving

Merge pull request #2659 from Cyantime/resleevehealth

2018-01-02 02:45:16 -05:00

rogueminer_vr

…

scripting

SC Stupid Sized Map Update

2017-12-24 07:04:34 -08:00

security levels

…

shieldgen

…

shuttles

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

spells

…

surgery

Fix NIF surgery post-update

2017-12-26 01:50:04 -05:00

tables

Polaris sync

2017-12-21 04:01:07 -05:00

telesci

Polaris sync

2017-12-21 04:01:07 -05:00

turbolift

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

vehicles

Polaris sync

2017-12-21 04:01:07 -05:00

ventcrawl

…

virus2

…

vore

Merge pull request #2681 from VOREStation/aro-nsfwhos

2018-01-05 14:21:59 -05:00

xenoarcheaology

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

xenobio

Rainbow Slime Extracts No Longer Make Wild Slimes

2018-01-01 08:20:55 -05:00

xenobio2

…

xgm

…