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.

Sign up for GitHub

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

Add the Adolescent Dragon to the Game. #309

Merged
merged 12 commits into from
Oct 31, 2024
Merged

Add the Adolescent Dragon to the Game. #309

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5717dc4
Update running.png
fenndragon Oct 30, 2024
3895d92
Merge branch 'Fansana:unstable' into dragon
fenndragon Oct 30, 2024
5e7d630
Update presets.yml
fenndragon Oct 30, 2024
f8a2cd1
Update presets.yml
fenndragon Oct 30, 2024
8724ef0
dragon
fenndragon Oct 30, 2024
5546a4f
Update Adolescent_dragon.yml
fenndragon Oct 30, 2024
b397408
Update presets.yml
fenndragon Oct 30, 2024
f37957f
Update Adolescent_dragon.yml
fenndragon Oct 30, 2024
d3c2a04
Update Adolescent_dragon.yml
fenndragon Oct 30, 2024
0dea9cb
Update Floof.yml
Fansana Oct 30, 2024
a6e4ce1
Merge branch 'Fansana:unstable' into dragon
fenndragon Oct 30, 2024
468704d
Update Adolescent_dragon.yml
fenndragon Oct 31, 2024
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
16 changes: 16 additions & 0 deletions Resources/Changelog/Floof.yml
View file
Open in desktop
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -1291,3 +1291,19 @@ Entries:
id: 173
time: '2024-10-29T14:42:16.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/302
- author: neuPanda
changes:
- type: Remove
message: Rape from law as it is a rules violation.
- type: Remove
message: Sexual Assault/Harassment from law as it is a rules violation.
id: 174
time: '2024-10-29T22:10:16.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/306
- author: Memeji
changes:
- type: Remove
message: Removed Gax from the map pool.
id: 175
time: '2024-10-29T23:51:26.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/303
2 changes: 2 additions & 0 deletions Resources/Prototypes/Store/presets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- UplinkMisc
- UplinkBundles
- UplinkTools
- UplinkDeception
- UplinkChemicals
- UplinkUtility
- UplinkImplants
- UplinkJob
Expand Down
Binary file modified Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/running.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading