This repository has been archived by the owner on Mar 5, 2024. It is now read-only.
[pull] master from DeltaV-Station:master #6
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
DebugOk
pushed a commit
that referenced
this pull request
Jul 20, 2023
Alternate commit of the Nyanotrasen PR that has the same changes, but with less maintenance shaft lighting.
DebugOk
pushed a commit
that referenced
this pull request
Jul 20, 2023
Alternate commit of the Nyanotrasen PR that has the same changes, but with less maintenance shaft lighting.
(cherry picked from commit 7302852)
* Glasses/Hud Art Dump * Forgot to change omni ID * Changed id in other ymls to match new one * Redo * Updated Map Beer Goggles IDs --------- Co-authored-by: Derby <Derby@ss14> (cherry picked from commit 8345778)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 88eaf7a)
(cherry picked from commit a7820b3)
(cherry picked from commit 7ef7fb2)
Co-authored-by: Phill101 <[email protected]> (cherry picked from commit ebe72ac)
Reupload (cherry picked from commit ba37289)
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 6ce6aa1)
* thirst .Owner removal * thirst file scope * drink update + minor refactor * drink file scope * let animals drink things * dont eat/drink when dont need to * admeme mouse override * moo --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 063f75c)
…universe. (#18301) (cherry picked from commit 67dbe5f)
(cherry picked from commit 12391b4)
(cherry picked from commit 9507520)
* real * hjoly fuck you guy sare annoying * fix cargo arbitrage idk why tf it changed from editing armor values but fuck my life i guess * why god * Update suits.yml * Update cargo_emergency.yml (cherry picked from commit 31607a0)
* Fix radiation sound not working Signed-off-by: c4llv07e <[email protected]> * Make Geiger sound local Signed-off-by: c4llv07e <[email protected]> --------- Signed-off-by: c4llv07e <[email protected]> (cherry picked from commit 1b4373d)
(cherry picked from commit edb33ca)
* Prevent crit players from using LOOC * fix comment (cherry picked from commit 8b0d6a4)
(cherry picked from commit 4879dbd)
(cherry picked from commit 00104c9)
(cherry picked from commit b478d53)
(cherry picked from commit 86f33a8)
(cherry picked from commit e0c4884)
(cherry picked from commit 151f1c1)
* Add Console, PDA news tab, and ringstone popup * Add English localization * Add mass-media console board to Advanced Entertainment resrarch * Fix misprint * Deleting unused libraries * Fix round restart problem * Fixing restart problem * Just another fix * Сode optimization * Code optimization (cherry picked from commit 325d2a3)
(cherry picked from commit 13a2c4a)
(cherry picked from commit f579818)
(cherry picked from commit ee8407f)
- Early Merge Glacier Update
* VentCrittersRule scaling chance + spawn on station * merge mouse migration and vent critters * fix prototypes * check if there is no valid locations Co-authored-by: Slava0135 <[email protected]>
* VentCrittersRule scaling chance + spawn on station * merge mouse migration and vent critters * fix prototypes * check if there is no valid locations Co-authored-by: Slava0135 <[email protected]>
* Map Edits * Oops, forgot something really important * Add cargo bounty console * Freezer/Cow fix * Accidentally deleted a warp point --------- Co-authored-by: Jeff <[email protected]>
* Add Blue Curacao Recipe of OJ and Sugar 'Curaçao is a Caribbean liqueur made using the dried peel of the Laraha citrus fruit.' We do not have the Laraha citrus fruit, but we have OJ and artificial food sweetener in the form of sugar, and I think that's close enough. * Fixed the file placement. Removed from upstream drinks list. Added to Delta-V drinks list.
* Everything Related to the ERT The Errors.. make them stop. * Fix 1.0 Accidental Capitalization and copying mistakes. * Fix 1.5 * Fix 2.0 * Adding Automatic Weapons for Gamma Security ERT
* Butlertron, the Robossieur "Greetings meatbags! This is Butlertron_Durandal, the latest in entrepreneurship technology! I have heard word that you all staff an exorbiant number of fleshlings to prepare food and drink aboard your stations. With my latest contract with your station owners, I am prepared and willing to deploy terminals to every station in the cosmos! I hope you all are ready, because there is a great deal of money to be made if you can source the dishes my discerning clientele desire." Implements the new entity type 'Mr. Butlertron'. Mr. Butlertron requests specific foods from players, using the list of recipes available to the game. He has a blacklist of items he will not request, which fundamentally make up three categories: Simple, Disgusting, and Cannibalistic. He also has 3 tiers of foods he can request, and could be iterated upon in the future to add more tiers. Each tier increases the amount of zorkmids he will give in payment, and from the 2nd tier of food onward, he will dispense ice cream along with his dough. Take too long, however, and this affable automaton will begin to become upset, and may even lose his temper entirely, changing his request to something new. This change occurs after 10 minutes, and he begins getting impatient after 8 minutes have passed. I reused several of the scripts used by the Oracle to create Mr. Butlertron, and am hoping in the future to make him a roaming NPC, perhaps by splitting up his responsibilities into different chunks and having different 'styles' of Mr. Butlertron being able to spawn on different stations. Given that Delta-V does not have a significant amount of its own unique content and folders to support that unique content, I placed most of his files within Nyano's files. Maybe this is not how it should be structure, and I open to suggestions. * Changed a folder name. I spelled my funny made up french word wrong on one folder name. Shouldn't affect anything anywhere, since .ftl folders aren't used anywhere either way. * Update Content.Server/Nyanotrasen/Roboisseur/RoboisseurComponent.cs Co-authored-by: DEATHB4DEFEAT <[email protected]> * Update Content.Server/Nyanotrasen/Roboisseur/RoboisseurComponent.cs Co-authored-by: DEATHB4DEFEAT <[email protected]> * Apply line breaks and code from Death's code review Co-authored-by: DEATHB4DEFEAT <[email protected]> * Code review comment addressing. All code review comments addressed. * Apply suggestions from code review relating to spacing, again, and indefinite tagging. Very cool. Co-authored-by: DEATHB4DEFEAT <[email protected]> * Butlertron Testing and Data Field Addition Done. --------- Co-authored-by: DEATHB4DEFEAT <[email protected]>
* Update Rules.txt Rulez rool!1 * Update Rules.txt further changes
Co-authored-by: Jeff <[email protected]>
no more 500px wide images
* Update labeler.yml * Update conflict-labeler.yml
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )