Code

Merge Upstream#56

Code

Merged

Aidenkrz merged 128 commits intoGoob-Station:masterGoob-Station/Goob-Station-MRP:masterfrom Aidenkrz:mergeupstreamAidenkrz/Doob-Station-MRP:mergeupstreamCopy head branch name to clipboardJan 17, 2025

+27,094-13,113

Commits

Commits on Jan 13, 2025

• AddTraitSpecial (#1528)

  Show description for bc0708a
  Peptide90

  authored
  bc0708a

  Copy full SHA for bc0708a

Commits on Jan 14, 2025

• Fix NTR Stamp Icon On Paper & Fix Job IDs (#1534)

  Show description for 7769002
  CerberusWolfie

  authored
  7769002

  Copy full SHA for 7769002

• Automatic Changelog Update (#1534)

  SimpleStation14

  committed
  8b74710

  Copy full SHA for 8b74710

• Station AI Features and Fixes (Also General Fixes) (#1525)

  Show description for 3e8a7d9
  

  7 peopleauthored
  3e8a7d9

  Copy full SHA for 3e8a7d9

• Automatic Changelog Update (#1525)

  SimpleStation14

  committed
  b87cbad

  Copy full SHA for b87cbad

• FTL Fixes (#1539)

  Show description for cc85824
  

  6 peopleauthored
  cc85824

  Copy full SHA for cc85824

• Automatic Changelog Update (#1539)

  SimpleStation14

  committed
  90db21a

  Copy full SHA for 90db21a

• Fix Server Crash on Shutdown Due to DB Notifications (#31379) (#1542)

  Show description for da14cfe
  

  sleepyyapril

  and

  PJB3005

  authored
  da14cfe

  Copy full SHA for da14cfe

• Fix cargo job title not showing up

  sleepyyapril

  committed
  1b7d42e

  Copy full SHA for 1b7d42e

• Fixed portal artifacts targeting the Ai (#32677)

  Show description for 5f464fc
  

  2 peopleauthored and

  sleepyyapril

  committed
  5f464fc

  Copy full SHA for 5f464fc

• Add outerclothing as identity blocker

  sleepyyapril

  committed
  83d68bf

  Copy full SHA for 83d68bf

• Fix layout on wires UI (#33714)

  Show description for 7318cfb
  

  PJB3005

  authored and

  sleepyyapril

  committed
  7318cfb

  Copy full SHA for 7318cfb

• Allow ai to understand if its handcuffed. (#30402)

  Show description for 6bcdd23
  

  IProduceWidgets

  authored and

  sleepyyapril

  committed
  6bcdd23

  Copy full SHA for 6bcdd23

• Reorder priorities in MeleeCombatCompound (#30066)

  Show description for cf121be
  

  osjarw

  authored and

  sleepyyapril

  committed
  cf121be

  Copy full SHA for cf121be

• ai stays seated and pulled while cuffed. (#30397)

  Show description for 57c3a28
  

  IProduceWidgets

  authored and

  sleepyyapril

  committed
  57c3a28

  Copy full SHA for 57c3a28

• Sprite Movement working with AI movement (#33494)

  Show description for f9ac956
  

  TheShuEd

  authored and

  sleepyyapril

  committed
  f9ac956

  Copy full SHA for f9ac956

• Fix null exceptions in SurveillanceCameraMonitorSystem (#29275)

  Show description for 0cd85d0
  

  Tayrtahn

  authored and

  sleepyyapril

  committed
  0cd85d0

  Copy full SHA for 0cd85d0

• decouple ItemToggle from PowerCellDraw (#31392)

  Show description for e91fb14
  

  deltanedas

  authored and

  sleepyyapril

  committed
  e91fb14

  Copy full SHA for e91fb14

• Fix defibs draining battery when turned off (#31593)

  

  themias

  authored and

  sleepyyapril

  committed
  a17969f

  Copy full SHA for a17969f

• ItemToggle + slots stuff (#31312)

  Show description for fa2fed1
  

  slarticodefast

  authored and

  sleepyyapril

  committed
  fa2fed1

  Copy full SHA for fa2fed1

• Fix energy shield visuals (#31619)

  Show description for 251a21d
  

  slarticodefast

  authored and

  sleepyyapril

  committed
  251a21d

  Copy full SHA for 251a21d

• Fix PDA resolve error

  sleepyyapril

  committed
  1343d73

  Copy full SHA for 1343d73

• Fix random bark

  sleepyyapril

  committed
  04406f6

  Copy full SHA for 04406f6

• Update MoverController.cs to not use Component.Owner (#29965)

  Show description for 5bb56c0
  

  2 peopleauthored and

  sleepyyapril

  committed
  5bb56c0

  Copy full SHA for 5bb56c0

• Fix errors

  sleepyyapril

  committed
  7df15b2

  Copy full SHA for 7df15b2

• Device-list limiting (#30997)

  Show description for 943982d
  

  2 peopleauthored and

  sleepyyapril

  committed
  943982d

  Copy full SHA for 943982d

• Fix more test fails

  sleepyyapril

  committed
  99423d8

  Copy full SHA for 99423d8

• hm

  sleepyyapril

  committed
  962b841

  Copy full SHA for 962b841

• More General Fixes (#1547)

  Show description for bed3627
  sleepyyapril

  authored
  bed3627

  Copy full SHA for bed3627

• Automatic Changelog Update (#1547)

  SimpleStation14

  committed
  cfc6e0e

  Copy full SHA for cfc6e0e

Commits on Jan 15, 2025

• Space Wind Version 3 (#1537)

  Show description for a8cb5a9
  VMSolidus

  authored
  a8cb5a9

  Copy full SHA for a8cb5a9

• Automatic Changelog Update (#1537)

  SimpleStation14

  committed
  7428cd8

  Copy full SHA for 7428cd8

• Small Space Wind Optimization Hotfix (#1550)

  Show description for 6584a62
  VMSolidus

  authored
  6584a62

  Copy full SHA for 6584a62

• Assay Power Hotfix (#1551)

  Show description for 94e33f4
  VMSolidus

  authored
  94e33f4

  Copy full SHA for 94e33f4

• Automatic Changelog Update (#1551)

  SimpleStation14

  committed
  76dfa63

  Copy full SHA for 76dfa63

• Update README.md (#1543)

  Show description for c8a6209
  sleepyyapril

  authored
  c8a6209

  Copy full SHA for c8a6209

• Ports "Fix animation looping bugs" from wizden.

  spess-empyrean

  committed
  a1b588f

  Copy full SHA for a1b588f

• Ports "Refactor LightBehaviorSystem" from wizden

  spess-empyrean

  committed
  182820f

  Copy full SHA for 182820f

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into ee_lighting_fix

  spess-empyrean

  committed
  a786840

  Copy full SHA for a786840

• Meta Station with Holopads (#1553)

  Show description for 571813b
  Mike32oz

  authored
  571813b

  Copy full SHA for 571813b

• Automatic Changelog Update (#1553)

  SimpleStation14

  committed
  94291c4

  Copy full SHA for 94291c4

• Extend Access for NTR & BSO (#1544)

  Show description for 35c1651
  

  astriloqua

  and

  sleepyyapril

  authored
  35c1651

  Copy full SHA for 35c1651

• Automatic Changelog Update (#1544)

  SimpleStation14

  committed
  cec1560

  Copy full SHA for cec1560

• Increases .35 Mag Size From 10 to 12 (#1532)

  Show description for 36a3938
  BlueHNT

  authored
  36a3938

  Copy full SHA for 36a3938

• Automatic Changelog Update (#1532)

  SimpleStation14

  committed
  a58fdc5

  Copy full SHA for a58fdc5

• Fix Night Vision (#1554)

  Show description for 03b7a8a
  

  3 peopleauthored
  03b7a8a

  Copy full SHA for 03b7a8a

• Automatic Changelog Update (#1554)

  SimpleStation14

  committed
  5f56086

  Copy full SHA for 5f56086

• NVS Gax Update: TEG 100% Real (#1517)

  Show description for 9f707b6
  Ichaie

  authored
  9f707b6

  Copy full SHA for 9f707b6

• Automatic Changelog Update (#1517)

  SimpleStation14

  committed
  1b131c6

  Copy full SHA for 1b131c6

• Label Rendering For Vending Machines and Item Preferences Menus (#1538)

  Show description for f0f9512
  NeLepus

  authored
  f0f9512

  Copy full SHA for f0f9512

• Automatic Changelog Update (#1538)

  SimpleStation14

  committed
  1f1e3b4

  Copy full SHA for 1f1e3b4

• Update Robust Toolbox to v239.0.1 (#1555)

  Piras314

  authored
  5273504

  Copy full SHA for 5273504

• Automatic Changelog Update (#1555)

  SimpleStation14

  committed
  23c225e

  Copy full SHA for 23c225e

• Apply suggestions from code review

  Show description for 1885d33
  

  spess-empyrean

  and

  VMSolidus

  authored
  1885d33

  Copy full SHA for 1885d33

Commits on Jan 16, 2025

• Fix Even More Issues (#1559)

  Show description for 0f51c37
  

  3 peopleauthored
  0f51c37

  Copy full SHA for 0f51c37

• Automatic Changelog Update (#1559)

  SimpleStation14

  committed
  b037172

  Copy full SHA for b037172

• Add Security Officer Playtime Requirement (#1561)

  Show description for 0b1fcbe
  CerberusWolfie

  authored
  0b1fcbe

  Copy full SHA for 0b1fcbe

• Automatic Changelog Update (#1561)

  SimpleStation14

  committed
  dc1406d

  Copy full SHA for dc1406d

• Fix Big Security Glasses Not Having HUD (#1557)

  Show description for 759299a
  angelofallars

  authored
  759299a

  Copy full SHA for 759299a

• Automatic Changelog Update (#1557)

  SimpleStation14

  committed
  78347d7

  Copy full SHA for 78347d7

• increase brain eat delay and show popup when trying to eat brain

  angelofallars

  committed
  5585783

  Copy full SHA for 5585783

• add popup for eat success

  angelofallars

  committed
  dd5ee5a

  Copy full SHA for dd5ee5a

• Fix a funny bug trying to send popup into food instead of target

  angelofallars

  committed
  c809316

  Copy full SHA for c809316

• Merge branch 'master' into brain-eat-delay

  angelofallars

  authored
  fd916a7

  Copy full SHA for fd916a7

• add movement cost to plastic flaps

  angelofallars

  committed
  36a9789

  Copy full SHA for 36a9789

• Fix Ripley control panel (#30325)

  

  themias

  authored and

  sleepyyapril

  committed
  3fa788c

  Copy full SHA for 3fa788c

• Make small clamp use 2% battery instead of recharging 2% battery. (#32320)

  Show description for 672c537
  

  2 peopleauthored and

  sleepyyapril

  committed
  672c537

  Copy full SHA for 672c537

• fix voice mask chameleon menu (#32546)

  

  slarticodefast

  authored and

  sleepyyapril

  committed
  3d6c151

  Copy full SHA for 3d6c151

• Wires ui tooltip localization (#32284)

  Show description for 5cf5f89
  

  chavonadelal

  authored and

  sleepyyapril

  committed
  5cf5f89

  Copy full SHA for 5cf5f89

• Fix ACC wire light not appearing (#30453)

  

  themias

  authored and

  sleepyyapril

  committed
  aae8852

  Copy full SHA for aae8852

• UI improvements for holopads (#34055)

  Show description for 2b170b8
  

  chromiumboy

  authored and

  sleepyyapril

  committed
  2b170b8

  Copy full SHA for 2b170b8

• Holopads no longer log broadcasted speech and emotes in the chat (#34114)

  Show description for ee12c0f
  

  chromiumboy

  authored and

  sleepyyapril

  committed
  ee12c0f

  Copy full SHA for ee12c0f

• Fix layout on wires UI (#33714)

  Show description for e2de644
  

  chromiumboy

  authored and

  sleepyyapril

  committed
  e2de644

  Copy full SHA for e2de644

• Crayons buffed to 45 uses (#32061)

  Show description for 2f763f7
  

  2 peopleauthored and

  sleepyyapril

  committed
  2f763f7

  Copy full SHA for 2f763f7

• fix crayon (#30263)

  Show description for 882ce26
  

  2 peopleauthored and

  sleepyyapril

  committed
  882ce26

  Copy full SHA for 882ce26

• Improve crayon UI to not be stuck in 1996 (#33101)

  Show description for 26ffe94
  

  SaphireLattice

  authored and

  sleepyyapril

  committed
  26ffe94

  Copy full SHA for 26ffe94

• fix bloodred boots (#20309)

  

  Ilya246

  authored and

  sleepyyapril

  committed
  4f863f0

  Copy full SHA for 4f863f0

• Fix all prisoner/AI/borg spawnpoint issues

  sleepyyapril

  committed
  a8537eb

  Copy full SHA for a8537eb

• Sort crayons properly.

  sleepyyapril

  committed
  3f0f797

  Copy full SHA for 3f0f797

• !

  sleepyyapril

  committed
  e1bf09b

  Copy full SHA for e1bf09b

• Speech is relayed by holopad holograms (#33978)

  Show description for 25c1da6
  

  chromiumboy

  authored and

  sleepyyapril

  committed
  25c1da6

  Copy full SHA for 25c1da6

• Imports

  sleepyyapril

  committed
  3efbb58

  Copy full SHA for 3efbb58

• No base

  sleepyyapril

  committed
  ded7a46

  Copy full SHA for ded7a46

• Remove extra whitespace

  sleepyyapril

  committed
  4a6b71d

  Copy full SHA for 4a6b71d

• Fix YML fail due to outdated UserInterfaceComponent

  sleepyyapril

  committed
  04d0d4a

  Copy full SHA for 04d0d4a

• fix borg ui mispredict opening (#28305)

  Show description for e4094b1
  

  EmoGarbage404

  authored and

  sleepyyapril

  committed
  e4094b1

  Copy full SHA for e4094b1

• Fix yml

  sleepyyapril

  committed
  8a375c6

  Copy full SHA for 8a375c6

• Add popup to ActivatableUIRequiresPanel

  sleepyyapril

  committed
  303d94d

  Copy full SHA for 303d94d

Commits on Jan 17, 2025

• increasse flaps slow even more

  angelofallars

  committed
  f2c01dc

  Copy full SHA for f2c01dc

• Fix popup prediction

  sleepyyapril

  committed
  662ad8a

  Copy full SHA for 662ad8a

• Arachne Standing Up Fix (#1571)

  Show description for 0c6ff00
  angelofallars

  authored
  0c6ff00

  Copy full SHA for 0c6ff00

• Automatic Changelog Update (#1571)

  SimpleStation14

  committed
  b07d6e1

  Copy full SHA for b07d6e1

• Even Even More Fixes (#1572)

  Show description for ed98c3a
  sleepyyapril

  authored
  ed98c3a

  Copy full SHA for ed98c3a

• Automatic Changelog Update (#1572)

  SimpleStation14

  committed
  7ce8023

  Copy full SHA for 7ce8023

• Ports Fixes to some Looping Systems, LightBehaviorSystem Refactor From Wizden (#1552)

  Show description for ea9f7cb
  VMSolidus

  authored
  ea9f7cb

  Copy full SHA for ea9f7cb

• Automatic Changelog Update (#1552)

  SimpleStation14

  committed
  b49b960

  Copy full SHA for b49b960

• update trait examples for slips/difficult terrain

  angelofallars

  committed
  ed5e26b

  Copy full SHA for ed5e26b

• Update Content.Server/Nutrition/Components/FoodComponent.cs

  Show description for 354da0e
  

  angelofallars

  and

  VMSolidus

  authored
  354da0e

  Copy full SHA for 354da0e

• Merge branch 'master' into flaps-movement-slow

  angelofallars

  authored
  5b6f15a

  Copy full SHA for 5b6f15a

• Add Plastic Flaps Movement Slow (#1573)

  Show description for d965c73
  VMSolidus

  authored
  d965c73

  Copy full SHA for d965c73

• [Shitmed] Increase Brain Eating Time & Show Brain Eating Popup (#1563)

  Show description for 536deb6
  VMSolidus

  authored
  536deb6

  Copy full SHA for 536deb6

• Automatic Changelog Update (#1573)

  SimpleStation14

  committed
  89101e3

  Copy full SHA for 89101e3

• Automatic Changelog Update (#1563)

  SimpleStation14

  committed
  3a1c2dd

  Copy full SHA for 3a1c2dd

• Glimmer Rework 1: "Swingy Glimmer" (#1480)

  Show description for 638071c
  VMSolidus

  authored
  638071c

  Copy full SHA for 638071c

• Automatic Changelog Update (#1480)

  SimpleStation14

  committed
  b56f123

  Copy full SHA for b56f123

• Modular Computer System (#1556)

  Show description for 08154a9
  

  3 peopleauthored
  08154a9

  Copy full SHA for 08154a9

• Automatic Changelog Update (#1556)

  SimpleStation14

  committed
  d185170

  Copy full SHA for d185170

• Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs (#1560)

  Show description for 6c43d00
  angelofallars

  authored
  6c43d00

  Copy full SHA for 6c43d00

• Automatic Changelog Update (#1560)

  SimpleStation14

  committed
  b5403ba

  Copy full SHA for b5403ba

• Handheld Frequencies (#1574)

  Show description for 19a350f
  

  sleepyyapril

  and

  whatston3

  authored
  19a350f

  Copy full SHA for 19a350f

• Automatic Changelog Update (#1574)

  SimpleStation14

  committed
  ae63a45

  Copy full SHA for ae63a45

• Lobby Background Credits (#1558)

  Show description for 86f9dfd
  

  Piras314

  and

  VMSolidus

  authored
  86f9dfd

  Copy full SHA for 86f9dfd

• Automatic Changelog Update (#1558)

  SimpleStation14

  committed
  b1162a3

  Copy full SHA for b1162a3

• Downstream Port (#1509)

  Show description for a9f7fe8
  

  6 peopleauthored
  a9f7fe8

  Copy full SHA for a9f7fe8

• Automatic Changelog Update (#1509)

  SimpleStation14

  committed
  5acb331

  Copy full SHA for 5acb331

• IPC Facial Hair (#1575)

  Show description for 00064a6
  angelofallars

  authored
  00064a6

  Copy full SHA for 00064a6

• Automatic Changelog Update (#1575)

  SimpleStation14

  committed
  58edabd

  Copy full SHA for 58edabd

• Remove All Usages of DepartmentTimeRequirement (#1576)

  Show description for e29ee86
  sleepyyapril

  authored
  e29ee86

  Copy full SHA for e29ee86

• Make Loadout Firearms Comply With Space Law (#1522)

  Show description for 5990b03
  VMSolidus

  authored
  5990b03

  Copy full SHA for 5990b03

• Alternative Bunny Ears (#1577)

  Show description for 5d1dbe4
  angelofallars

  authored
  5d1dbe4

  Copy full SHA for 5d1dbe4

• Automatic Changelog Update (#1577)

  SimpleStation14

  committed
  7bf3692

  Copy full SHA for 7bf3692

• Fix Mining Drills & Reduce Stamina Cost (#1579)

  Show description for 64c1196
  angelofallars

  authored
  64c1196

  Copy full SHA for 64c1196

• Automatic Changelog Update (#1579)

  SimpleStation14

  committed
  cc1cf10

  Copy full SHA for cc1cf10

• Add Magistrate, Dignitary Department, and Minor FTL Fixes (#1536)

  Show description for b8a4870
  

  CerberusWolfie

  and

  sleepyyapril

  authored
  b8a4870

  Copy full SHA for b8a4870

• Automatic Changelog Update (#1536)

  SimpleStation14

  committed
  eefa06d

  Copy full SHA for eefa06d

• Vigor Buff & Lethargy Nerf (#1578)

  Show description for b338f1b
  angelofallars

  authored
  b338f1b

  Copy full SHA for b338f1b

• Automatic Changelog Update (#1578)

  SimpleStation14

  committed
  0ba8772

  Copy full SHA for 0ba8772

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into mergeupstream

  Aidenkrz

  committed
  9f6171c

  Copy full SHA for 9f6171c