Nadyr 0d276898c6 Merge branch 'master' into upstream-merge-12635

2022-04-04 19:36:48 -04:00

..

admin

Merge pull request #3917 from CHOMPStation2/upstream-merge-12529

2022-03-27 00:06:32 -07:00

ai

Merge branch 'master' into upstream-merge-12560

2022-03-31 00:42:31 -07:00

alarm

…

artifice

Fix the ChangeTurf improvements PR, 3725

2022-02-28 23:33:34 -07:00

assembly

…

asset_cache

…

awaymissions

Merge pull request #12392 from Heroman3003/cookiefix

2022-03-07 09:06:24 +00:00

blob

…

blob2

…

busy_space

…

busy_space_vr

…

busy_space_yw

…

catalogue

powder that makes you say yes

2022-01-29 17:12:17 -05:00

client

powder that makes you say yes

2022-04-04 18:07:58 -04:00

clothing

Mini Aurora Port

2022-04-04 18:07:58 -04:00

compass

…

customitems

…

detectivework

…

DMAPI

…

economy

Mini Aurora Port

2022-04-04 18:07:58 -04:00

emotes

powder that makes you say yes

2022-03-30 21:03:35 -07:00

entopics_vr

…

error_handler

…

events

Merge pull request #12508 from lm40/master

2022-03-22 03:00:59 +00:00

examine

…

ext_scripts

…

fishing

…

flufftext

…

food

powder that makes you say yes

2022-03-25 18:47:44 -04:00

gamemaster

The Grand /TG Port - Part 6

2022-04-03 03:32:03 +00:00

games

Wiz-Off Fix

2022-03-11 04:23:40 +00:00

genetics

…

ghosttrap

…

holodeck

Merge branch 'master' into upstream-merge-12635

2022-04-04 19:36:48 -04:00

holomap

…

hydroponics

The Grand /TG Port - Part 6

2022-04-03 03:32:03 +00:00

icon generation

…

identification

…

instruments

…

integrated_electronics

…

interserver shipping

…

keybindings

…

library

…

lighting

Merge pull request #12618 from Heroman3003/outdoor_lights

2022-04-03 03:24:26 +00:00

looking_glass

…

lore_codex

…

makeup

…

maps

…

materials

Merge pull request #3717 from CHOMPStation2/upstream-merge-12286

2022-02-19 20:51:16 -05:00

media

…

metric

…

mining

Merge pull request #3991 from CHOMPStation2/upstream-merge-12579

2022-04-04 17:37:57 -04:00

mob

Merge branch 'master' into upstream-merge-12633

2022-04-04 19:12:58 -04:00

modular_computers

Merge pull request #12291 from Heroman3003/8330-fix

2022-02-19 22:33:38 +00:00

multi-tile

…

multiz

Misc Tweaks

2022-02-17 13:02:10 +00:00

nano

…

news

…

nifsoft

Firearms 1

2022-03-26 03:56:42 +00:00

organs

Merge pull request #3913 from Rykka-Stormheart/shep-dev-tankiness-buff

2022-03-29 14:48:35 -07:00

overmap

AI/Borgs and Shuttles

2022-03-12 21:00:30 +00:00

paperwork

Earlyports fix for illiterate mobs

2022-03-19 20:21:13 +02:00

pda

Small Pilot QoL additions

2022-03-13 20:05:54 +00:00

persistence

Merge pull request #12356 from Very-Soft/persistchange

2022-03-02 06:08:02 +00:00

Phorochemistry

…

planet

Merge pull request #3987 from CHOMPStation2/upstream-merge-12618

2022-04-04 17:07:42 -04:00

power

Merge branch 'master' into upstream-merge-12633

2022-04-04 19:12:58 -04:00

projectiles

Change size recoil to 60

2022-04-01 22:56:44 -07:00

radiation

…

random_map

Merge pull request #12527 from Heroman3003/droppodboom

2022-03-25 09:23:01 +00:00

reagents

Hypospray Revamp

2022-04-04 18:29:52 -04:00

recycling

Rascal's Pass

2022-04-01 16:59:15 +00:00

research

Merge pull request #3991 from CHOMPStation2/upstream-merge-12579

2022-04-04 17:37:57 -04:00

resleeving

powder that makes you say yes

2022-03-31 18:01:39 -04:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

Merge pull request #11897 from VOREStation/upstream-merge-8354

2022-02-13 21:58:57 +00:00

shuttles

Merge pull request #12432 from Very-Soft/miningshuttles

2022-03-13 04:49:31 +00:00

spells

…

surgery

…

tables

…

telesci

Merge pull request #12218 from Very-Soft/noqpadsonshuttls

2022-02-13 21:50:23 +00:00

tension

…

tgs

vore

2022-03-16 00:26:59 -07:00

tgui

…

tools

Merge pull request #12493 from VOREStation/upstream-merge-8443

2022-03-20 22:31:15 +00:00

tooltip

…

turbolift

Fix the ChangeTurf improvements PR, 3725

2022-02-28 23:33:34 -07:00

vchat

…

vehicles

…

ventcrawl

…

virus2

…

vore

The Grand /TG Port - Part 2

2022-04-03 03:27:36 +00:00

webhooks

…

xenoarcheaology

7914 branch fix

2022-02-19 21:25:16 +00:00

xenobio

Merge branch 'master' into upstream-merge-12560

2022-03-31 00:42:31 -07:00

xenobio2

Fix the ChangeTurf improvements PR, 3725

2022-02-28 23:33:34 -07:00

xgm

…