Code

Floofstation Release V13#514

Code

Closed

FoxxoTrystan wants to merge 124 commits intoFansana:stableFansana/floofstation1:stablefrom FoxxoTrystan:Stable-V13FoxxoTrystan/floofstation1:Stable-V13Copy head branch name to clipboard

+25,967-6,268

Commits

Commits on Nov 17, 2024

• Shitmed: Implementing Existing Newmed Code Into SS14 (#1159)

  Show description for 029b763
  

  4 peopleauthored
  029b763

  Copy full SHA for 029b763

• Automatic Changelog Update (#1159)

  SimpleStation14

  committed
  ea9a076

  Copy full SHA for ea9a076

• Update Credits (#1235)

  Show description for bdbc394
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  bdbc394

  Copy full SHA for bdbc394

• Mass Engine Update (#1220)

  Show description for f95774b
  

  12 peopleauthored
  f95774b

  Copy full SHA for f95774b

• Pirate Radio Heisentest Fix (#1225)

  Show description for bf6019f
  VMSolidus

  authored
  bf6019f

  Copy full SHA for bf6019f

• Fix Loadout Subcategories Not Being Found (#1233)

  DEATHB4DEFEAT

  authored
  2eea0f7

  Copy full SHA for 2eea0f7

Commits on Nov 18, 2024

• Hotfix Stamina System (#1245)

  Show description for bea5f13
  sleepyyapril

  authored
  bea5f13

  Copy full SHA for bea5f13

• Automatic Changelog Update (#1245)

  SimpleStation14

  committed
  3f8194a

  Copy full SHA for 3f8194a

• Day/Night Time Cycle For Maps (#1234)

  Show description for ab0fa7c
  DocNITE

  authored
  ab0fa7c

  Copy full SHA for ab0fa7c

• Automatic Changelog Update (#1234)

  SimpleStation14

  committed
  460f444

  Copy full SHA for 460f444

• Shitmed Update 1 (#1240)

  Show description for 860d7c6
  

  4 peopleauthored
  860d7c6

  Copy full SHA for 860d7c6

• Automatic Changelog Update (#1240)

  SimpleStation14

  committed
  eb0121f

  Copy full SHA for eb0121f

• Fix Self-Aware Crashing Client (#1247)

  Show description for aec89a5
  angelofallars

  authored
  aec89a5

  Copy full SHA for aec89a5

• Automatic Changelog Update (#1247)

  SimpleStation14

  committed
  ddee61c

  Copy full SHA for ddee61c

• Shitmed Surgery Popups (#1241)

  Show description for bb13e39
  angelofallars

  authored
  bb13e39

  Copy full SHA for bb13e39

• AlertsComponentTest Fix (#1246)

  Show description for 59d2695
  sleepyyapril

  authored
  59d2695

  Copy full SHA for 59d2695

• Automatic Changelog Update (#1241)

  SimpleStation14

  committed
  4fe41ef

  Copy full SHA for 4fe41ef

Commits on Dec 16, 2024

• Extra Slime Marking

  Show description for e3b0299
  ItsDzordz

  committed
  e3b0299

  Copy full SHA for e3b0299

• Quick patch

  Show description for c1dbc64
  ItsDzordz

  committed
  c1dbc64

  Copy full SHA for c1dbc64

Commits on Jan 5, 2025

• Merge branch 'master' into Slime-Marking

  Fansana

  committed
  4f3efa1

  Copy full SHA for 4f3efa1

• remove duplicate

  Fansana

  committed
  90ba8a0

  Copy full SHA for 90ba8a0

• actually remove the right duplicate

  Fansana

  committed
  b001839

  Copy full SHA for b001839

Commits on Jan 13, 2025

• Merge commit 'ea9a07616fb2b419e89811fa2f753a19aee0da73' into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  1170399

  Copy full SHA for 1170399

• Merge commit 'bdbc394a8ee4599ab783e83047abf9fa4db6bec8' into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  0fd837f

  Copy full SHA for 0fd837f

• Merge commit 'f95774b3ce4300012b8dbaa60829499ba6a68203' into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  8a64e87

  Copy full SHA for 8a64e87

• Migrate Floofstation rules to the new format

  Mnemotechnician

  committed
  d2f8b9d

  Copy full SHA for d2f8b9d

• Migrate old StorageFills to the new EntityTableContainerFill

  Mnemotechnician

  committed
  3ee02e9

  Copy full SHA for 3ee02e9

• -- Marker: compiles & runs with a few bugs --

  Mnemotechnician

  committed
  36df059

  Copy full SHA for 36df059

• Merge commit '3f8194a879035866199771121262e7ffca3ae2ae' into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  6a511ab

  Copy full SHA for 6a511ab

• Merge commit '4fe41eff5edd756aea6899e94f8637607dfec456' into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  0d7d3ce

  Copy full SHA for 0d7d3ce

• Mass Bug Fixing (#1256)

  Show description for 4d3ecb6
  

  sleepyyapril

  authored and

  Mnemotechnician

  committed
  4d3ecb6

  Copy full SHA for 4d3ecb6

• Buff Medical Due to Shitmed Changes Cherry-Pick (#1259)

  Show description for ad3f4dd
  

  Tmanzxd

  authored and

  Mnemotechnician

  committed
  ad3f4dd

  Copy full SHA for ad3f4dd

• Fix ointment caustic healing amount

  Mnemotechnician

  committed
  1cf936b

  Copy full SHA for 1cf936b

• Shitmed Update 2 - [Insert Snarky Remark] (#1271)

  Show description for ddb5ffa
  

  gluesniffler

  authored and

  Mnemotechnician

  committed
  ddb5ffa

  Copy full SHA for ddb5ffa

• Fix Lobotomy (#1306)

  Show description for df96cdb
  

  angelofallars

  authored and

  Mnemotechnician

  committed
  df96cdb

  Copy full SHA for df96cdb

• Fix health analyzer and RehydratableSystem improper Dirty() call

  Mnemotechnician

  committed
  40cadff

  Copy full SHA for 40cadff

• Ok apparently I cannot insert xaml comments inside a guidebook entery.

  Mnemotechnician

  committed
  5e3a62c

  Copy full SHA for 5e3a62c

• Fix rules formatting and naming

  Mnemotechnician

  committed
  2a85f55

  Copy full SHA for 2a85f55

• Fix test fail caused by component modification on ComponentInit

  Mnemotechnician

  committed
  5b02182

  Copy full SHA for 5b02182

• Fuck you heisentest.

  Mnemotechnician

  committed
  5d4988d

  Copy full SHA for 5d4988d

• Made the rules tab collapsed by default (let's hope I don't cause a stack overflow again)

  Mnemotechnician

  committed
  a616fe2

  Copy full SHA for a616fe2

Commits on Jan 15, 2025

• Fix pirate radio spawn

  Mnemotechnician

  committed
  8a4cca4

  Copy full SHA for 8a4cca4

Commits on Jan 16, 2025

• Fix standing state/buckle conflict

  Mnemotechnician

  committed
  423bc3c

  Copy full SHA for 423bc3c

• Remove collision fixtures from footprint entities

  Mnemotechnician

  committed
  02360be

  Copy full SHA for 02360be

• Fix incorrect dragging print orientation

  Mnemotechnician

  committed
  e7f4651

  Copy full SHA for e7f4651

Commits on Jan 17, 2025

• Merge branch 'master' of https://github.com/Fansana/floofstation1 into floof/cherrypick/ee-surgery

  Mnemotechnician

  committed
  f5837d3

  Copy full SHA for f5837d3

• Separate spray paints into their own loot table and add them back into maintenance

  Mnemotechnician

  committed
  493ee52

  Copy full SHA for 493ee52

• Minor syntax error

  Mnemotechnician

  committed
  541190e

  Copy full SHA for 541190e

• Merge branch 'Fansana:master' into Slime-Marking+

  ItsDzordz

  authored
  84223c5

  Copy full SHA for 84223c5

• Added Extra Markings, and adjusted the cap of markings on certain races.

  Show description for 91bfa2b
  ItsDzordz

  committed
  91bfa2b

  Copy full SHA for 91bfa2b

• Quick arachnid patch

  ItsDzordz

  committed
  b78154f

  Copy full SHA for b78154f

• quick path no2

  Show description for a05c809
  ItsDzordz

  committed
  a05c809

  Copy full SHA for a05c809

Commits on Jan 18, 2025

• A little bit of love to the forgoten

  Show description for c047776
  ItsDzordz

  committed
  c047776

  Copy full SHA for c047776

• mothroach

  fenndragon

  committed
  08cf119

  Copy full SHA for 08cf119

• Merge branch 'master' into floof/cherrypick/ee-surgery

  Mnemotechnician

  authored
  ed3d59e

  Copy full SHA for ed3d59e

• Update gorilla.yml

  FoxxoTrystan

  authored
  7cfc563

  Copy full SHA for 7cfc563

• saltern door fix

  Show description for 524e273
  WhiteLightningTwister

  committed
  524e273

  Copy full SHA for 524e273

• Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml

  Show description for 55c31a1
  

  fenndragon

  and

  FoxxoTrystan

  authored
  55c31a1

  Copy full SHA for 55c31a1

• Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml

  Show description for 0a346a2
  

  fenndragon

  and

  FoxxoTrystan

  authored
  0a346a2

  Copy full SHA for 0a346a2

• Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml

  Show description for 1381414
  

  fenndragon

  and

  FoxxoTrystan

  authored
  1381414

  Copy full SHA for 1381414

Commits on Jan 19, 2025

• Allow gladiabots to wear hats

  Show description for 4b93c85
  Timfa2112

  committed
  4b93c85

  Copy full SHA for 4b93c85

• add alive

  fenndragon

  committed
  08d78e4

  Copy full SHA for 08d78e4

• Delete floofstation1 - Shortcut.lnk

  fenndragon

  committed
  b5244fa

  Copy full SHA for b5244fa

• Merge pull request Fansana#495 from Timfa2112/gladiabot-hats

  Show description for 087c27c
  FoxxoTrystan

  authored
  087c27c

  Copy full SHA for 087c27c

• Automatic Changelog Update (Fansana#495)

  Floof-Station-Bot

  committed
  b944c7c

  Copy full SHA for b944c7c

• Add custom markings + Adds wings section and wagging comp to all.

  FoxxoTrystan

  committed
  dea23e7

  Copy full SHA for dea23e7

• fixes

  FoxxoTrystan

  committed
  e23c21c

  Copy full SHA for e23c21c

• yml fixes

  FoxxoTrystan

  committed
  ef82217

  Copy full SHA for ef82217

• Merge pull request Fansana#481 from Mnemotechnician/floof/cherrypick/ee-surgery

  Show description for f388c3a
  Mnemotechnician

  authored
  f388c3a

  Copy full SHA for f388c3a

• Automatic Changelog Update (Fansana#481)

  Floof-Station-Bot

  committed
  30a347c

  Copy full SHA for 30a347c

• HypnoVisor

  FoxxoTrystan

  committed
  7f024d8

  Copy full SHA for 7f024d8

• Merge branch 'master' into hypno-visor

  FoxxoTrystan

  authored
  f63ccfd

  Copy full SHA for f63ccfd

• Slime marking limit +

  ItsDzordz

  committed
  278d57e

  Copy full SHA for 278d57e

• change description

  FoxxoTrystan

  committed
  83f2fba

  Copy full SHA for 83f2fba

Commits on Jan 20, 2025

• Added The Classical Maid Dress

  Show description for d41bc62
  ItsDzordz

  committed
  d41bc62

  Copy full SHA for d41bc62

• Moved The textures as requested

  Show description for b2c8b73
  ItsDzordz

  committed
  b2c8b73

  Copy full SHA for b2c8b73

• Slime marking limit -

  Show description for 50bc3bd
  ItsDzordz

  committed
  50bc3bd

  Copy full SHA for 50bc3bd

• Allow sorting into teams

  Timfa2112

  committed
  54e4536

  Copy full SHA for 54e4536

• Use another component to subscribe to the event

  Timfa2112

  committed
  ddb30d7

  Copy full SHA for ddb30d7

• removed using which won't work in Floof

  Show description for ebbf168
  Timfa2112

  committed
  ebbf168

  Copy full SHA for ebbf168

• Moved Directories as requested

  Show description for d4bf0ec
  ItsDzordz

  committed
  d4bf0ec

  Copy full SHA for d4bf0ec

• Move faction selector to Server

  Timfa2112

  committed
  00c3022

  Copy full SHA for 00c3022

Commits on Jan 21, 2025

• remove networked attributes where they're not neede

  Timfa2112

  committed
  622aabd

  Copy full SHA for 622aabd

• remove networked attributes where they're not neede

  Timfa2112

  committed
  c30fdf3

  Copy full SHA for c30fdf3

• Merge remote-tracking branch 'origin/gladiabot-teams' into gladiabot-teams

  Timfa2112

  committed
  86b17a0

  Copy full SHA for 86b17a0

• Update prototype

  Timfa2112

  committed
  33eb9e4

  Copy full SHA for 33eb9e4

• Fix events between server and client so the bot changes colour

  Timfa2112

  committed
  9ff0a33

  Copy full SHA for 9ff0a33

• Don't crash when selecting NPC's that don't have the factionselector component

  Timfa2112

  committed
  785eb3b

  Copy full SHA for 785eb3b

• Apply suggestions from code review

  Show description for e3499c4
  

  Timfa2112

  and

  Mnemotechnician

  authored
  e3499c4

  Copy full SHA for e3499c4

• Apply //Floofstation comments

  Timfa2112

  committed
  be33714

  Copy full SHA for be33714

• Fix accidentally using an internal constructor that didn't seem to be necessary

  Timfa2112

  committed
  b1a22da

  Copy full SHA for b1a22da

Commits on Jan 22, 2025

• Add Batonbot and Disablerbot

  Timfa2112

  committed
  776cfe8

  Copy full SHA for 776cfe8

• ensure we're only applying the event on entities with the setter component

  Timfa2112

  committed
  45ac05a

  Copy full SHA for 45ac05a

• Increase price so the bot won't be worth less than its parts dropped

  Timfa2112

  committed
  1e1ad4b

  Copy full SHA for 1e1ad4b

• Ensure a set faction is relevant to an entity that will change its sprite because of it

  Timfa2112

  committed
  8b764d4

  Copy full SHA for 8b764d4

• Lower HP a little

  Timfa2112

  committed
  8489de1

  Copy full SHA for 8489de1

• Add the sawn off pka to the vendor

  Show description for ed0cc6d
  VividPups

  committed
  ed0cc6d

  Copy full SHA for ed0cc6d

Commits on Jan 23, 2025

• Merge pull request Fansana#503 from VividPups/sawn-off-pka

  Show description for a6800e8
  FoxxoTrystan

  authored
  a6800e8

  Copy full SHA for a6800e8

• Automatic Changelog Update (Fansana#503)

  Floof-Station-Bot

  committed
  6f6e89c

  Copy full SHA for 6f6e89c

Commits on Jan 24, 2025

• uplink

  Show description for 1056872
  VividPups

  committed
  1056872

  Copy full SHA for 1056872

• Update Resources/Prototypes/Catalog/uplink_catalog.yml

  Show description for 5390610
  

  VividPups

  and

  Mnemotechnician

  authored
  5390610

  Copy full SHA for 5390610

• Merge pull request Fansana#504 from VividPups/Singo

  Show description for 22c6a59
  FoxxoTrystan

  authored
  22c6a59

  Copy full SHA for 22c6a59

• Automatic Changelog Update (Fansana#504)

  Floof-Station-Bot

  committed
  eaf65b2

  Copy full SHA for eaf65b2

• Merge pull request Fansana#492 from fenndragon/ERT-mothroach

  Show description for a2c2da8
  FoxxoTrystan

  authored
  a2c2da8

  Copy full SHA for a2c2da8

• Merge pull request Fansana#496 from fenndragon/Warden

  Show description for 7df34b1
  FoxxoTrystan

  authored
  7df34b1

  Copy full SHA for 7df34b1

• Automatic Changelog Update (Fansana#492)

  Floof-Station-Bot

  committed
  29d1538

  Copy full SHA for 29d1538

• Automatic Changelog Update (Fansana#496)

  Floof-Station-Bot

  committed
  44fb0dc

  Copy full SHA for 44fb0dc

• Merge pull request Fansana#498 from ItsDzordz/long_Maid_outfit

  Show description for 55dacf3
  FoxxoTrystan

  authored
  55dacf3

  Copy full SHA for 55dacf3

• Merge pull request Fansana#500 from Timfa2112/gladiabot-teams

  Show description for 51bf7f1
  FoxxoTrystan

  authored
  51bf7f1

  Copy full SHA for 51bf7f1

• Merge branch 'master' into batonbot-disablerbot

  FoxxoTrystan

  authored
  f3654a4

  Copy full SHA for f3654a4

• Automatic Changelog Update (Fansana#498)

  Floof-Station-Bot

  committed
  487cc62

  Copy full SHA for 487cc62

• Automatic Changelog Update (Fansana#500)

  Floof-Station-Bot

  committed
  b59b3da

  Copy full SHA for b59b3da

• Merge pull request Fansana#501 from Timfa2112/batonbot-disablerbot

  Show description for 3817c08
  FoxxoTrystan

  authored
  3817c08

  Copy full SHA for 3817c08

• Automatic Changelog Update (Fansana#501)

  Floof-Station-Bot

  committed
  6ff29d0

  Copy full SHA for 6ff29d0

Commits on Jan 25, 2025

• request

  VividPups

  committed
  55034c8

  Copy full SHA for 55034c8

• Changed category of arachnid apendeges and moth wings to wings

  Show description for 387ded1
  ItsDzordz

  committed
  387ded1

  Copy full SHA for 387ded1

• Changed marking type for harpy wings to wings from Rarm

  Show description for 009a6cc
  ItsDzordz

  committed
  009a6cc

  Copy full SHA for 009a6cc

• Merge pull request Fansana#507 from VividPups/girlfailure

  Show description for af00636
  Fansana

  authored
  af00636

  Copy full SHA for af00636

• Merge pull request Fansana#494 from WhiteLightningTwister/saltern-rework

  Show description for ab1b00d
  Fansana

  authored
  ab1b00d

  Copy full SHA for ab1b00d

Commits on Jan 26, 2025

• add plushie to the prize

  Show description for 31afdef
  VividPups

  committed
  31afdef

  Copy full SHA for 31afdef

• Merge pull request Fansana#513 from VividPups/adds-the-wedding-dress-and-the-plushie

  Show description for aeb6a3d
  FoxxoTrystan

  authored
  aeb6a3d

  Copy full SHA for aeb6a3d

• fixes changes

  FoxxoTrystan

  committed
  886a9f2

  Copy full SHA for 886a9f2

• Merge pull request Fansana#417 from ItsDzordz/Slime-Marking+

  Show description for 80f7ad5
  FoxxoTrystan

  authored
  80f7ad5

  Copy full SHA for 80f7ad5

• Merge pull request Fansana#497 from FoxxoTrystan/hypno-visor

  Show description for 96bd0a1
  FoxxoTrystan

  authored
  96bd0a1

  Copy full SHA for 96bd0a1