-
Notifications
You must be signed in to change notification settings - Fork 101
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
Subtle OOC #571
Merged
Merged
Subtle OOC #571
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fansana
approved these changes
Feb 19, 2025
Mnemotechnician
approved these changes
Feb 23, 2025
Memeji
approved these changes
Feb 23, 2025
FoxxoTrystan
added a commit
that referenced
this pull request
Feb 23, 2025
* Added admin access configurator, modified admin satchel to include it and more tools * Committed textures * Guns can trigger timers on launched projectiles. * Guns can be made to load ammo when used from hand. * Cleanade launchers can be loaded with two cleanades and launch them with approximately the same strength as throwing. * Created filled version of the mega spray bottle. * Add mega spray bottle and cleanade launcher to advanced cleaning cyborg module. * Made requested changes * First bricks? Maybe? Some initial modifications. Spoiler alert, it still doesn't work. * OMG IT WORKZZZZ Thanks to Mnemotechnician for the advice and information! The fancy stuff has been commented out for now, as this is a milestone of making IPCs able to sing. * tfw mispelling made me waste an hour with some reorganization * Some reorganization, SiliconSinger type * Final checks * Minor comment touch-up. * Add custom rodentia scream Added the rodentia scream made by Chokovit * Give slimes the keys they never had * Minor comment correction * fix: Make CourierDrobe restockable using generic clothes restock (#1768) * Allow custom species for Diona * Minor Comment Correction 2: Electric Boogaloo * Automatic Changelog Update (#559) * Automatic Changelog Update (#561) * Vore Fixes and Consent Menu Improvement (#568) * vore fixes and consent menu improvement * consent menu fixes * Update Content.Shared/Consent/ConsentTogglePrototype.cs Co-authored-by: Mnemotechnican <[email protected]> * Apply suggestions from code review Co-authored-by: Mnemotechnican <[email protected]> * Category has a default of "" to pull uncategorized consents to the top (NoClone has been uncategorized as an example) ConsentTogglePrototype.CompareTo override modifier removed, does not compile with it System.Linq.Enumerable.ToList<T>() used instead of List constructor * I Understand Now --------- Co-authored-by: Mnemotechnican <[email protected]> * Automatic Changelog Update (#568) * Add Unathi Female Underbelly (#576) * inital * fixes * Automatic Changelog Update (#576) * Restore Missing Changelog Entries (#573) * Add missing changelog entries Manually added changelog entries that were missing from between January 26th and February 18th * Whitespace fixes Formatting is a pain! * Automatic Changelog Update (#573) * Lemon Lime and Bitters (#570) * Lemon Lime Bitters (#2464) * haha yeah * merge conflict fix * DeltaV namespace is kill * Flavours reorganized (also shifted blood red dr gibb to where it was supposed to be) * forgor this * bottle * drinks.yml * LLB sprites * agnobitters sprite and change of unit count * fill fix * added to spawners and vendors * oopsies be fixed! * thank you orange for making my sprites a bit less shit * Deltanedas review fix * Lemon lime and bitters is not notably alcoholic. * Lemon lime and bitters is popular throughout Australia, and I will not stand for this slander from WA. * Removed regional shortening and slang. This is highly dependant on exact region, so best to stick with non-slang names. --------- Co-authored-by: Blitz <[email protected]> * Uniform Printer Additions (#569) * Add missing departmental arm warmers, thongs, and thigh high socks to the uniform printer. Chief Engineer Mystagogue Mantis Logistics Officer Courier Chemist Paramedic Chief Medical Officer Had of Security Detective Corpsman Bartender Musician Chef * Add surgeon general's thong recipe to emagged uniform printer. * Changed all durathread thongs to use the same amount of durathread (50). * Add clothing recipe categories. * Added missing atmospherics and roboticist uniforms to uniform printer. * More Map Changes (#542) * arena updates added shadowkin portals back swapped lathes for each department to be their departmental lathes labeled some doors in dorms * Update arena.yml added anomaly spawn points again * updated asterisk swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident gave perma prisoner cryosleep pods * updated edge swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident gave sec an easy to access disabler safe gave medbay a fax machine since they were lacking one * udpated hive based on community requested changes added a crew monitor console to medbay removed a docking port that was by SW solar to prevent salv shuttle from docking their after an expedition added a common telecom server to AI for singuloose coordination converted two the launderettes to a new lounge added station a station anchor added scrubbers in atmos maints where their is an air sensor to prevent the air alarm by botany from going crazy from the ducks in maints added a space cleaner dispenser to the jani closet added a prize machine to the arcade swapped lathes for each department to be their departmental lathes swapped to cryosleep pods to be latejoins removed the round start gorillia from the detectives office, it was funny but needed to be removed add a roboticist job spawn * Update hive.yml add a roboticist slot * updated kettle fixed some windows being regular when they should be reinforced moved mailroom to the actual mail room and turned the previous mailroom back into a little lounge area added an anti anomaly zone to gravity fixed perma doors so the prison guard can actually open them and go across the bridge added scrubber and air vents to the mouse room by hops office so the mice dont gib swapped lathes for each department to be their departmental lathes * updated shoukou swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident added an anti anomaly zone around SE solars and in AI to prevent anomalies from spawning in there * updated train so its in lower orbit train is now in lower orbit with very cold air on the outside of the station fixed some loose air vents and scrubbers swapped lathes for each department to be their departmental lathes * more updates to glacier added atmos to the court room swapped lathes for each department to be their departmental lathes put the two docking ports by dorms closer together for Pepper * added missing paramed lockers added one additional paramed locker to main medical and added another one to the medical outpost * updated hammurabi swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident gave mystagouge a bedroom added a roboticist jobslot added seb to epi * added a jobslot for a roboticist added a jobslot for a roboticist * updated lighthouse swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident added a space cleaner dispenser to the janitor closet * updated pebble added a stasis bed to medbay since they did not have one updated the teg setup swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident * updated radstation added seb to epi added tropico to atmos swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident * updated saltern swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident * updated tortuga added tiny fans to atmos teg cool loop airlock swapped lathes for each department to be their departmental lathes added a dock for salv so they dont block evac on accident * added senior roles added senior roles * added senior roles added senior roles * fix senior roles for arena properly add senior scientist * Update arena.yml make it so senior officers can only late join * remove senior officer job spawn from the map remove senior officer job spawn from the map to see if that fixes the error, they can still late join * Enable senior officer round start Enable senior officer round start * re-add the senior officer spawn had to re-add the job spawn for senior officer after i removed to test * add senior roles to asterisk add senior roles to asterisk * add senior roles * add senior roles to asterisk add senior roles to asterisk * Revert "add senior roles to asterisk" This reverts commit 37892bd. I put the map file in /maps/ instead of /maps/floof so need to fix that * add senior roles to edge add senior job spawns and roles to edge * add senior roles to hive add senior roles and job slots to hive * add senior roles to kettle add senior roles and job spawns to kettle * add senior roles to shoukou add senior roles and job spawns to shoukou * add senior roles to train add senior roles and job spawns to train * add senior roles to train add senior roles and job slots to train * add senior roles to hammurabi add senior roles and job slots to hammurabi * add senior roles to lighthouse add senior roles to lighthouse * add senior roles to pebble add senior roles and job slots to pebble * fix typo in this file fixed a typo in the jobs file for pebble * add senior roles to radstation add senior roles and job spawns to radstation * add senior roles to saltern add senior roles and job slots to saltern * add senior roles to tortuga add senior roles job slots to tortuga * add senior roles to core add senior roles and job spawns to core * add senior roles to fland add senior roles and jobs slots to fland, also added tiny fans to the chefs freezer since it did not have any * add senior roles to submarine add senior roles and job slots to submarine * add senior role job slots to submarine add senior role job slots to submarine, i some how didn't push this * updated train fixed more loose air vents and scrubbers i found added tiny fans to most airlocks * updated glacier connected disposals to the court house gave sec additional table rechargers for their gear gave the psych office a face lift * fix salterns atmos setup the pumps taking gas out of the atmos holding chambers were facing the wrong direction and instead were trying to pump gas out of the injectors which are for waste. I also ran a basic waste setup for recycling if someone wanted to do that * add a roboticist to fland and a few more changes add a roboticist to fland, make sec counters publicly accessible tot he crew and add a crew monitor to the courier room so they can deliver mail more easily * add id computers to every heads office added id computers to every heads office and added a roboticist job slot * add roboticist job slot on tortuga add roboticist job slot and fix disposals for the chefs kitchen * fix salvage dock and add fourth locker fixed the pathfinder shuttle dock and added a fourth locker for the fourth salvage specialist * added basic cloner to medbay on train added basic cloner to medbay on train and fixed some missing floor tiles in the courier room * add a station anchor to pebble add a station anchor to pebble replace lockers for clown, mime, barkeep and janitor with their proper lockers --------- Co-authored-by: Mnemotechnican <[email protected]> * Ice Metabolizes to Water, Lowers Temperature, and Causes Damage Once Frozen (#562) * Ice metabolizes to water, lowers temperature, and causes damage once you're frozen. * Cream and ice cream satiate hunger * Fix the revert caused by the previous commit. * Add Envelopes (#553) * Fix some abnormally high-capacity boxes (#28314) * Add envelopes (#30298) * Add envelopes * oops * Remove unused loc string * comments and fixes --------- Co-authored-by: Lamrr <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Mnemotechnican <[email protected]> * Automatic Changelog Update (#570) * Automatic Changelog Update (#553) * Subtle OOC (#571) * subtle ooc * Change SLOOC prefix --------- Co-authored-by: Mnemotechnican <[email protected]> * Cherry-Picked New Lights (#579) * Dim light bulbs (#33383) add * Cherry-picked warm lights * Adds Colored Light Bulbs (#35333) * goober * changes parenting * Resolved issues * Removed parent on glowstick * fixed a typo * I'm tired * :/ --------- Co-authored-by: Ubaser <[email protected]> Co-authored-by: Boaz1111 <[email protected]> --------- Co-authored-by: Southbridge <[email protected]> Co-authored-by: Eagle0600 <[email protected]> Co-authored-by: M3739 <[email protected]> Co-authored-by: Fansana <[email protected]> Co-authored-by: Forzii <[email protected]> Co-authored-by: DisposableCrewmember42 <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: FloofStation Changelogs <[email protected]> Co-authored-by: LucasTheDrgn <[email protected]> Co-authored-by: Mnemotechnican <[email protected]> Co-authored-by: TheRealMasterChief117 <[email protected]> Co-authored-by: Blitz <[email protected]> Co-authored-by: Dunrab <[email protected]> Co-authored-by: Lamrr <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: Boaz1111 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: UI
Changes any XAML files
Changes: YML
Changes any yml files
Priority: 1-High
Needs to be resolved as soon as possible
Status: Needs Review
Someone please review this
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds Sublte OOC made by april; requested by the floof team.
And while im at it; porting also filters for admins/players regarding suble.
Following PRs ported:
TheDenSS14/TheDen#159 (Only Chat Changes)
TheDenSS14/TheDen#163
Changelog
🆑