Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Floofstation Release V13 #514

Closed
wants to merge 124 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
029b763
Shitmed: Implementing Existing Newmed Code Into SS14 (#1159)
gluesniffler Nov 17, 2024
ea9a076
Automatic Changelog Update (#1159)
SimpleStation14 Nov 17, 2024
bdbc394
Update Credits (#1235)
github-actions[bot] Nov 17, 2024
f95774b
Mass Engine Update (#1220)
sleepyyapril Nov 17, 2024
bf6019f
Pirate Radio Heisentest Fix (#1225)
VMSolidus Nov 17, 2024
2eea0f7
Fix Loadout Subcategories Not Being Found (#1233)
DEATHB4DEFEAT Nov 17, 2024
bea5f13
Hotfix Stamina System (#1245)
sleepyyapril Nov 18, 2024
3f8194a
Automatic Changelog Update (#1245)
SimpleStation14 Nov 18, 2024
ab0fa7c
Day/Night Time Cycle For Maps (#1234)
DocNITE Nov 18, 2024
460f444
Automatic Changelog Update (#1234)
SimpleStation14 Nov 18, 2024
860d7c6
Shitmed Update 1 (#1240)
gluesniffler Nov 18, 2024
eb0121f
Automatic Changelog Update (#1240)
SimpleStation14 Nov 18, 2024
aec89a5
Fix Self-Aware Crashing Client (#1247)
angelofallars Nov 18, 2024
ddee61c
Automatic Changelog Update (#1247)
SimpleStation14 Nov 18, 2024
bb13e39
Shitmed Surgery Popups (#1241)
angelofallars Nov 18, 2024
59d2695
AlertsComponentTest Fix (#1246)
sleepyyapril Nov 18, 2024
4fe41ef
Automatic Changelog Update (#1241)
SimpleStation14 Nov 18, 2024
e3b0299
Extra Slime Marking
ItsDzordz Dec 16, 2024
c1dbc64
Quick patch
ItsDzordz Dec 16, 2024
4f3efa1
Merge branch 'master' into Slime-Marking
Fansana Jan 5, 2025
90ba8a0
remove duplicate
Fansana Jan 5, 2025
b001839
actually remove the right duplicate
Fansana Jan 5, 2025
1170399
Merge commit 'ea9a07616fb2b419e89811fa2f753a19aee0da73' into floof/ch…
Mnemotechnician Jan 13, 2025
0fd837f
Merge commit 'bdbc394a8ee4599ab783e83047abf9fa4db6bec8' into floof/ch…
Mnemotechnician Jan 13, 2025
8a64e87
Merge commit 'f95774b3ce4300012b8dbaa60829499ba6a68203' into floof/ch…
Mnemotechnician Jan 13, 2025
d2f8b9d
Migrate Floofstation rules to the new format
Mnemotechnician Jan 13, 2025
3ee02e9
Migrate old StorageFills to the new EntityTableContainerFill
Mnemotechnician Jan 13, 2025
36df059
-- Marker: compiles & runs with a few bugs --
Mnemotechnician Jan 13, 2025
6a511ab
Merge commit '3f8194a879035866199771121262e7ffca3ae2ae' into floof/ch…
Mnemotechnician Jan 13, 2025
0d7d3ce
Merge commit '4fe41eff5edd756aea6899e94f8637607dfec456' into floof/ch…
Mnemotechnician Jan 13, 2025
4d3ecb6
Mass Bug Fixing (#1256)
sleepyyapril Nov 22, 2024
ad3f4dd
Buff Medical Due to Shitmed Changes Cherry-Pick (#1259)
Tmanzxd Nov 22, 2024
1cf936b
Fix ointment caustic healing amount
Mnemotechnician Jan 13, 2025
ddb5ffa
Shitmed Update 2 - [Insert Snarky Remark] (#1271)
gluesniffler Nov 30, 2024
df96cdb
Fix Lobotomy (#1306)
angelofallars Dec 3, 2024
40cadff
Fix health analyzer and RehydratableSystem improper Dirty() call
Mnemotechnician Jan 13, 2025
5e3a62c
Ok apparently I cannot insert xaml comments inside a guidebook entery.
Mnemotechnician Jan 13, 2025
2a85f55
Fix rules formatting and naming
Mnemotechnician Jan 13, 2025
5b02182
Fix test fail caused by component modification on ComponentInit
Mnemotechnician Jan 13, 2025
5d4988d
Fuck you heisentest.
Mnemotechnician Jan 13, 2025
a616fe2
Made the rules tab collapsed by default (let's hope I don't cause a s…
Mnemotechnician Jan 13, 2025
8a4cca4
Fix pirate radio spawn
Mnemotechnician Jan 15, 2025
423bc3c
Fix standing state/buckle conflict
Mnemotechnician Jan 16, 2025
02360be
Remove collision fixtures from footprint entities
Mnemotechnician Jan 16, 2025
e7f4651
Fix incorrect dragging print orientation
Mnemotechnician Jan 16, 2025
f5837d3
Merge branch 'master' of https://github.com/Fansana/floofstation1 int…
Mnemotechnician Jan 17, 2025
493ee52
Separate spray paints into their own loot table and add them back int…
Mnemotechnician Jan 17, 2025
541190e
Minor syntax error
Mnemotechnician Jan 17, 2025
84223c5
Merge branch 'Fansana:master' into Slime-Marking+
ItsDzordz Jan 17, 2025
91bfa2b
Added Extra Markings, and adjusted the cap of markings on certain races.
ItsDzordz Jan 17, 2025
b78154f
Quick arachnid patch
ItsDzordz Jan 17, 2025
a05c809
quick path no2
ItsDzordz Jan 17, 2025
c047776
A little bit of love to the forgoten
ItsDzordz Jan 18, 2025
08cf119
mothroach
fenndragon Jan 18, 2025
ed3d59e
Merge branch 'master' into floof/cherrypick/ee-surgery
Mnemotechnician Jan 18, 2025
7cfc563
Update gorilla.yml
FoxxoTrystan Jan 18, 2025
524e273
saltern door fix
WhiteLightningTwister Jan 18, 2025
55c31a1
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml
fenndragon Jan 18, 2025
0a346a2
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml
fenndragon Jan 18, 2025
1381414
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/ertmothroach.yml
fenndragon Jan 18, 2025
4b93c85
Allow gladiabots to wear hats
Timfa2112 Jan 19, 2025
08d78e4
add alive
fenndragon Jan 19, 2025
b5244fa
Delete floofstation1 - Shortcut.lnk
fenndragon Jan 19, 2025
087c27c
Merge pull request #495 from Timfa2112/gladiabot-hats
FoxxoTrystan Jan 19, 2025
b944c7c
Automatic Changelog Update (#495)
Floof-Station-Bot Jan 19, 2025
dea23e7
Add custom markings + Adds wings section and wagging comp to all.
FoxxoTrystan Jan 19, 2025
e23c21c
fixes
FoxxoTrystan Jan 19, 2025
ef82217
yml fixes
FoxxoTrystan Jan 19, 2025
f388c3a
Merge pull request #481 from Mnemotechnician/floof/cherrypick/ee-surgery
Mnemotechnician Jan 19, 2025
30a347c
Automatic Changelog Update (#481)
Floof-Station-Bot Jan 19, 2025
7f024d8
HypnoVisor
FoxxoTrystan Jan 19, 2025
f63ccfd
Merge branch 'master' into hypno-visor
FoxxoTrystan Jan 19, 2025
278d57e
Slime marking limit +
ItsDzordz Jan 19, 2025
83f2fba
change description
FoxxoTrystan Jan 19, 2025
d41bc62
Added The Classical Maid Dress
ItsDzordz Jan 20, 2025
b2c8b73
Moved The textures as requested
ItsDzordz Jan 20, 2025
50bc3bd
Slime marking limit -
ItsDzordz Jan 20, 2025
54e4536
Allow sorting into teams
Timfa2112 Jan 20, 2025
ddb30d7
Use another component to subscribe to the event
Timfa2112 Jan 20, 2025
ebbf168
removed using which won't work in Floof
Timfa2112 Jan 20, 2025
d4bf0ec
Moved Directories as requested
ItsDzordz Jan 20, 2025
00c3022
Move faction selector to Server
Timfa2112 Jan 20, 2025
622aabd
remove networked attributes where they're not neede
Timfa2112 Jan 21, 2025
c30fdf3
remove networked attributes where they're not neede
Timfa2112 Jan 21, 2025
86b17a0
Merge remote-tracking branch 'origin/gladiabot-teams' into gladiabot-…
Timfa2112 Jan 21, 2025
33eb9e4
Update prototype
Timfa2112 Jan 21, 2025
9ff0a33
Fix events between server and client so the bot changes colour
Timfa2112 Jan 21, 2025
785eb3b
Don't crash when selecting NPC's that don't have the factionselector …
Timfa2112 Jan 21, 2025
e3499c4
Apply suggestions from code review
Timfa2112 Jan 21, 2025
be33714
Apply //Floofstation comments
Timfa2112 Jan 21, 2025
b1a22da
Fix accidentally using an internal constructor that didn't seem to be…
Timfa2112 Jan 21, 2025
776cfe8
Add Batonbot and Disablerbot
Timfa2112 Jan 22, 2025
45ac05a
ensure we're only applying the event on entities with the setter comp…
Timfa2112 Jan 22, 2025
1e1ad4b
Increase price so the bot won't be worth less than its parts dropped
Timfa2112 Jan 22, 2025
8b764d4
Ensure a set faction is relevant to an entity that will change its sp…
Timfa2112 Jan 22, 2025
8489de1
Lower HP a little
Timfa2112 Jan 22, 2025
ed0cc6d
Add the sawn off pka to the vendor
VividPups Jan 22, 2025
a6800e8
Merge pull request #503 from VividPups/sawn-off-pka
FoxxoTrystan Jan 23, 2025
6f6e89c
Automatic Changelog Update (#503)
Floof-Station-Bot Jan 23, 2025
1056872
uplink
VividPups Jan 24, 2025
5390610
Update Resources/Prototypes/Catalog/uplink_catalog.yml
VividPups Jan 24, 2025
22c6a59
Merge pull request #504 from VividPups/Singo
FoxxoTrystan Jan 24, 2025
eaf65b2
Automatic Changelog Update (#504)
Floof-Station-Bot Jan 24, 2025
a2c2da8
Merge pull request #492 from fenndragon/ERT-mothroach
FoxxoTrystan Jan 24, 2025
7df34b1
Merge pull request #496 from fenndragon/Warden
FoxxoTrystan Jan 24, 2025
29d1538
Automatic Changelog Update (#492)
Floof-Station-Bot Jan 24, 2025
44fb0dc
Automatic Changelog Update (#496)
Floof-Station-Bot Jan 24, 2025
55dacf3
Merge pull request #498 from ItsDzordz/long_Maid_outfit
FoxxoTrystan Jan 24, 2025
51bf7f1
Merge pull request #500 from Timfa2112/gladiabot-teams
FoxxoTrystan Jan 24, 2025
f3654a4
Merge branch 'master' into batonbot-disablerbot
FoxxoTrystan Jan 24, 2025
487cc62
Automatic Changelog Update (#498)
Floof-Station-Bot Jan 24, 2025
b59b3da
Automatic Changelog Update (#500)
Floof-Station-Bot Jan 24, 2025
3817c08
Merge pull request #501 from Timfa2112/batonbot-disablerbot
FoxxoTrystan Jan 24, 2025
6ff29d0
Automatic Changelog Update (#501)
Floof-Station-Bot Jan 24, 2025
55034c8
request
VividPups Jan 25, 2025
387ded1
Changed category of arachnid apendeges and moth wings to wings
ItsDzordz Jan 25, 2025
009a6cc
Changed marking type for harpy wings to wings from Rarm
ItsDzordz Jan 25, 2025
af00636
Merge pull request #507 from VividPups/girlfailure
Fansana Jan 25, 2025
ab1b00d
Merge pull request #494 from WhiteLightningTwister/saltern-rework
Fansana Jan 25, 2025
31afdef
add plushie to the prize
VividPups Jan 26, 2025
aeb6a3d
Merge pull request #513 from VividPups/adds-the-wedding-dress-and-the…
FoxxoTrystan Jan 26, 2025
886a9f2
fixes changes
FoxxoTrystan Jan 26, 2025
80f7ad5
Merge pull request #417 from ItsDzordz/Slime-Marking+
FoxxoTrystan Jan 26, 2025
96bd0a1
Merge pull request #497 from FoxxoTrystan/hypno-visor
FoxxoTrystan Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
-- Marker: compiles & runs with a few bugs --
Mnemotechnician committed Jan 13, 2025
commit 36df0590d67e0ec6d5a178079bfaa6dd2abf015e

No changes to show.

This commit has no content.