klaasjared 7be38292ca Base Commit ...

Additional Shuttles

Pushing this to Rebase

Conflict Fix

SD Shuttle

Rebase Fixes

2021-11-09 20:44:53 -05:00

..

admin

Renames Engineer, new alt-titles for Stellar Delight

2021-11-02 19:56:49 +10:00

ai

Updoot! Also expands ventcrawl allowed list

2021-08-21 06:20:01 -04:00

alarm

…

artifice

…

assembly

…

asset_cache

Stellar delight map files

2021-10-27 19:52:39 -04:00

awaymissions

Renames Engineer, new alt-titles for Stellar Delight

2021-11-02 19:56:49 +10:00

blob

…

blob2

…

busy_space

…

busy_space_vr

Update air_traffic.dm

2021-10-07 00:27:10 +01:00

casino

[MIRROR] :siffet: (#11584)

2021-10-24 19:49:05 -04:00

catalogue

…

client

Merge pull request #11752 from Heroman3003/jobstuff2

2021-11-06 03:44:47 -04:00

clothing

Merge pull request #11776 from PastelPrinceDan/idontwantalotforchristmas

2021-11-05 12:21:17 -04:00

compass

…

customitems

…

detectivework

Fix merge

2021-10-22 13:42:32 -04:00

economy

Modularizes SD files a bit

2021-10-31 08:42:18 +10:00

emotes

Merge pull request #8338 from MistakeNot4892/emotes

2021-11-07 17:33:49 -05:00

entopics_vr

…

error_handler

…

events

Updates Aurora event

2021-10-27 19:52:39 -04:00

examine

…

ext_scripts

…

fishing

Make stack amount var private

2021-08-19 21:06:46 -04:00

flufftext

Renames Engineer, new alt-titles for Stellar Delight

2021-11-02 19:56:49 +10:00

food

Makes Chem Storage list alphabetical

2021-11-03 04:24:29 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Holodeck update and map tweaks

2021-11-01 17:52:20 -04:00

holomap

…

hydroponics

Merge pull request #11454 from VOREStation/Arokha/stacks

2021-08-26 11:38:33 -04:00

icon generation

…

identification

…

instruments

Rebase

2021-10-27 20:37:02 -04:00

integrated_electronics

Make stack amount var private

2021-08-19 21:06:46 -04:00

keybindings

…

library

…

lighting

…

looking_glass

…

lore_codex

Merge pull request #8209 from Cerebulon/news_popup

2021-08-25 22:34:44 -04:00

makeup

…

maps

…

materials

hardwood material port

2021-10-28 10:21:38 +01:00

media

…

metric

…

mining

Merge pull request #11708 from Hatterhat/drill-buffs

2021-10-27 12:10:19 -04:00

mob

Your mom lets you have two healings???

2021-11-08 07:41:16 -05:00

modular_computers

…

multi-tile

…

multiz

Fixes riding on stairs

2021-11-06 13:40:40 +10:00

nano

…

news

Merge pull request #8209 from Cerebulon/news_popup

2021-08-25 22:34:44 -04:00

nifsoft

Secondary Commit

2021-08-29 00:54:47 -04:00

organs

New Organ Sprites

2021-08-25 23:30:21 -04:00

overmap

Base Commit

2021-11-09 20:44:53 -05:00

paperwork

Remove suicide act

2021-10-27 20:35:12 -04:00

pda

…

persistence

gaming

2021-11-07 20:33:06 -06:00

planet

…

power

Renames Engineer, new alt-titles for Stellar Delight

2021-11-02 19:56:49 +10:00

projectiles

Merge pull request #11675 from VOREStation/upstream-merge-8250

2021-10-27 21:06:41 -04:00

radiation

…

random_map

Fix merge

2021-09-27 14:02:26 -04:00

reagents

Merge pull request #11681 from VOREStation/upstream-merge-8326

2021-10-27 21:24:45 -04:00

recycling

Make stack amount var private

2021-08-19 21:06:46 -04:00

research

Merge branch 'master' of https://github.com/VOREStation/VOREStation into brrrrped

2021-10-27 16:43:45 -05:00

resleeving

Fix broken Sleevecards

2021-10-29 13:42:54 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

surgery

Merge pull request #8226 from Schnayy/nameloopfix

2021-08-22 23:27:06 -04:00

tables

hardwood material port

2021-10-28 10:21:38 +01:00

telesci

…

tension

…

tgs

…

tgui

Sanitizes input

2021-08-21 00:59:08 -04:00

tooltip

…

turbolift

…

vchat

…

vehicles

…

ventcrawl

…

virus2

Remove suicide act

2021-10-27 20:35:12 -04:00

vore

Merge pull request #11717 from VOREStation/Arokha/unused

2021-10-27 21:22:32 -04:00

webhooks

…

xenoarcheaology

Stellar delight map files

2021-10-27 19:52:39 -04:00

xenobio

…

xenobio2

…

xgm

…