Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sunskipper-class Culinary Vessel - the Boyardee replacement. Also, a lot of tweaks to the booze-o-mat. #2836

Merged
merged 68 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
9014b03
sunskipper
Sadhorizon Mar 13, 2024
d5df4a0
Boyardee removal
Sadhorizon Mar 13, 2024
6024200
forgor to name this
Sadhorizon Mar 13, 2024
e56b3cd
double pipe
Sadhorizon Mar 13, 2024
ac5a411
fuel crate, filled trash cans, added evac signs
Sadhorizon Mar 13, 2024
2fdcafb
turf passthroughs
Sadhorizon Mar 13, 2024
2490a4b
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Mar 13, 2024
f1bcb17
COMFY SOFA WOOP WOOP
Sadhorizon Mar 13, 2024
41bed74
shutter corner rotations
Sadhorizon Mar 13, 2024
844ce89
indie fax machine
Sadhorizon Mar 13, 2024
d6d2a92
tweaks
Sadhorizon Mar 14, 2024
b7d46a2
tweaks
Sadhorizon Mar 14, 2024
318eea3
cobwebs
Sadhorizon Mar 14, 2024
af142a4
access tweaks
Sadhorizon Mar 14, 2024
3d9abf8
less plasma
Sadhorizon Mar 14, 2024
a78e973
better description is here
Sadhorizon Mar 14, 2024
0a059c8
tweaks
Sadhorizon Mar 24, 2024
ecb30a7
reviews reviews reviews
Sadhorizon Mar 25, 2024
27d7c81
tweaks
Sadhorizon Mar 25, 2024
e574ba9
cable
Sadhorizon Mar 25, 2024
923b51c
paintings
Sadhorizon Mar 25, 2024
8c1c815
more wallmount fixes + an aquarium
Sadhorizon Mar 28, 2024
88a2d56
money money money
Sadhorizon Mar 29, 2024
f55dc54
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Apr 1, 2024
834fda6
Moved tables a bit
Sadhorizon Apr 1, 2024
ec68c3f
moved feesh food
Sadhorizon Apr 1, 2024
e4af7ca
botanist removal + cards
Sadhorizon Apr 6, 2024
f1116d8
missclick
Sadhorizon Apr 6, 2024
554cc7e
more seeds
Sadhorizon Apr 6, 2024
43a4b42
boozeomat additions
Sadhorizon Apr 6, 2024
edebc4d
closets + more boozeomat tweaks
Sadhorizon Apr 10, 2024
e6dae52
a lot
Sadhorizon Apr 11, 2024
5b1bfed
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Apr 17, 2024
000455e
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Apr 17, 2024
49fed81
gravgen and radios
Sadhorizon Apr 17, 2024
2bf94e0
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Apr 20, 2024
75381b6
new sofas
Sadhorizon Apr 20, 2024
bf4c8ee
minor tweak
Sadhorizon Apr 24, 2024
3d16679
comment
Sadhorizon Apr 28, 2024
b2ff10e
main room
Sadhorizon May 2, 2024
5f96607
candle
Sadhorizon May 2, 2024
e15c38e
Ashwine in the safe
Sadhorizon May 3, 2024
b4353d0
other tweaks
Sadhorizon May 3, 2024
42f38f9
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon May 4, 2024
eb79cec
anchors this thing
Sadhorizon May 4, 2024
5479d41
seeds and railing
Sadhorizon May 12, 2024
750eacd
drinks and tweaks and stuff and aaaaaaaaaaa
Sadhorizon May 12, 2024
ddd347e
stray pixel
Sadhorizon May 12, 2024
146ded5
that plant looked bad tbqh
Sadhorizon May 12, 2024
fecbc21
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon May 12, 2024
42e4af1
like a bunch more tweaks
Sadhorizon May 12, 2024
17bfbc2
missed a railing
Sadhorizon May 12, 2024
c4c3cc7
very minor
Sadhorizon May 12, 2024
e0fbb5b
Free autolathe!!! Buy while fresh!!!
Sadhorizon May 12, 2024
ee4f3fc
red tables
Sadhorizon May 12, 2024
58bf5d5
simpler this way
Sadhorizon May 12, 2024
3f3c356
How about you dress properly?
Sadhorizon May 12, 2024
9fdd0f9
you too
Sadhorizon May 12, 2024
b55100e
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon May 13, 2024
8ec5647
comment + revert of one thing
Sadhorizon May 24, 2024
46a9e57
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon May 30, 2024
71738cc
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Jun 2, 2024
5bb0a28
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Jun 2, 2024
438b8b1
double vent
Sadhorizon Jun 2, 2024
6e9e7ba
Revert "double vent"
Sadhorizon Jun 2, 2024
f4a82ce
good enough
Sadhorizon Jun 2, 2024
a3fab54
No.
Sadhorizon Jun 10, 2024
85b4acc
Merge remote-tracking branch 'upstream/master' into sunskipper
Sadhorizon Jun 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 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
Loading