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 V12 #493

Merged
merged 93 commits into from
Jan 18, 2025
Merged

Conversation

FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan commented Jan 18, 2025

WhiteLightningTwister and others added 30 commits January 3, 2025 18:10
- Added Central Command Outpost #1362
- Added Central Command Shuttle #6378
this uses a modified version of SlurredSystem's Accentuate for the trait with hardcoded values and removing the burping and "huh" additions. the functionality *could* be extracted into a static method, however it would require changing code in non-Floof code when this works perfectly fine
if the SlurredSpeech probability scale is higher than the base value for DrunkardAccent, use that instead of the base value
Add Train PostMapInitTest before i upload the map file this time
add the initial version of train before going in and adding fixes
Will need to tweak this further to match the amount of job spawns that are actually placed and make sure things like courier, anomaly and prisoner have job spawns
swapped evac shuttle to be smaller so it can better fit in the sapce
added seb to epi
give parameds their hardsuit in their locker
changed the librarians door from service to librarian so they can open it
* fixed the flavor of my custom drink

* why was a blank jumpskirts.yml there
added a brigmed job slot
added a Psychologis job slot
…r-xenoarch

Increase Artifact Analyzer's Point-to-Glimmer Ratio
renamed some warp points and added a few more
added a brigmed jobspawn and slightly larger room for them
added a psych office
added paper work templates to every department
some other misc changes
Forgot to change the mapPath
seems i left a few wizden things in this file so had to remove them
Make Visual Disabilities and Cybereyes Mutually Exclusive
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jan 18, 2025
Copy link
Contributor

RSI Diff Bot; head commit c1fde1e merging into 10abaeb
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Aliens/Xenos/burrower.rsi

State Old New Status
crit Modified
dead Modified
sleeping Modified
alive Added
burrowed Added

Resources/Textures/Mobs/Aliens/Xenos/drone.rsi

State Old New Status
crit Modified
dead Modified
sleeping Modified
alive Added
drone_dissection Added
drone_downed_0 Added
drone_downed_1 Added
drone_downed_2 Added
drone_downed_3 Added
drone_rest_0 Added
drone_rest_1 Added
drone_rest_2 Added
drone_rest_3 Added
drone_walk_0 Added
drone_walk_1 Added
drone_walk_2 Added
drone_walk_3 Added

Resources/Textures/Actions/Implants/implants.rsi

State Old New Status
gorilla_rampage Added

Resources/Textures/Floof/Mobs/Silicon/quad.rsi

State Old New Status
quadspritesalv Added
quadspritesalvl Added
quadspritesalvr Added

Resources/Textures/Floof/Objects/Fun/floof_plush.rsi

State Old New Status
pepper Added

Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi

State Old New Status
borg_l_salvarm+o Added
borg_l_salvleg+o Added
borg_r_salvarm+o Added
borg_r_salvleg+o Added
borg_salvchest+o Added
borg_salvhead+o Added

Resources/Textures/Mobs/Aliens/Xenos/acider_runner.rsi

State Old New Status
alive Added
crit Added
dead Added
runner_dissection Added
runner_downed_0 Added
runner_downed_1 Added
runner_downed_2 Added
runner_downed_3 Added
runner_rest_0 Added
runner_rest_1 Added
runner_rest_2 Added
runner_rest_3 Added
runner_walk_0 Added
runner_walk_1 Added
runner_walk_2 Added
runner_walk_3 Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/acider_runner_primed.rsi

State Old New Status
alive Added
crit Added
dead Added
runner_dissection Added
runner_downed_0 Added
runner_downed_1 Added
runner_downed_2 Added
runner_downed_3 Added
runner_rest_0 Added
runner_rest_1 Added
runner_rest_2 Added
runner_rest_3 Added
runner_walk_0 Added
runner_walk_1 Added
runner_walk_2 Added
runner_walk_3 Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/bloody_larva.rsi

State Old New Status
alive Added
crit Added
dead Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/boiler.rsi

