a #4
Closed
a #4
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
(cherry picked from commit 90279b33579f93ccaf240eadf7f924bfc24c4468)
Validate that job and antag prototypes can actually be set in character profiles, rather than just checking if the prototype exists. Make preferences system just call existing validation code when loading prototype from database, instead of some hacked-together stuff. Also I made the character profile validation logic take dependencies in via parameter because fuck resolves. (cherry picked from commit 8d244f7b76ba881253eb94611acaab31865c3920)
Everything can read (kinda) (cherry picked from commit b7be6932f364312e8ca673ab4c0b413f768b92e2)
* Initial commit * Remove damage from cuffs entirely * Changed from Action uncuffing cooldown to UseDelay cooldown * Minor merge conflict fix * Edit the actual correct line * Submodule fix (cherry picked from commit 485fb4cb652793ab4f9cbe90bb2cbf555fbf5540)
(cherry picked from commit 2a2324ecaf0dbe5e384ae4f7bdb241a817b3653f)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components. (cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
(cherry picked from commit 002b8d88711aa6395c5e054c3aa9bd163f74799e)
(cherry picked from commit c02c8c2319e57d0172fa8a8c20e2be6f56ba36e3)
Injector status UI cached values Co-authored-by: Plykiya <[email protected]> (cherry picked from commit dffd02adb161f8299e858fb6c0c2eb71e595e21f)
swapped icons for crates (cherry picked from commit 76823cc52264e53d673ce728692ee4d02073b518)
* Cleans up base crates for mapping clarity * migration --------- Co-authored-by: Jeff <[email protected]> (cherry picked from commit 2efad4f3c57dc9265f8960634500c05648e06d77)
Co-authored-by: Jeff <[email protected]> (cherry picked from commit 19ce9edf103620524a3b8febce8e039fbcefc3a8)
Co-authored-by: Jeff <[email protected]> (cherry picked from commit 918eb1fe87d1543be84b8dba5c654434afa7f9a3)
let there be (led) light (cherry picked from commit 89c822638057e2c7071ae6cb4380b114da5a4961)
(cherry picked from commit 4bf2364f5fbf79d87c9ea819a57beac73823a1cf)
Co-authored-by: botanySupremist <[email protected]> (cherry picked from commit c6bfb657adf2d57f30a464259196bc08f7759d10)
* Add weh to: Anomalies, Artifacts, random puddles * also change weh to wehs! (cherry picked from commit 30e09af2a46ef456e3dbebfe02b7227a30ce26d7)
* Nerf/Buff Gases cost * Nerf/Buff Gases cost * Nerf/Buff Gases cost --------- Co-authored-by: CyberDuck <[email protected]> (cherry picked from commit c0290d18f24b1fc7cd166eae8fb165ae525a9923)
(cherry picked from commit 2faf7433c0caf5a768a189e4cdba8a0c43b6e8ea)
meat and potatoes ayup (cherry picked from commit 6b00f592b69d0423909e97eae973f3815643628d)
…econds (#25614) (cherry picked from commit 5367d9954535df433c2286268c8532e8f7a3cfc2)
(cherry picked from commit 7593a2e9583a0b3f65ad51afc3b3ab86d4742c19)
Update uplink_catalog.yml (cherry picked from commit 849dc433651f4c49f3cb3e585ea2c1bc595323b1)
makeshift handcuffs are easier to escape from (cherry picked from commit 74232f983129b97d6c2564b904eb7ad7f2a49cf5)
Update medidrobe.yml (cherry picked from commit b7b6f61f2ae94431fa558edd87fc8eea6c08d966)
(cherry picked from commit 7fc75f75419a915a4383bfa73ed5109b384c48b2)
* blue * others * add white table * add crafting carpets * finish carpets * tags * crafting * pip * finish (cherry picked from commit 84cbcb93cacf339510d9190ad18e377c892df3b3)
(cherry picked from commit a0b0579d2e91616663b4f18a41098e40b95d1daa)
Initial commit (cherry picked from commit 3af2928a25c4cbc0ee6e8edabf317d060b652b06)
nt balloon surprised one didn't exist already (cherry picked from commit 0536ce6f95aced669913dacc7d89554ee6bc652f)
* new stamps * add stamps to cmos locker and lawdrobe * adds stamps to starting gear of psychologist and lawyer * move locale to deltav
* nukie medhud Signed-off-by: JoeHammad1844 <[email protected]> * Update meta.json Signed-off-by: JoeHammad1844 <[email protected]> * should solve conflict Signed-off-by: JoeHammad1844 <[email protected]> * that took too long to fix Signed-off-by: JoeHammad1844 <[email protected]> * Update hud.yml Signed-off-by: JoeHammad1844 <[email protected]> * hmmm Signed-off-by: JoeHammad1844 <[email protected]> * might fix it Signed-off-by: JoeHammad1844 <[email protected]> * Update hud.yml Signed-off-by: VMSolidus <[email protected]> --------- Signed-off-by: JoeHammad1844 <[email protected]> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>
* Finished * Revert "Finished" This reverts commit 4ab2d61. * Finished actual * Update general.yml * Update general.yml * making changes added prison coms to security key and removed it from hos headset * I think this is correct * Move localisations into Delta-V directory * file fix * file location change --------- Co-authored-by: Nova <[email protected]>
Half all energy requirements
* updates map, lowers server volume * Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml * Update DV-pirateradio.yml * changes fax machine to *not* alert admins; and start with emagged by default instead of using VV * Revert "changes fax machine to *not* alert admins; and start with emagged by default instead of using VV" This reverts commit 05bb5f4. * Revert "Update DV-pirateradio.yml" This reverts commit e77fb34. * Revert "Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml" This reverts commit 2000e2c. * Revert "updates map, lowers server volume" This reverts commit d99cab6. * adds new syndicate fax, maps it in as well as other QOL changes * adds cybersun pen to Syndicate PDA's * Update DV-pirateradio.yml * adds blacklist to CC Fax + quieter server * Update PirateRadioSpawnRule.cs * unfinished scuttling system * Adding colorblind quality of life. * Tweaks to map and guards, no more self destruct system * added guard flavor text * The reasons for these are now gone * DONE * Update events.yml * Update PirateRadioSpawnRule.cs * Update DV-pirateradio.yml * fixes crew monitor server not working at *extreme* ranges * adds delta-v comment where needed * Small code optimization and tons of documentation * Update outpost visuals! Guards have a PDA now * Update DV-pirateradio.yml * Update DV-pirateradio.yml * Goodbye crab. Hello Content.Shared migration * Cleaning up pirateradio spawn * Update DV-pirateradio.yml * reverts pen changes to upstream PDA's * adds new PDA * adds new PDA to loadouts. * Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml Co-authored-by: Debug <[email protected]> Signed-off-by: Danger Revolution! <[email protected]> * Maintainer requested changes * Update salvage.yml * Update syndicateNPCs.yml * Cleaning up unneeded stuff * more code cleanup * Update PirateRadioSpawnRule.cs * Update computers.yml * Revert "Update computers.yml" This reverts commit cbd0c58. * Last fixes to the math * Update PirateRadioSpawnRule.cs * update license. --------- Signed-off-by: VMSolidus <[email protected]> Signed-off-by: Danger Revolution! <[email protected]> Co-authored-by: DangerRevoltion <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Debug <[email protected]>
* Added chemical resistant apron * Added formal chemistry suit * Added chemist's tie * Added enclosed shoes * Added chemistry gloves * Added glasses + fixed errors on modifiers * Updated the ChemDrobe with new items * modified the chemdrobe file * modified the outerclothing misc file * modified glasses file * modified the gloves file * modified ties file * modified specific shoes file * modified jumpsuits file * Update glasses.yml Signed-off-by: VMSolidus <[email protected]> * Update gloves.yml Touching up descriptions Signed-off-by: VMSolidus <[email protected]> * Update misc.yml Signed-off-by: VMSolidus <[email protected]> --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>
* Update cargo_fun.yml Signed-off-by: dge21 <[email protected]> * Update cargo_fun.yml Signed-off-by: dge21 <[email protected]> * Update fun.yml Signed-off-by: dge21 <[email protected]> --------- Signed-off-by: dge21 <[email protected]>
* Adds DV fluff to captain's nolaser locker * I ALREADY DELETED THS, WTF --------- Co-authored-by: Velcroboy <>
* Adds howling / growling noises * revenge of the spelling error!! grahh!! * trying to fix that error with the schema validator * Fixing copyright + adds vulp growls to harpy emote * The case of the missing attributions dashes. * Fixes up attributions.yml with license.txt info * Update Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Adeinitas <[email protected]> --------- Signed-off-by: Adeinitas <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
* Update shoukou.yml * Update shoukou.yml * Update shoukou.yml * Update shoukou.yml
* Fixes ifriit. The mystagogue's guardian. TO-DO: Figure out how to give the ifriit the actual tool instead of bite that still has the damage propertys of the tool? * Hands, innatetool DEATH giving different parent to make the bite attack frick off. Dont let them shove, simple different attack would make sense. * forgot to delete that one * Just going to put this together I suppose? * I guess his hands atleast work * whoopsie yaml linter * Finishing touches and cleaning up. Not sure how long I will have to living but eh, at the least might aswell finish some PR's * Eh, i wanted to keep it but i guess not. * Update misc_startinggear.yml * Update ifrit.yml * Innate tooling... * Makes it work just how its needed to do so. * brings back the previous pngs
Co-authored-by: DeltaV-Bot <[email protected]>
|
Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation You can move your current work from the master branch to another branch by doing |
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
Why / Balance
Technical details
Media
Breaking changes
Changelog