Enhanced alcoholism v2 #1
Closed
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
* Fix * Update VendingMachineMenu.xaml.cs * Update VendingMachineMenu.xaml.cs * fixup
Updates copyright section to have my current tag (I am the spriter for it)
* rped debugging * More RPED debugging * PartExchangerSystem: RemoveAt, respect stack split * rped fix: index with invalid state, reverse iter * WIP rped fixes * Refactor: BuildMachinePartState, less redundancy * PartExchanger, ConstructionSystem: debugging * PartExchangerSystem: it works * PartExchangerSystem: comment cleanup
* ATM: feedback if invalid items inserted * AGPL headers
* Filled and empty chem wall lockers. Filled and empty chem wall lockers using chem crate inventory. Uses med locker sprite with chem department coloring. * Update chemistry_storage_wallmount.yml Grrrrr efficiency grrrr * Update chemistry_storage_wallmount.yml Updated to remove pieces already supported by parent. * Update meta.json I guess I edited it. Immortalized forever. * Fixup * Fixup * Update wall_lockers.yml --------- Co-authored-by: Dvir <[email protected]>
* Update mailtruck.yml * Rename mailtruck.yml to parcel.yml * Rename * Update parcel.yml * Update parcel.yml * Update computers_shipyard_mothership.yml * Update parcel.yml * menace * Update menace.yml
* NFSD Access Overhaul Fixed ship console refresh on id insert or removal Added Access to VesselPrototype Added Filtration to Ship List based off of Access Added Bailiff and Sergeant Access levels Added Access levels to all NFSD ship Added appropriate access groups to NFSD roles * removed: Atmospherics and Engineering from ID console * Update IdCardConsoleComponent.cs Fixing issue where re-sharper removed un-used using statements per request. * NFSD Access Overhaul Fixed ship console refresh on id insert or removal Added Access to VesselPrototype Added Filtration to Ship List based off of Access Added Bailiff and Sergeant Access levels Added Access levels to all NFSD ship Added appropriate access groups to NFSD roles * removed: Atmospherics and Engineering from ID console * Update IdCardConsoleComponent.cs Fixing issue where re-sharper removed un-used using statements per request. * Updating Access per request, fixing SR access to include Srg and Bailiff * fixing mirge issue that VS so politly decided to fuck up and then hide the fact that the code would not compile by compiling old code like the little shit that it is. thank god i dont have to be proffessional with my code comments here like i do at work because i ant shit talk VS or Git when i am working so i shall unleach all my rage in this commnet for the 2 of them (git and VS) for being dicks and wasting everybody's time * ShipyardSystem cleanup, LINQ removal, vessel proto * Access: prefer NFSD accesses outright to groups * Shipyard console: fix condition, check accessgroup * ShipyardSystem: comment skipping for no access --------- Co-authored-by: neuPanda <[email protected]> Co-authored-by: Whatstone <[email protected]>
* adds SSS Camper adds the SSS Camper, a shuttle manufactured by Settler's Shuttle LLC * Fixes Author Info * removed author discord * Adds Guidebook and the Altered Shuttle Design * Altered the design again, and updated the guidebook. * adds a sink and a trash bag cuz i forgor * Changed shuttle design, Added guidebook entry, and decreased price. * Condensed Guidebook Icons * removed overflowJobs in camper.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]>
* Fixes Grid portal Creation * Compacting! * Making it non abstract * Who dosent like funsies descriptions! * Portal suggestions name, description, no randomTeleport, no "Base" on a concrete instance, fixing map attribute * Added license headers --------- Co-authored-by: Whatstone <[email protected]>
* add a new weapon to the game svt new gun * update update * small updates small updates * so i can fix it so i can fix it * fix fix * some updates pratice is more of an outlier now to look more like the tip of the bullet * Update weapon_cases_shuttle_guns.yml SOOOOOOOO * rifle IM NOT GOOD AT ENGLISHER * In the wrong place Mags where in the wrong place * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml Co-authored-by: whatston3 <[email protected]> * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml Co-authored-by: whatston3 <[email protected]> * updates upated. recentering the PNG files, changes to the IDs * updates again # changes * Shuttle update Shuttle update * ammo ammo * aaa updates to the yml again * Delete snipers.yml moves stuff around * Update snipers.yml * Resolve merge conflicts (for real this time) * aaa aaaa oogabogaa * Update dungeon_items_weapons.yml YEET * Update weapon_cases_expedition.yml this should work? * GADDAMNIT WHATSONE AAAAAAAAAAAAAA * ADSFGAFGA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --------- Co-authored-by: whatston3 <[email protected]> Co-authored-by: Whatstone <[email protected]>
…ry loadout parts. (new-frontiers-14#1501) * fix expensive loadouts on broke characters * Add loadout group fallback, apply to loadoutgroups Also, cleanup redundancies in mercenary_loadout_groups.yml * mercenary loadout: restore security backpacks * StationSpawningSystem: check for duplicate entries * Remove TODO * Remove optional pilot fallback, cleanup, comments * Added checks to fallback loadouts, n2 box fallback * resolve security_guard_groups.yml merge conflicts --------- Co-authored-by: Whatstone <[email protected]>
…14#1548) * initial commit * solution transfer fix, fleshed out flesh monster entries * expedition overview section and flesh are kind of finished * templates * memes * started argocytes * different stat block * more template deliberations * Argocytes done (kinda) * cult stuff * argocytes meat and mats * blood cultist (kinda done) * assimilated miner * carps done, visual improovements to some sprites * dinosaurs done * explorers done * Fixed Slowdown Thresholds For Hostile NPCs * no AA for mobs * mercenaries done * punks done * new objectives, syndicate kinda done * small fixes * xeno done * might be done * fix * more fixes * fixes * less fun in party supplies * bells and whistles * digestive sack, mr. bond * fix * sprite upd * the sack spawnes things now * electrified ai node, walkable digestive sack * Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/xenos.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * Update Resources/ServerInfo/_NF/Guidebook/Expeditions.xml Co-authored-by: Whatstone <[email protected]> * spessos * Spesso currency * tweaks * better fixture for sack, renamed to assimilation sack * small note about spawning * viscerator, no regen on drones * tweaks * moved some files around * Rewrites pt 1 * expedition rework suggestions pt 2 * Blood cultist partial rewrite * gestio rifle to merc mob * exped loot buff * intermediate * void syndie mobs * contrafaction * spawners for voidsmen * despawn timers * Guidebook rewrites, cash stacks, gobbo rewrite * Whitespace, syndicate & xeno sections * jittering for punk leader * punks shit graffity * descriptions to mob ymls * commented out despawntimers --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
* tactical maid harduit and tweak numbers * bigger package * resolve issues * fix issues * revert step sound to sound_mecha_powerloader_step --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
* pumpkin spice latte (thank you, stagnation) * Fix copyright license, meta & flavors whitespace * Update drinks.yml * pumpkin spice latte: new name, 3:1:1:1->6 ratios --------- Co-authored-by: ErhardSteinhauer <[email protected]> Co-authored-by: Dvir <[email protected]>
* The start * Update GunSystem.AutoFire.cs * Fix * Again * Yes * Edit * Fix * Update GunSystem.AutoFire.cs * Update GunSystem.AutoFire.cs * Works * Cleanup * Update AutoShootGunComponent.cs * Cleanup, comments & wrench * cannons.yml: EOL at EOF * Hide this 2 again * Update AutoShootGunComponent.cs --------- Co-authored-by: Whatstone <[email protected]>
* Added RangeFilter to NavScreen * moved ftl to _NF * renamed RF to MaximumIFFDistance & added Slider * fixed SpinBox margin * set default Slider value to 3000 instead of 0 * RangeFilter: cleanup --------- Co-authored-by: Whatstone <[email protected]>
* Blade * More Blade * More blades * Update spaceblade.yml * Let it rip * Update security_uplink_catalog.yml * Uplink * Fixup * Loadout * Update spaceblade.yml * Update spaceblade_boxes.yml * Update spaceblade.yml * Fixup * Update uplink-catalog.ftl * Update Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml Co-authored-by: Whatstone <[email protected]> --------- Co-authored-by: Whatstone <[email protected]>
* Unique glove fibers (new-frontiers-14#1455) * make changes * comments * commiting a single whitespace so i dont get executed --------- Co-authored-by: deltanedas <[email protected]> * Ungloves Your Gloves * Fixup --------- Co-authored-by: WarMechanic <[email protected]> Co-authored-by: deltanedas <[email protected]>
Also, delete empty file
…1646) * Adds 3 new musics to the jukebox. * fix attributions Co-authored-by: Batuh1n <[email protected]>
* The Tiger * Adds Vulpkanin to the heterochromic eyes marking whitelist (new-frontiers-14#1434) Adds Vulpkanin to the heterochromic eyes marking whitelist + ups limit to 3 * Remove Vulpkanin overlay restrictions (new-frontiers-14#1200) no longer must you choose two only * DeltaV species guidebook entries (new-frontiers-14#1174) * DeltaV species guidebook entries Copied straight from the wiki :D * Forgor * Update Oni.xml Signed-off-by: Null <[email protected]> --------- Signed-off-by: Null <[email protected]> * Lies * Alternative wagging tail for felinids. (new-frontiers-14#593) * Alternative wagging tail for felinids. More options for felinids. Ported from TG station. * Deletes that one line that appeard for some reason. --------- Signed-off-by: Adrian16199 <[email protected]> * Buffed Harpy (new-frontiers-14#1217) Now Harpy can mimic more instruments! Signed-off-by: DefinitelyNotFurryXD <[email protected]> * Harpy Can Now Mimic Harps! (new-frontiers-14#1252) It is weird this isn't already a thing, lol. Signed-off-by: TheOneWhoIsManyFrame <[email protected]> * New horns for oni. (new-frontiers-14#1030) * New horns for oni. * Update meta.json * That one cursed lack of space * Do what was requested * Update meta.json --------- Co-authored-by: Velcroboy <[email protected]> * ftl real * Unreal * Update Dwarf.xml * Update tattoos.yml * Update Species.xml * Update Species.xml * Missing oni and felinid fluent entries * Fix missing goblin marking fluent entries * Fix incorrect goblin marking entries --------- Signed-off-by: Null <[email protected]> Signed-off-by: Adrian16199 <[email protected]> Signed-off-by: DefinitelyNotFurryXD <[email protected]> Signed-off-by: TheOneWhoIsManyFrame <[email protected]> Co-authored-by: Adrian16199 <[email protected]> Co-authored-by: Adeinitas <[email protected]> Co-authored-by: Tad "Taddy" Johnson <[email protected]> Co-authored-by: Null <[email protected]> Co-authored-by: DefinitelyNotFurryXD <[email protected]> Co-authored-by: TheOneWhoIsManyFrame <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Add Frontier Arrivals to Jukebox * linter round 1: fix frontier arrivals URL --------- Co-authored-by: ErhardSteinhauer <[email protected]>
* initial commit * mats * more mats
* remove invisible IFF from prowler * Unfood --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* Bazaar (Update) * shipyard.yml * Update bazaar.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
…tiers-14#1654) * StartingGear: remove components from suitstorage * Sheriff: reorder starting gear items by size * ERT: remove comment * Remove ERT comment
* Liquidator (Update) * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Liquidator.xml Co-authored-by: Whatstone <[email protected]> * Update liquidator.yml * Update liquidator.yml --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
|
RSI Diff Bot; head commit 2b93e54 merging into e3ef523 Resources/Textures/DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi
Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi
Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi
Resources/Textures/Structures/Wallmounts/barsign.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About the PR
More Exotic Drinks
Why / Balance
Fun
How to test
Run it on local
Media
Gin And Sonic - Drink
Breaking changes
None (I think)
Changelog
🆑