State Old New Status
alive Added
boiler_downed_0 Added
boiler_downed_1 Added
boiler_downed_2 Added
boiler_downed_3 Added
boiler_rest_0 Added
boiler_rest_1 Added
boiler_rest_2 Added
boiler_rest_3 Added
boiler_walk_0 Added
boiler_walk_1 Added
boiler_walk_2 Added
boiler_walk_3 Added
crit Added
dead Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/boxer_warrior.rsi

State Old New Status
alive Added
crit Added
dead Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/carrier.rsi

State Old New Status
alive Added
carrier_dissection Added
carrier_downed_0 Added
carrier_downed_1 Added
carrier_downed_2 Added
carrier_downed_3 Added
carrier_rest_0 Added
carrier_rest_1 Added
carrier_rest_2 Added
carrier_rest_3 Added
carrier_walk_0 Added
carrier_walk_1 Added
carrier_walk_2 Added
carrier_walk_3 Added
crit Added
dead Added
para_0 Added
para_1 Added
para_2 Added
para_3 Added
para_downed_0 Added
para_downed_1 Added
para_downed_2 Added
para_downed_3 Added
para_rest_0 Added
para_rest_1 Added
para_rest_2 Added
para_rest_3 Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/charger_crusher.rsi

State Old New Status
alive Added
crit Added
dead Added
sleeping Added
thrown Added

Resources/Textures/Mobs/Aliens/Xenos/crusher.rsi

State Old New Status
alive Added
crit Added
crusher_dissection Added
crusher_downed_0 Added
crusher_downed_1 Added
crusher_downed_2 Added
crusher_downed_3 Added
crusher_rest_0 Added
crusher_rest_1 Added
crusher_rest_2 Added
crusher_rest_3 Added
crusher_walk_0 Added
crusher_walk_1 Added
crusher_walk_2 Added
crusher_walk_3 Added
dead Added
sleeping Added
thrown Added

Resources/Textures/Mobs/Aliens/Xenos/dancer_praetorian.rsi

State Old New Status
alive Added
crit Added
dead Added
praetorian_dissection Added
praetorian_downed_0 Added
praetorian_downed_1 Added
praetorian_downed_2 Added
praetorian_downed_3 Added
praetorian_rest_0 Added
praetorian_rest_1 Added
praetorian_rest_2 Added
praetorian_rest_3 Added
praetorian_walk_0 Added
praetorian_walk_1 Added
praetorian_walk_2 Added
praetorian_walk_3 Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/defender.rsi

State Old New Status
alive Added
crest Added
crit Added
dead Added
defender_crest_0 Added
defender_crest_1 Added
defender_crest_2 Added
defender_crest_3 Added
defender_dissection Added
defender_downed_0 Added
defender_downed_1 Added
defender_downed_2 Added
defender_downed_3 Added
defender_fortify_0 Added
defender_fortify_1 Added
defender_fortify_2 Added
defender_fortify_3 Added
defender_rest_0 Added
defender_rest_1 Added
defender_rest_2 Added
defender_rest_3 Added
defender_walk_0 Added
defender_walk_1 Added
defender_walk_2 Added
defender_walk_3 Added
fortify Added
sleeping Added
thrown Added

Resources/Textures/Mobs/Aliens/Xenos/drone_strain_overlays.rsi

State Old New Status
gardener_drone_dead Added
gardener_drone_dead_spent Added
gardener_drone_knocked_down Added
gardener_drone_knocked_down_spent Added
gardener_drone_running Added
gardener_drone_running_spent Added
gardener_drone_sleeping Added
gardener_drone_sleeping_spent Added
gardener_drone_walking Added
gardener_drone_walking_spent Added
healer_drone_dead Added
healer_drone_knocked_down Added
healer_drone_running Added
healer_drone_sleeping Added
healer_drone_walking Added

Resources/Textures/Mobs/Aliens/Xenos/eggsac_carrier.rsi

State Old New Status
alive Added
crit Added
dead Added
sleeping Added

Resources/Textures/Mobs/Aliens/Xenos/gardener_drone.rsi

State Old New Status
alive Added

@FoxxoTrystan FoxxoTrystan added the Priority: 1-High Needs to be resolved as soon as possible label Jan 18, 2025
@FoxxoTrystan FoxxoTrystan merged commit 61b6793 into Fansana:stable Jan 18, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.