Code

upstream merge#1636

Code

Merged

deltanedas merged 115 commits intoDeltaV-Station:masterDeltaV-Station/Delta-v:masterfrom deltanedas:upstream-opsdeltanedas/Delta-v:upstream-opsCopy head branch name to clipboardAug 18, 2024

+10,396-6,175

Commits

Commits on Aug 16, 2024

• uncomment grappling gun

  

  deltanedas

  committed
  fcfffeb

  Copy full SHA for fcfffeb

• Remove rest of Geras files (#30912)

  Show description for a7f6659
  

  Killerqu00

  authored and

  deltanedas

  committed
  a7f6659

  Copy full SHA for a7f6659

• tweak(AgeRequirement): Make the requiredAge more sensible (#30913)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  de03bed

  Copy full SHA for de03bed

• chrore(ageRequirement): fix grammar. atleast -> at least (#30914)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  e17d71d

  Copy full SHA for e17d71d

• Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918)

  Show description for 40115e1
  

  2 peopleauthored and

  deltanedas

  committed
  40115e1

  Copy full SHA for 40115e1

• Add execution component to all energy sword weapons (#30909)

  Show description for a5627e7
  

  2 peopleauthored and

  deltanedas

  committed
  a5627e7

  Copy full SHA for a5627e7

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  63fb1f2

  Copy full SHA for 63fb1f2

• chore(grammar): correct some mistakes (#30916)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  6f8f215

  Copy full SHA for 6f8f215

• Add diamond mining drills, buff regular mining drills (#30814)

  Show description for 0f3139b
  

  Blackern5000

  authored and

  deltanedas

  committed
  0f3139b

  Copy full SHA for 0f3139b

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  7635e35

  Copy full SHA for 7635e35

• give trash a reusable entity table (#30921)

  

  EmoGarbage404

  authored and

  deltanedas

  committed
  96a5e16

  Copy full SHA for 96a5e16

• Contraband marking & examining (#28688)

  Show description for 898fec4
  

  2 peopleauthored and

  deltanedas

  committed
  898fec4

  Copy full SHA for 898fec4

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  5f2aaf2

  Copy full SHA for 5f2aaf2

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  4b752d4

  Copy full SHA for 4b752d4

• Removes variant cube migration (#30934)

  Show description for f786519
  

  UbaserB

  authored and

  deltanedas

  committed
  f786519

  Copy full SHA for f786519

• First Review Pass Contraband Fixes (#30930)

  Show description for 5004c75
  

  Plykiya

  authored and

  deltanedas

  committed
  5004c75

  Copy full SHA for 5004c75

• Add conducting gloves to the maintenance loot table (#30904)

  Show description for bb0b89d
  

  UbaserB

  authored and

  deltanedas

  committed
  bb0b89d

  Copy full SHA for bb0b89d

• Fix DoDrop to DropNextTo in container cases (#30911)

  Show description for 4b324f7
  

  TokenStyle

  authored and

  deltanedas

  committed
  4b324f7

  Copy full SHA for 4b324f7

• Fix Reagent Fire Stacks (#30766)

  Show description for b3b0226
  

  Cojoke-dot

  authored and

  deltanedas

  committed
  b3b0226

  Copy full SHA for b3b0226

• Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954)

  Show description for 4b5ea78
  

  LeoSantich

  authored and

  deltanedas

  committed
  4b5ea78

  Copy full SHA for 4b5ea78

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  8a8146e

  Copy full SHA for 8a8146e

• Fix permission check for whitelists in player panel (#30948)

  

  nikthechampiongr

  authored and

  deltanedas

  committed
  fe939f9

  Copy full SHA for fe939f9

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  a1fa41e

  Copy full SHA for a1fa41e

• Grey mantle in winterdrobe (#29774)

  Show description for f30c332
  

  Sadie-silly

  authored and

  deltanedas

  committed
  f30c332

  Copy full SHA for f30c332

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  ccb631a

  Copy full SHA for ccb631a

• Sliceable doAfter (#30824)

  Show description for bb50a9c
  

  TheShuEd

  authored and

  deltanedas

  committed
  bb50a9c

  Copy full SHA for bb50a9c

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  469f3e3

  Copy full SHA for 469f3e3

• Add capfruit, a gatfruit mutation. (#30850)

  Show description for 5ed1394
  

  UbaserB

  authored and

  deltanedas

  committed
  5ed1394

  Copy full SHA for 5ed1394

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  820dcca

  Copy full SHA for 820dcca

• Fixes the grey mantle (#30971)

  Show description for 5b8a095
  

  Sadie-silly

  authored and

  deltanedas

  committed
  5b8a095

  Copy full SHA for 5b8a095

• Add keybinds for rotating and flipping objects (#30540)

  Show description for 6e692c8
  

  slarticodefast

  authored and

  deltanedas

  committed
  6e692c8

  Copy full SHA for 6e692c8

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  21dbf05

  Copy full SHA for 21dbf05

• tweak(Shuttle_honki): Remove DeviceQuantumSpinInverter from honki shuttle. (#30618)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  8654437

  Copy full SHA for 8654437

• Make the Borgs Names Appear When they Make an Announcement (#30107)

  Show description for bba1add
  

  Cojoke-dot

  authored and

  deltanedas

  committed
  bba1add

  Copy full SHA for bba1add

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  29da44e

  Copy full SHA for 29da44e

• disable contraband examine

  

  deltanedas

  committed
  5ab581b

  Copy full SHA for 5ab581b

• rename our SliceFoodEvent

  

  deltanedas

  committed
  ee2fa71

  Copy full SHA for ee2fa71

• Throngler Plushie Sprite (#30969)

  Show description for b461207
  

  PoorMansDreams

  authored and

  deltanedas

  committed
  b461207

  Copy full SHA for b461207

• Fix bug with rotating shelves (#30978)

  Show description for 9607f46
  

  IgorAnt028

  authored and

  deltanedas

  committed
  9607f46

  Copy full SHA for 9607f46

• No weather on concrete tiles (#30952)

  Show description for d1d1cc4
  

  NotSoDana

  authored and

  deltanedas

  committed
  d1d1cc4

  Copy full SHA for d1d1cc4

• development build ghostrole lottery changes (#30980)

  Show description for dc8edc0
  

  Errant-4

  authored and

  deltanedas

  committed
  dc8edc0

  Copy full SHA for dc8edc0

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  fc04c74

  Copy full SHA for fc04c74

• Add a saline syringe to the combat medical kit (#29954)

  Show description for c69edf2
  

  Blackern5000

  authored and

  deltanedas

  committed
  c69edf2

  Copy full SHA for c69edf2

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  c359c98

  Copy full SHA for c359c98

• fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)

  Show description for e04396e
  

  slarticodefast

  authored and

  deltanedas

  committed
  e04396e

  Copy full SHA for e04396e

• Custom Taco & Kebabs - FoodSequence 2 (#30905)

  Show description for de58d04
  

  2 peopleauthored and

  deltanedas

  committed
  de58d04

  Copy full SHA for de58d04

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  dc9e5d5

  Copy full SHA for dc9e5d5

• Fix popups not working properly with an eye offset (#30990)

  

  DrSmugleaf

  authored and

  deltanedas

  committed
  191fb8e

  Copy full SHA for 191fb8e

• Adds a random smokable spawner (#30870)

  Show description for a1b4a7d
  

  2 peopleauthored and

  deltanedas

  committed
  a1b4a7d

  Copy full SHA for a1b4a7d

• Fix lizards being unable to eat custom burgers (#31005)

  Show description for d745ba1
  

  themias

  authored and

  deltanedas

  committed
  d745ba1

  Copy full SHA for d745ba1

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  f97518f

  Copy full SHA for f97518f

• Sedin (#27110)

  Show description for b5a1e8a
  

  Erisfiregamer1

  authored and

  deltanedas

  committed
  b5a1e8a

  Copy full SHA for b5a1e8a

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  6921b40

  Copy full SHA for 6921b40

• Adds a Dinky Star Sticker for security officers (#29767)

  Show description for cd252fc
  

  PoorMansDreams

  authored and

  deltanedas

  committed
  cd252fc

  Copy full SHA for cd252fc

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  3d81d56

  Copy full SHA for 3d81d56

• tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  67582e5

  Copy full SHA for 67582e5

• tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)

  

  Brandon-Huu

  authored and

  deltanedas

  committed
  dcc1244

  Copy full SHA for dcc1244

• replace mapped diamond stacks with single

  

  deltanedas

  committed
  df304ec

  Copy full SHA for df304ec

• Figurine voicelines (#30865)

  Show description for ebf4193
  

  2 peopleauthored and

  deltanedas

  committed
  ebf4193

  Copy full SHA for ebf4193

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  586de6d

  Copy full SHA for 586de6d

• Adding shock collar and electropack (#30529)

  Show description for 99cbfdd
  

  2 peopleauthored and

  deltanedas

  committed
  99cbfdd

  Copy full SHA for 99cbfdd

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  8d5335f

  Copy full SHA for 8d5335f

• Greatly improve the usability of the Gas Analyzer. (#30763)

  Show description for d6a19c8
  

  Mervill

  authored and

  deltanedas

  committed
  d6a19c8

  Copy full SHA for d6a19c8

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  8e463b6

  Copy full SHA for 8e463b6

• Fix false and true in player-panel.ftl (#31043)

  Show description for efa6ab7
  

  IgorAnt028

  authored and

  deltanedas

  committed
  efa6ab7

  Copy full SHA for efa6ab7

• Contra Review Passs - Round 2 (#30942)

  Show description for 7b28fde
  

  Plykiya

  authored and

  deltanedas

  committed
  7b28fde

  Copy full SHA for 7b28fde

• Namespace cleanup around Mind Roles (#30965)

  Show description for f742d84
  

  2 peopleauthored and

  deltanedas

  committed
  f742d84

  Copy full SHA for f742d84

• Contraband Review Pass - The Threequel (#30970)

  Show description for 54dfc22
  

  Plykiya

  authored and

  deltanedas

  committed
  54dfc22

  Copy full SHA for 54dfc22

• Golden toilet (#31049)

  Show description for 431ba01
  

  Nimfar11

  authored and

  deltanedas

  committed
  431ba01

  Copy full SHA for 431ba01

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  d945180

  Copy full SHA for d945180

• Salvage Spawners (#31020)

  Show description for ef86c90
  

  EmoGarbage404

  authored and

  deltanedas

  committed
  ef86c90

  Copy full SHA for ef86c90

• remove nyano shock collar code

  

  deltanedas

  committed
  1954da8

  Copy full SHA for 1954da8

• Event scheduler setting tweaks (#31018)

  Show description for 1d80ddb
  

  IProduceWidgets

  authored and

  deltanedas

  committed
  1d80ddb

  Copy full SHA for 1d80ddb

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  6df14bc

  Copy full SHA for 6df14bc

• remove meteor swarms rule for a moment

  

  deltanedas

  committed
  d616c5b

  Copy full SHA for d616c5b

• Revamped Meteor Swarm (#28974)

  Show description for 232670e
  

  EmoGarbage404

  authored and

  deltanedas

  committed
  232670e

  Copy full SHA for 232670e

• Missing meteor presets (#29044)

  Show description for 267c7bc
  

  EmoGarbage404

  authored and

  deltanedas

  committed
  267c7bc

  Copy full SHA for 267c7bc

• Meteors now leave behind a bit of ore (#30419)

  Show description for bc8a0ef
  

  2 peopleauthored and

  deltanedas

  committed
  bc8a0ef

  Copy full SHA for bc8a0ef

• refactor event schedulers to use explicit game rules (#29320)

  Show description for a971975
  

  IProduceWidgets

  authored and

  deltanedas

  committed
  a971975

  Copy full SHA for a971975

• Event scheduler setting tweaks (#31018)

  Show description for 2e4c249
  

  IProduceWidgets

  authored and

  deltanedas

  committed
  2e4c249

  Copy full SHA for 2e4c249

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  6634cd1

  Copy full SHA for 6634cd1

• remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)

  Show description for a360a7c
  

  Brandon-Huu

  authored and

  deltanedas

  committed
  a360a7c

  Copy full SHA for a360a7c

• Fix bug with holding objects (#31009)

  Show description for ebe56a4
  

  IgorAnt028

  authored and

  deltanedas

  committed
  ebe56a4

  Copy full SHA for ebe56a4

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  bf036a2

  Copy full SHA for bf036a2

• Replace obsolete map functions in IconSmoothSystem (#30958)

  Show description for 7f7f3ce
  

  Mervill

  authored and

  deltanedas

  committed
  7f7f3ce

  Copy full SHA for 7f7f3ce

• Automatic changelog update

  

  PJBot

  authored and

  deltanedas

  committed
  15757e7

  Copy full SHA for 15757e7

• Fix reagents with ReagentData being duplicated (#30983)

  Show description for 1ecb9ce
  

  SlamBamActionman

  authored and

  deltanedas

  committed
  1ecb9ce

  Copy full SHA for 1ecb9ce

• 

  

  deltanedas

  committed
  b660f08

  Copy full SHA for b660f08

• 

  

  deltanedas

  committed
  c09f1b4

  Copy full SHA for c09f1b4

• actually untroll

  

  deltanedas

  committed
  8c4caeb

  Copy full SHA for 8c4caeb

• a

  

  deltanedas

  committed
  ef8abb9

  Copy full SHA for ef8abb9

• 50 burger

  

  deltanedas

  committed
  7dfd820

  Copy full SHA for 7dfd820

• add back old meteor code

  

  deltanedas

  committed
  9a52e40

  Copy full SHA for 9a52e40

• fix

  

  deltanedas

  committed
  4a9fc13

  Copy full SHA for 4a9fc13

• use some live config options in dev

  

  deltanedas

  committed
  2407352

  Copy full SHA for 2407352

• remove old shock collar icon

  

  deltanedas

  committed
  13d2699

  Copy full SHA for 13d2699

• make ammo more consistent and work more

  

  deltanedas

  committed
  8776729

  Copy full SHA for 8776729

• clean up lathes diff to upstream

  

  Cojoke-dot

  authored and

  deltanedas

  committed
  d32b0cb

  Copy full SHA for d32b0cb

• a

  

  deltanedas

  committed
  2b2be95

  Copy full SHA for 2b2be95

• move rubber bullets to deltav folder

  

  Plykiya

  authored and

  deltanedas

  committed
  f3b1b03

  Copy full SHA for f3b1b03

• a

  

  deltanedas

  committed
  93135c5

  Copy full SHA for 93135c5

• untroll

  

  deltanedas

  committed
  088b17c

  Copy full SHA for 088b17c

Commits on Aug 17, 2024

• more untrolls

  

  deltanedas

  committed
  c7f16e2

  Copy full SHA for c7f16e2

• more untrolls

  

  deltanedas

  committed
  6fe6e2b

  Copy full SHA for 6fe6e2b

• untroll

  

  deltanedas

  committed
  c00ed51

  Copy full SHA for c00ed51

• 

  

  deltanedas

  committed
  3f63c0d

  Copy full SHA for 3f63c0d

Commits on Aug 18, 2024

• a

  

  deltanedas

  committed
  80e4cc6

  Copy full SHA for 80e4cc6

• b

  

  deltanedas

  committed
  4ac8594

  Copy full SHA for 4ac8594

• remove it for real

  

  deltanedas

  committed
  f65ddec

  Copy full SHA for f65ddec

• add missing lathe recipes

  

  deltanedas

  committed
  adfff32

  Copy full SHA for adfff32

• replace cvars with component field

  

  deltanedas

  committed
  85b8e1e

  Copy full SHA for 85b8e1e

• remove taco from roboisseur

  

  deltanedas

  committed
  584669f

  Copy full SHA for 584669f

• migrate cardboard box with smg mags

  

  deltanedas

  committed
  7fa1776

  Copy full SHA for 7fa1776

• remove kebabs

  

  deltanedas

  committed
  ed345f2

  Copy full SHA for ed345f2

• a

  

  deltanedas

  committed
  f2e417c

  Copy full SHA for f2e417c