alberyk 12a70b50b7 Merge branch 'master' into updates_the_nbt ...

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm

2022-02-19 10:26:35 -03:00

..

acting

Vaurca Hivenet Stuff (#12874)

2022-02-09 18:27:51 +01:00

admin

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

alarm

…

ambient_occlusion

…

assembly

Initialize and GC failure fixes #1 (#13190)

2022-02-15 23:45:30 +01:00

awaymissions

…

background

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

balloon_alert

…

battlemonsters

Battlemonsters Tweak (#13071)

2022-02-06 18:27:55 -03:00

blob

…

cargo

Merge branch 'master' into fixes_compile

2022-02-04 14:22:38 -03:00

cciaa

…

client

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

clothing

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

compass

…

cooking

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

custom_ka

…

customitems

Mrakiizar Book Tweaks (#13092)

2022-02-18 12:48:59 +01:00

detectivework

Initialize and GC failure fixes #1 (#13190)

2022-02-15 23:45:30 +01:00

economy

…

effects

…

emotes

Unathi hiss2 is now loud (#13075)

2022-02-06 18:32:30 -03:00

events

Merge branch 'master' into fourth_week_preparation_and_fixes

2022-02-10 13:36:46 -03:00

examine

…

ext_scripts

…

flufftext

…

games

…

ghostroles

Merge branch 'master' into final_shuttle_touches_and_stuff

2022-01-17 19:36:22 -03:00

global_listener

…

goonchat

Vaurca Hivenet Stuff (#12874)

2022-02-09 18:27:51 +01:00

hallucinations

…

heavy_vehicle

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

holodeck

…

http

…

hydroponics

Chemistry Sprite Tweaks (#13041)

2022-02-04 12:21:49 +01:00

integrated_electronics

…

item_worth

…

law

…

library

…

lighting

Exoplanet ruins, away sites, overmap submaps and maploader goodies. (#12933)

2022-02-18 15:34:10 +01:00

liquid

…

lock

…

makeshift

…

maps

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

martial_arts

…

materials

Merge branch 'master' into fourth_week_preparation_and_fixes

2022-02-10 13:36:46 -03:00

merchant

…

mining

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

mob

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

modular_computers

Network tweak

2022-02-06 13:44:03 -03:00

multiz

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

nano

fixes suit sensor interaction with telecomms (#12997)

2022-01-29 20:56:11 -03:00

ntsl2

…

orbit

…

organs

Enhanced Vision Aug Fix (#13183)

2022-02-14 14:53:02 -03:00

overmap

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

paperwork

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

power

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

projectiles

Merge branch 'master' into fixes_compile

2022-02-04 14:22:38 -03:00

psionics

…

random_map

Merge branch 'master' into fixes_compile

2022-02-04 14:22:38 -03:00

reagents

Merge branch 'master' into updates_the_nbt

2022-02-19 10:26:35 -03:00

recycling

…

research

Reverts #13170 and #12989 (#13194)

2022-02-16 00:50:33 +01:00

scripting

…

security levels

Moodier station lighting, randomized light colors and code red lighting. (#13066)

2022-02-11 16:15:20 +01:00

shareddream

…

shieldgen

Hull Shields now also protect asteroid rock walls (#12932)

2022-02-19 14:01:48 +01:00

shuttles

Shuttles on longer play launch sound effect if they are out of fuel.

2022-02-12 16:17:08 +00:00

spell_system

…

submaps

Exoplanet ruins, away sites, overmap submaps and maploader goodies. (#12933)

2022-02-18 15:34:10 +01:00

supermatter

Finish porting bay's timer SS (#12978)

2022-01-29 13:07:51 -03:00

surgery

…

tables

…

telesci

…

tgs

…

tooltip

…

turbolift

Finally Fix Wall Smoothing (#12999)

2022-02-01 12:49:20 +01:00

udp

…

vehicles

…

ventcrawl

…

vueui

…

web_interface

…

world_api

…

xgm

…