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

Conversation

@yogstation13-bot
Copy link
Contributor

Original PR: tgstation/tgstation#40449

🆑 BeeSting12
fix: Sustenance vendors are free.
/:cl:

Sustenance vendors should be free so perma prisoners can eat without having to pay.

BeeSting12 and others added 2 commits September 25, 2018 09:10
Sustenance vendors should be free so perma prisoners can eat without having to
pay.
@ThatLing ThatLing merged commit 29f6c0f into master Sep 25, 2018
@ThatLing ThatLing deleted the upstream-merge-40449 branch September 25, 2018 11:34
nmajask added a commit to nmajask/Yogstation-But-Worse that referenced this pull request Sep 13, 2021
Ports "Custom shuttle offsets and view range depends on ship size. yogstation13#2685" by Dennok and "Custom transit dir for custom shuttle yogstation13#2689" by Dennok
JamieD1 added a commit that referenced this pull request Sep 17, 2021
* Ports "Ship construction through the power of science!"

- Ports BeeStation/BeeStation-Hornet#1398

* Ports some changes

- Ports https://github.com/BeeStation/BeeStation-Hornet/pull/1904/files# and BeeStation/BeeStation-Hornet#1529

* Should fix some stuff

- Removed some unused files
- Fixed a change to a random file

* Should fix more stuff

- Added some more important files
- Added the icons I forgot to add

* Oh, I didn't update the dme

- Should fix this, maybe?

* Probably should add the turf icons

- Added the turf icons

* Fixes the name filter

One down, two to go
- Fixes the name filter by using isnotpetty instead of OOC_FILTER_CHECK, now if you make a shuttle with a bad name, it will message the admins.

* Fixes the tech web

- Fixes the tech web
- Adds the new icons for the RSD

* Should fix some stuff with the shuttles

Should fix most of the runtimes and issues that ive had thanks to Jamie's help. Should bring this from ""functional"" to "functional".

* I am too tired for this

why github desktop, WHY!!

* Adds spaceship navigation beacons

They kinda work.

* should fix the beacons

why do i do this the way i do

* Ports some fixes by Dennok

Ports "Custom shuttle offsets and view range depends on ship size. #2685" by Dennok and "Custom transit dir for custom shuttle #2689" by Dennok

Co-authored-by: nmajask <nmajask@gmail.com>
JamieD1 added a commit that referenced this pull request Oct 6, 2021
…11901)

* Ports "Ship construction through the power of science!"

- Ports BeeStation/BeeStation-Hornet#1398

* Ports some changes

- Ports https://github.com/BeeStation/BeeStation-Hornet/pull/1904/files# and BeeStation/BeeStation-Hornet#1529

* Should fix some stuff

- Removed some unused files
- Fixed a change to a random file

* Should fix more stuff

- Added some more important files
- Added the icons I forgot to add

* Oh, I didn't update the dme

- Should fix this, maybe?

* Probably should add the turf icons

- Added the turf icons

* Fixes the name filter

One down, two to go
- Fixes the name filter by using isnotpetty instead of OOC_FILTER_CHECK, now if you make a shuttle with a bad name, it will message the admins.

* Fixes the tech web

- Fixes the tech web
- Adds the new icons for the RSD

* Should fix some stuff with the shuttles

Should fix most of the runtimes and issues that ive had thanks to Jamie's help. Should bring this from ""functional"" to "functional".

* I am too tired for this

why github desktop, WHY!!

* Adds spaceship navigation beacons

They kinda work.

* should fix the beacons

why do i do this the way i do

* Ports some fixes by Dennok

Ports "Custom shuttle offsets and view range depends on ship size. #2685" by Dennok and "Custom transit dir for custom shuttle #2689" by Dennok

* Admin RSD and minor tweaks

- Added the Admin RSD, which ignores the shuttle size and area limit, allowing you to turn whole chucks of the station into shuttles
- Renamed the shuttle navigation computer to the shuttle zoning designator to avoid confusion
- Tweaked the designs for the shuttle circuit board design to use the correct name for the boards
- Moved the Bluespace Navigation Gigabeacon board into shuttle machinery

* Fixes Bluespace Navigation Gigabeacon not being able to be researched

- I forgot to add Bluespace Navigation Gigabeacon to the lists of unlocks for Spacepod Construction, so I fixed that

* readded the RSD sprites

got to love merge conflicts

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants