alberyk 2294b4f0c5 Merge branch 'master' into computer_tweaks ...

# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi

2021-10-29 21:41:30 -03:00

..

acting

…

admin

Event Map Refactor (#12329)

2021-09-23 13:34:47 -03:00

alarm

…

ambient_occlusion

…

assembly

…

awaymissions

All jobs

2021-09-23 23:07:28 -03:00

background

Makes Vaurca Breeders selectable in character setup (#12658)

2021-10-29 12:59:35 -03:00

balloon_alert

…

battlemonsters

…

blob

Blobs can Damage Reinforced Walls Again(#12582)

2021-10-08 17:54:09 -03:00

cargo

…

cciaa

All jobs

2021-09-23 23:07:28 -03:00

client

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

clothing

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

compass

…

cooking

Skrell recipe tweak (#12661)

2021-10-22 17:50:33 -03:00

custom_ka

…

customitems

Skull of Dorviza custom item (#12577)

2021-10-08 17:55:13 -03:00

detectivework

Fixes loadout renaming runtimes (#12497)

2021-09-17 12:53:47 +02:00

economy

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

effects

Adds new full windows (#12434)

2021-09-17 12:36:40 +02:00

emotes

Emote Bolding (#12585)

2021-10-10 15:44:11 +02:00

events

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

examine

…

ext_scripts

…

flufftext

rename

2021-10-29 21:23:43 -03:00

games

…

ghostroles

Renames the dionae subspecies also gives them hair (#12693)

2021-10-27 23:15:15 -03:00

global_listener

…

goonchat

…

hallucinations

…

heavy_vehicle

Adds sensitive hearing (#12151)

2021-10-15 19:02:12 +02:00

holodeck

Adds name and desc to holodeck baby penguins (#12476)

2021-09-12 20:29:13 +02:00

http

…

hydroponics

Vanilla plant, extract, syrup (#12509)

2021-09-24 18:18:23 -03:00

integrated_electronics

Integrated Circuit Fix (#12652)

2021-10-19 18:40:35 -03:00

item_worth

Powerful Mechs (#12193)

2021-08-31 18:05:09 +02:00

law

…

library

…

lighting

…

liquid

…

lock

…

makeshift

…

maps

…

martial_arts

…

materials

Adds new full windows (#12434)

2021-09-17 12:36:40 +02:00

merchant

console stuff

2021-10-10 15:08:16 -03:00

mining

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

mob

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

modular_computers

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

multiz

…

nano

…

ntsl2

…

orbit

…

organs

Adds a new skrell subspecies: Axiori (#12511)

2021-09-28 08:02:07 +02:00

overmap

fixes

2021-10-19 02:41:56 -03:00

paperwork

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

power

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

projectiles

Equip-O-Matic (#12641)

2021-10-25 12:12:46 +02:00

psionics

…

random_map

…

reagents

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

recycling

Adds sensitive hearing (#12151)

2021-10-15 19:02:12 +02:00

research

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

scripting

…

security levels

…

shareddream

…

shieldgen

Multi-z shields (#12568)

2021-10-06 19:12:12 -03:00

shuttles

evil computer

2021-10-10 20:00:37 -03:00

spell_system

…

supermatter

Fix supermatter pointing glow (#12686)

2021-10-29 09:54:34 -03:00

surgery

fixes autopsy scanners only working on harm intent (#12574)

2021-10-02 18:58:46 -03:00

tables

Adds sensitive hearing (#12151)

2021-10-15 19:02:12 +02:00

telesci

console stuff

2021-10-10 15:08:16 -03:00

tgs

…

tooltip

…

turbolift

…

udp

…

vehicles

…

ventcrawl

…

vueui

…

web_interface

…

world_api

Ports Bay's updated evacuation controller and bluespace jump. (#12445)

2021-09-07 17:12:10 +02:00

xgm

…