Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@Simplehorror
Copy link
Contributor

If this is your first PR, or not, take the time to read our CONTRIBUTING.md file! You can see it here: https://github.com/yogstation13/Yogstation/blob/master/.github/CONTRIBUTING.md

Document the changes in your pull request

Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #6" to link the PR to the corresponding Issue number #6.

Prefix the PR title with [admin] if it involves something admin related.
Prefix the PR title with [s] if you are fixing an exploit, so that it is not announced on the Yogstation Discord and the server.

Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying.

Wiki Documentation

Remove this text and write all information regarding your changes that should be known and documented through the Yogstation Wiki.
Important documentation information includes, but is not limited to: any numerical values that have been changed, any images that have to be updated, names of specific pages that will be impacted by your changes.

Changelog

Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.

🆑
rscadd: Added new things
rscdel: Removed old things
bugfix: fixed a few things
wip: This is work in progress
tweak: tweaked a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
experimental: This is experimental
/:cl:

Yogbot-13 and others added 30 commits February 12, 2022 12:10
* Changed screams to be handled by DNA for all species

* Fix small oversight
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](axios/axios@v0.19.2...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Merge branch 'yogstation13:master' into pools

* re-map pools

* fix luxury pool

* some more map changes

* spelling changes

* map changes
* ports inn to lavaland

* adds a light i forgot to replace
…ter icon (yogstation13#13233)

* ok whatever

* Update hud.dmi

* Revert "ok whatever"

This reverts commit accc117.
* Update README.md

* AI is now a tcomms hub

* Revert "Update README.md"

This reverts commit 4daedebb83de5071fe46c0f875ea044ed1ada3d5.

* testing map items

* REF passing

* AI projects baseplate

* oops more changes

* Update ai_dashboard.dm

* zonk

* project code

* bug fixing for 30 minutes i love it

* minor dash changes

* Upgrades finished plus leftovers

* Update expansion_card_holder.dm

* changes

* polish

* yogmap

* Basic Upgrades

* it needs to also compile...

* Update examine.dm

* e

* sci and some sat changes

* this until bibby wakes up and explains things

* better core

* HOW FIX MAP CONFLICT

* Update ai_controlpanel.dm

* Update YogStation.dmm

* ok i think this works??

* bug fixes

* Widescreen hud + various fixes

* revert build tools changes

* Update login.dm

* small fixes

* no infinite loop thanks

* Update decentralized_os.dm

* Update decentralized_os.dm

* Update decentralized_os.dm

* NO MORE INFINITE LOOPS EVER

* small changes

* meta

* delta

* kilo

* malf AI works

* ui compiles

* Update AiDashboard.js

* Update AiDashboard.js

* Update expansion_card_holder.dm (yogstation13#12818)

* this should fix the crash

* this should actually fix the crashes, for good

* logging fixes

* Fixed firewall causing AI download to speed up (yogstation13#12838)

* Fixed firewall causing AI download to speed up

* Make bibby happy

* small fixes

* Various minor fixes

Fixed 50% warning spam. Added coordinates to console location
Added "Finish Download" option for AI to skip download process of itself
Fixed AI IntelliCard uploading
Minor stability fix
Minor unintended AI abilities on the control console removed
Examining AI data cores as an observer now shows AI laws

* Linter

* map changes (yogstation13#12852)

* Automatic changelog generation yogstation13#12852 [ci skip]

* Update ai_data_core.dm

* vox fix

* fixes oversights (yogstation13#12859)

* Automatic changelog generation yogstation13#12859 [ci skip]

* conflict fixed

* more logging

* lots of bug fixes

* oops

* Update _ai_machinery.dm

* Update ai_data_core.dm

* Update ai_data_core.dm

* Update expansion_card_holder.dm

* Minor fixes (Including weird fail on can_see when you've just spawned in)

* oldstation goodbye

* maps

* removes the AI core from the game

* missed one

* spans

* induction start

* Update AiDashboard.js

* induction start

* Update AiDashboard.js

* Revert "Merge branch 'more_ai_upgrades' of https://github.com/yogstation13/Yogstation into more_ai_upgrades"

This reverts commit 26e1060, reversing
changes made to 0df6bdb.

* Target abilities

* linter happy

* Update ai.dm

* Fixes to induction, oops

* Update ai_dashboard.dm

* Create surveillance.dm

* Camera Memory Tracker

* Update Malf_Modules.dm

* Update ai_dashboard.dm

* Update ai_dashboard.dm

* Update ai.dm

* Update surveillance.dm

* Update surveillance.dm

* Update surveillance.dm

Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: Yogbot-13 <admin@yogstation.net>
Co-authored-by: Theos <theubernyan@gmail.com>
…Refurbished OmegaStation AI core. (yogstation13#13257)

* AI Core Tutorial - Secondary AI Core Eclipse

* Vault Door Secondary AI Core

* Kilo, Omega, Delta, Meta, Tutorial Holodisk Add

* Updates omegastation to properly support AI cores.

* additions

* critical camera add
Adds some additional clarity and grammar corrections to Bibby's rounstart announcement about AI Changes.
…lyknowhowtocode(((help))) (yogstation13#12906)

* Update ministile.dm

* Update code/game/machinery/doors/ministile.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* fix code

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: ToasterBiome <baiomurang@gmail.com>
Yogbot-13 and others added 20 commits March 13, 2022 07:15
* RPEDs now work on APCs

* The new cell is now recharged by the old cell

* Fix weird typo
* Refactors VV

* Copied more tg code

* Fixes renameing by copying more tg code

* Copies some code from yogs this time
* Donor hats now get placed on borgs

* Added preference toggle
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…th soporific rounds (yogstation13#13404)

* Pacifist stechkin

Gives pacifists who order stechkins from uplinks get a version loaded with soporific rounds.

* Alerts the user

Alerts the user of the change of ammunition

* Merge branch 'sleepy-round-stuff' of https://github.com/nmajask/Yogstation-But-Worse into sleepy-round-stuff

* Reworks the implementation

Makes starting mag a variable and changes the check to look for pacifism being a quirk.

* Update code/modules/uplink/uplink_items.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
@Simplehorror Simplehorror requested review from a team and monster860 as code owners March 20, 2022 19:00
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Fix This fixes an issue. Please link issues in fix PRs Revert / Deletion Altoids is probably mad about this Tweak This PR contains changes to the game. labels Mar 20, 2022
@Simplehorror Simplehorror deleted the fix_command_bar_bug branch March 20, 2022 19:00
@Simplehorror Simplehorror restored the fix_command_bar_bug branch March 20, 2022 19:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Feature This adds new content to the game Fix This fixes an issue. Please link issues in fix PRs Revert / Deletion Altoids is probably mad about this Tweak This PR contains changes to the game.

Projects

None yet

Development

Successfully merging this pull request may close these issues.