Skip to content

Commit

Permalink
Sunskipper-class Culinary Vessel - the Boyardee replacement. Also, a …
Browse files Browse the repository at this point in the history
…lot of tweaks to the booze-o-mat. (#2836)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

**TODO**
- [x] tweaks I noted down somewhere else
- [x] address reviews when they pop up
- [x] ~~ethics of passengers~~
- [x] cash rebalance
- [x] ~~more sofas~~ rework the main room 💀
- [x] fate of the botanist
- [x] add gravgen after that's merged
- [x] maybe add lathe
- [x] add missing regeants to the boozeomat



![scrnshot1](https://github.com/shiptest-ss13/Shiptest/assets/108196626/dd8aeb08-ce2b-41aa-bc8c-67e53c387272)

![StrongDMM-2024-05-12 20 45
19](https://github.com/shiptest-ss13/Shiptest/assets/108196626/cbb82d0d-bd89-4a4b-bbac-dffccbd7ee02)

![StrongDMM-2024-04-17 16 41
07](https://github.com/shiptest-ss13/Shiptest/assets/108196626/10854a47-c53c-4c79-8376-5af9afae0de2)


Seeds in the locker (if something important is missing here, slap me
with a large stick pls):

![obraz](https://github.com/shiptest-ss13/Shiptest/assets/108196626/34286116-1bec-4bdf-b8bd-5dced6e1e36c)

Meds in the locker:

![obraz](https://github.com/shiptest-ss13/Shiptest/assets/108196626/b4d822d3-2a7e-4e39-9d12-9c5425344e1c)

Stuff in the safe:

![obraz](https://github.com/shiptest-ss13/Shiptest/assets/108196626/42e6aa18-31c8-4b49-8f71-b4a99e33860a)

New bottles! Absolutely not peak sprite design, but I needed
_something_, alright? Lemon Juice, Triple Sec, Creme de Cacao, Creme de
Menthe:

![obraz](https://github.com/shiptest-ss13/Shiptest/assets/108196626/604e8d99-7c25-4389-bd3f-5efd3ce20aa9)


Also, as the bar doesn't have any dispensers, I have added all of
dispenser reagents to the booze-o-mat instead.

Also also, wiki page (WIP):
https://shiptest.net/wiki/User:Sadhorizon#Sunskipper-class_Culinary_Vessel
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The 
Boyardee is old and really really bad at it's job as a restaurant ship.
Sunskipper is meant to replace it.

Indie chefs loose cqc, because it's an ability fit for fending off
tiders in a station environment - not on a six player ship.

Booze-o-mat full of drink-making ingredients is a large step to getting
rid of bar dispensers completely.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added the Sunskipper-class Culinary Vessel.
add: Every drink and booze dispenser drink is in the booze-o-mat now.
add: Added bottles for triple sec, lemon juice, creme de cacao and creme
de menthe.
del: Removed the Boyardee-class Entertainment Vessel.
del: Independent chefs no longer get kitchen cqc.
tweak: The "syndicate waiter's outfit" renamed to just "waiter's
outfit".
tweak: Indpenedent bartenders now start with a waistcoat.
tweak: Edited waiter's outfit. Also, the role now gets kitchen access.
tweak: Independent cooks now start with laceup shoes.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored Jun 12, 2024
1 parent 494681f commit 05630d5
Show file tree
Hide file tree
Showing 10 changed files with 4,864 additions and 3,548 deletions.
43 changes: 0 additions & 43 deletions _maps/configs/independent_boyardee.json

This file was deleted.

36 changes: 36 additions & 0 deletions _maps/configs/independent_sunskipper.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Sunskipper-class Culinary Vessel",
"prefix": "ISV",
"namelists": ["CRUISE", "NATURAL"],
"map_short_name": "Sunskipper-class",
"map_path": "_maps/shuttles/independent/independent_sunskipper.dmm",
"description": "The Sunskipper-class is a state-of-the-art culinary vessel found in the frontier. It's name is a wordplay between a Kalixcian species of butterfly and ship's unique solar-powered batteries. The Sunskipper is welcomed with open arms by weary spacers of greater paycheks, who are fatigued by the monotony of their everyday meals. The ship features a self-sustaining kitchen with hydroponics and a large, deluxe dining hall, designed to serve starved travelers. It also comes with a fully-stocked bar area that allows them to drink their troubles away, if even for a brief moment.",
"tags": [
"RP Focus",
"Service",
"Specialist"
],
"starting_funds": 3000,
"limit": 1,
"job_slots": {
"Manager": {
"outfit": "/datum/outfit/job/independent/captain/manager",
"slots": 1,
"officer": true
},
"Bartender": {
"outfit": "/datum/outfit/job/independent/bartender/disarmed",
"slots": 1
},
"Cook": {
"outfit": "/datum/outfit/job/independent/cook",
"slots": 2
},
"Waiter": {
"outfit": "/datum/outfit/job/independent/assistant/waiter",
"slots": 2
}
},
"enabled": true
}
Loading

0 comments on commit 05630d5

Please sign in to comment.