Code

Floof Station Release V5#376

Code

Merged

Fansana merged 146 commits intostableFansana/floofstation1:stablefrom masterFansana/floofstation1:masterCopy head branch name to clipboardNov 24, 2024

+54,341-39,299

Commits

Commits on Sep 21, 2024

• Add "ingredient" tags to gas masks

  Show description for 6bff37c
  sarcoph

  committed
  6bff37c

• Add muffled gas mask prototypes

  Show description for 5601fd3
  sarcoph

  committed
  5601fd3

• Add crafting recipes to muffled gas masks

  sarcoph

  committed
  e2ee14d

• Add muffled gas mask to loadout

  Show description for 7590a0c
  sarcoph

  committed
  7590a0c

Commits on Sep 25, 2024

• Comment out components

  Show description for 4f0d5e3
  sarcoph

  committed
  4f0d5e3

Commits on Oct 23, 2024

• [Fix] Cybereyes No Longer Reveal Identity. (#1127)

  Show description for db40b86
  Remuchi

  authored
  db40b86

• Automatic Changelog Update (#1127)

  SimpleStation14

  committed
  b73d45e

• Feat: Port Delta-V Glimmer Wisps (#1125)

  Show description for dd9cdc1
  

  Mnemotechnician

  and

  deltanedas

  authored
  dd9cdc1

• Automatic Changelog Update (#1125)

  SimpleStation14

  committed
  85a770c

Commits on Oct 25, 2024

• Fix High Amplification Trait Being the Wildest Scam in Human History (#1137)

  Show description for 9923192
  Mnemotechnician

  authored
  9923192

• Automatic Changelog Update (#1137)

  SimpleStation14

  committed
  2509575

• Cherry Pick PR #30576 (#1135)

  Show description for ffcbdce
  

  3 peopleauthored
  ffcbdce

• [Fix] Added Missing Deflect Alert Locale (#1140)

  Show description for 518812b
  Remuchi

  authored
  518812b

• Fix Markup Tags in Station News (#30169) (#1116)

  Show description for 4f4f82f
  

  3 peopleauthored
  4f4f82f

• Automatic Changelog Update (#1140)

  SimpleStation14

  committed
  f6312a5

• Pyrokinetic Flare Power (#1138)

  Show description for 4b75f26
  VMSolidus

  authored
  4b75f26

• Penlight Repair (#1142)

  Show description for 3e1f540
  SleepyScarecrow

  authored
  3e1f540

• Automatic Changelog Update (#1138)

  SimpleStation14

  committed
  7579004

• Automatic Changelog Update (#1142)

  SimpleStation14

  committed
  dce01bc

Commits on Oct 27, 2024

• Updade RadStation (#1129)

  Show description for e46ed86
  Ichaie

  authored
  e46ed86

• Remove LPO Shuttle Recalling (#1143)

  Show description for 582a16e
  VMSolidus

  authored
  582a16e

• Automatic Changelog Update (#1129)

  SimpleStation14

  committed
  04afafd

• Automatic Changelog Update (#1143)

  SimpleStation14

  committed
  838a30f

• [Fix] Fixed Icons In Radial Menus (#1150)

  Show description for 306e479
  Remuchi

  authored
  306e479

• Automatic Changelog Update (#1150)

  SimpleStation14

  committed
  67ad09e

• [Feature] Clicking on Health Alerty Now Displays Health State (#1139)

  Show description for 7c8937a
  Remuchi

  authored
  7c8937a

• Automatic Changelog Update (#1139)

  SimpleStation14

  committed
  820cecc

• Trait Modify Factions (#955)

  Show description for 8e1a63c
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  8e1a63c

• [Feature] Telescopic Baton (#1144)

  Show description for 15e46cf
  

  Remuchi

  and

  VMSolidus

  authored
  15e46cf

• Automatic Changelog Update (#955)

  SimpleStation14

  committed
  9537278

• Automatic Changelog Update (#1144)

  SimpleStation14

  committed
  678875b

• Psionic Familiar System (#1146)

  Show description for cfcc4cb
  

  VMSolidus

  and

  Remuchi

  authored
  cfcc4cb

• Automatic Changelog Update (#1146)

  SimpleStation14

  committed
  2d9d4d4

• Update Credits (#1149)

  Show description for 18a38e8
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  18a38e8

Commits on Oct 28, 2024

• Properly Credit Contributors Who Were Truncated by GitHub API (#1153)

  Show description for 9a1661e
  

  DEATHB4DEFEAT

  and

  mirrorcult

  authored
  9a1661e

Commits on Oct 29, 2024

• Tweak Familiars (#1162)

  Show description for 88344bb
  VMSolidus

  authored
  88344bb

• Update Marish Language Description (#1160)

  Show description for 2b90e2a
  PlasmaRaptor

  authored
  2b90e2a

• Automatic Changelog Update (#1162)

  SimpleStation14

  committed
  cfd1737

• Clean Up/Change Default Rules (#1154)

  Show description for 6da7eab
  DEATHB4DEFEAT

  authored
  6da7eab

Commits on Nov 1, 2024

• Updade Gax (#1163)

  Show description for d2bdbec
  

  Ichaie

  and

  VMSolidus

  authored
  d2bdbec

• Automatic Changelog Update (#1163)

  SimpleStation14

  committed
  d6bb182

Commits on Nov 2, 2024

• Update Saltern (#1170)

  Show description for 523e17c
  VMSolidus

  authored
  523e17c

• Automatic Changelog Update (#1170)

  SimpleStation14

  committed
  dbaec26

• Add Uranium, Gold, And Silver To Cargo Menu (#1171)

  Show description for 9963e23
  VMSolidus

  authored
  9963e23

• Automatic Changelog Update (#1171)

  SimpleStation14

  committed
  7e565b2

• Voice Mask Refactor and Fixes (#1147)

  Show description for ed50485
  beck-thompson

  authored
  ed50485

• More Sec Loadout Guns (#1158)

  Show description for 9ecae9f
  VMSolidus

  authored
  9ecae9f

• Automatic Changelog Update (#1147)

  SimpleStation14

  committed
  377a88c

• Automatic Changelog Update (#1158)

  SimpleStation14

  committed
  97e0403

• Fixes Cocoons (#1169)

  Show description for 3bbcab8
  FoxxoTrystan

  authored
  3bbcab8

• Automatic Changelog Update (#1169)

  SimpleStation14

  committed
  c5a40ee

• Add New Sprites (#1174)

  Show description for b553ce9
  

  Ichaie

  and

  VMSolidus

  authored
  b553ce9

• Automatic Changelog Update (#1174)

  SimpleStation14

  committed
  903452b

• Syndicate Faction Comes From IFF Tags (#1176)

  Show description for f1f25d6
  VMSolidus

  authored
  f1f25d6

• Automatic Changelog Update (#1176)

  SimpleStation14

  committed
  b40918b

• Fix This Stupid Behavior (#1177)

  Show description for b7de623
  VMSolidus

  authored
  b7de623

• Automatic Changelog Update (#1177)

  SimpleStation14

  committed
  a6910bb

Commits on Nov 4, 2024

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  dc4a147

• Revert "Automatic Changelog Update (#1177)"

  Show description for 916647f
  Mnemotechnician

  committed
  916647f

• Revert "Fix This Stupid Behavior (#1177)"

  Show description for 406bda7
  Mnemotechnician

  committed
  406bda7

• Comment out the downfall of salvage

  Mnemotechnician

  committed
  ea2de09

• Revert "Automatic Changelog Update (#1171)"

  Show description for cce93eb
  Mnemotechnician

  committed
  cce93eb

• Merge branch 'master' of https://github.com/fansana/floofstation1 into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  ec87dc8

Commits on Nov 5, 2024

• Remove eeMigrations.yml, Remove deltaMigrations.yml, Remove frontierMigrations.yml -- Combine All Into eeMigration.yml (#1123)

  Show description for c58500a
  DangerRevolution

  authored
  c58500a

• Fix CanShuttle Not Preventing Recalls (#1180)

  Show description for b1e2e73
  VMSolidus

  authored
  b1e2e73

• Automatic Changelog Update (#1180)

  SimpleStation14

  committed
  bbe1f8f

• Robust Toolbolbox Version 227.0.0 (#1173)

  Show description for 53d12ac
  

  5 peopleauthored
  53d12ac

Commits on Nov 6, 2024

• There is no brigmedic on saltern.

  Show description for e94fa53
  Mnemotechnician

  authored
  e94fa53

• Merge branch 'master' of https://github.com/simple-station/einstein-engines into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  60c9e3f

• Merge remote-tracking branch 'origin-floofstation-fork/floof/selective-merge-2024-11-04' into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  c94dcf6

• Hopefully fix the submodule version

  Mnemotechnician

  committed
  272caa3

• Fix duplicate locale

  Mnemotechnician

  committed
  4a671a5

Commits on Nov 8, 2024

• God please tell me this is the last

  Mnemotechnician

  committed
  fc15cc6

• I shouldn't be changing this, WHY

  Mnemotechnician

  committed
  ce464ac

Commits on Nov 10, 2024

• Comment out the new sec loadout guns

  Mnemotechnician

  committed
  f5a36e2

Commits on Nov 12, 2024

• secmagboots overwrite

  ProphetCrow

  committed
  6d960bc

• Merge branch 'master' into muffled-gas-masks

  sarcoph

  authored
  f8d1cfa

Commits on Nov 14, 2024

• Merge branch 'Fansana:master' into secmagboots

  ProphetCrow

  authored
  b36de03

Commits on Nov 15, 2024

• HypnoTemp Plushies

  Show description for 66b2f4d
  Cprn-Sprkl

  committed
  66b2f4d

• Update HypnoTempPlushies.yml

  Show description for 8dbb298
  Cprn-Sprkl

  committed
  8dbb298

• Update Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml

  Show description for 3d1a6dd
  

  Cprn-Sprkl

  and

  FoxxoTrystan

  authored
  3d1a6dd

• Update Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml

  Show description for 701a1d3
  

  Cprn-Sprkl

  and

  FoxxoTrystan

  authored
  701a1d3

• Update Resources/Prototypes/Entities/Objects/Fun/prizeticket.yml

  Show description for 800671d
  

  Cprn-Sprkl

  and

  FoxxoTrystan

  authored
  800671d

• Update meta.json

  Show description for f3171c3
  Cprn-Sprkl

  committed
  f3171c3

• Merge branch 'Fansana:master' into secmagboots

  ProphetCrow

  authored
  974a402

Commits on Nov 16, 2024

• Merge branch 'Fansana:master' into secmagboots

  ProphetCrow

  authored
  70aad26

Commits on Nov 18, 2024

• Merge branch 'Fansana:master' into secmagboots

  ProphetCrow

  authored
  7284f2e

• add some wedding essentials

  Fansana

  committed
  1f97b99

• adding icons

  Fansana

  committed
  bb9dc24

• more ice creams and ingredient boxes

  Fansana

  committed
  afa1aa8

• make butter grindable

  Fansana

  committed
  557f728

• fix case

  Fansana

  committed
  1b4c2ec

• pipeline updates

  Fansana

  committed
  48e89df

Commits on Nov 19, 2024

• Allows Archnic's to talk to spiders

  VividPups

  committed
  add21fd

• Fix the silver crate name

  Mnemotechnician

  committed
  778abe1

• Merge pull request #364 from VividPups/Spider-talk

  Show description for ad9fcde
  FoxxoTrystan

  authored
  ad9fcde

• Automatic Changelog Update (#364)

  Floof-Station-Bot

  committed
  936723c

• Added HypnoTemp Plushies to the Prize Counter

  Cprn-Sprkl

  committed
  17b0e8d

• Merge pull request #362 from Fansana/more-icecream

  Show description for 43728cb
  Fansana

  authored
  43728cb

• Automatic Changelog Update (#362)

  Floof-Station-Bot

  committed
  f1f71d3

• does nobody read the code they PR? the fuck is this?

  Fansana

  committed
  fedf0c6

• Merge pull request #365 from Fansana/voicemask-fix-again-fucking-why

  Show description for 0efd87f
  Fansana

  authored
  0efd87f

• Automatic Changelog Update (#365)

  Floof-Station-Bot

  committed
  2b17689

• Merge branch 'master' into floof/selective-merge-2024-11-04

  Fansana

  authored
  ed674d3

Commits on Nov 20, 2024

• So fucking many documents

  Fansana

  committed
  4520006

• remove duplicate

  Fansana

  committed
  93d3b71

• Merge pull request #367 from Fansana/more-icecream

  Show description for 5a6fd02
  Fansana

  authored
  5a6fd02

• Merge branch 'master' into floof/selective-merge-2024-11-04

  Fansana

  committed
  0a8744e

• adjusted crates and prices

  Fansana

  committed
  e3bb7b5

• adjusted the prices a tad

  Fansana

  committed
  ecc69f3

• fill Janitor and bartender locker

  Fansana

  committed
  f13905d

• Fix PirateRadioSpawnRule heisentest.

  

  sleepyyapril

  authored and

  sleepyyapril

  committed
  2883506

• Fix engine-update-specific using.

  

  sleepyyapril

  authored and

  sleepyyapril

  committed
  ac22152

Commits on Nov 21, 2024

• Merge pull request #356 from Cprn-Sprkl/hypnotemp-plushies

  Show description for bc3b3ba
  FoxxoTrystan

  authored
  bc3b3ba

• Automatic Changelog Update (#356)

  Floof-Station-Bot

  committed
  3264762

Commits on Nov 22, 2024

• Update saltern.yml

  Fansana

  authored
  c5253fb

• fix BoundUserInterface

  Fansana

  committed
  bbdfecf

• Merge pull request #363 from Fansana/pipeline-update

  Show description for 4bcdb78
  Fansana

  authored
  4bcdb78

• Consent generated

  FoxxoTrystan

  committed
  6ceca24

• unless code

  FoxxoTrystan

  committed
  47a5a12

• Merge pull request #326 from Mnemotechnician/floof/selective-merge-2024-11-04

  Show description for ff5c44e
  Memeji

  authored
  ff5c44e

• Automatic Changelog Update (#326)

  Floof-Station-Bot

  committed
  fe28c98

• Merge pull request #370 from sleepyyapril/fix-heisentest

  Show description for 5a556be
  FoxxoTrystan

  authored
  5a556be

Commits on Nov 23, 2024

• Merge branch 'Fansana:master' into consent-fixes

  FoxxoTrystan

  authored
  48e8353

• fixes build

  FoxxoTrystan

  committed
  a19cfa3

• fixes

  FoxxoTrystan

  committed
  bbbb806

• ingore

  FoxxoTrystan

  committed
  3bbfd6c

• fixes?

  FoxxoTrystan

  committed
  e76362e

• orGroup fixes

  Show description for 2a16dd6
  Cprn-Sprkl

  committed
  2a16dd6

• Merge pull request #197 from sarcoph/muffled-gas-masks

  Show description for db1f58e
  Fansana

  authored
  db1f58e

• Automatic Changelog Update (#197)

  Floof-Station-Bot

  committed
  972c7d8

• add to vendors

  Fansana

  committed
  a28b285

• Merge pull request #361 from Fansana/wedding-essentials

  Show description for 80e0403
  Fansana

  authored
  80e0403

• Automatic Changelog Update (#361)

  Floof-Station-Bot

  committed
  8928cea

• Merge pull request #373 from FoxxoTrystan/consent-fixes

  Show description for 5c2b443
  Fansana

  authored
  5c2b443

• add templates to their folders

  Fansana

  committed
  1bc63bb

• fixes for various issues

  Fansana

  committed
  6aa31af

• add folders to cabinets

  Fansana

  committed
  595740b

• fix test

  Fansana

  committed
  e27e5a0

• fix action icon

  Fansana

  committed
  de9569f

• Merge pull request #366 from Fansana/paperwork-templates-the-rekoning

  Show description for c2d695c
  Memeji

  authored
  c2d695c

• Automatic Changelog Update (#366)

  Floof-Station-Bot

  committed
  60edab8

• Merge pull request #345 from ProphetCrow/secmagboots

  Show description for 2386612
  Memeji

  authored
  2386612

• Automatic Changelog Update (#345)

  Floof-Station-Bot

  committed
  7ae4d84

• Merge pull request #374 from Cprn-Sprkl/fix-item-group-locker-spawns

  Show description for e9f1a77
  Memeji

  authored
  e9f1a77

• Automatic Changelog Update (#374)

  Floof-Station-Bot

  committed
  0a2582d