cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Luxury bar capsule (#11152)

Browse Source 
* add from bee

* map

* code
This commit is contained in:
wejengin2
2021-03-20 14:01:04 +01:00
committed by GitHub
parent 6023dece01
commit e2493dd98a
4 changed files with 432 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

410
_maps/templates/shelter_3.dmm Normal file
View File

@@ -0,0 +1,410 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"b" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"c" = (
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"d" = (
/obj/structure/sign/mining/survival{
dir = 1
},
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"e" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"f" = (
/obj/structure/table/wood/fancy/black,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/pod/dark,
/area/survivalpod)
"g" = (
/obj/structure/table/wood/fancy/black,
/obj/machinery/chem_dispenser/drinks/beer,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod)
"h" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/pod/dark,
/area/survivalpod)
"i" = (
/obj/item/book/manual/wiki/barman_recipes,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/glass/rag,
/obj/structure/table/wood/fancy/black,
/turf/open/floor/pod/dark,
/area/survivalpod)
"j" = (
/obj/structure/table/wood/fancy/black,
/obj/item/clipboard,
/obj/item/toy/figure/bartender,
/turf/open/floor/pod/dark,
/area/survivalpod)
"k" = (
/obj/machinery/door/window/survival_pod,
/turf/open/floor/pod/dark,
/area/survivalpod)
"l" = (
/obj/structure/table/wood/fancy/black,
/obj/structure/reagent_dispensers/beerkeg,
/turf/open/floor/pod/dark,
/area/survivalpod)
"m" = (
/obj/structure/closet/secure_closet/bar,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/pod/dark,
/area/survivalpod)
"n" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal/bin,
/turf/open/floor/pod/dark,
/area/survivalpod)
"o" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/junction{
dir = 4
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"q" = (
/turf/open/floor/pod/dark,
/area/survivalpod)
"r" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"s" = (
/obj/structure/table/reinforced,
/obj/item/lighter{
pixel_x = -4;
pixel_y = 4
},
/obj/item/lighter,
/turf/open/floor/pod/dark,
/area/survivalpod)
"t" = (
/obj/structure/table/reinforced,
/turf/open/floor/pod/dark,
/area/survivalpod)
"u" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/matches{
pixel_x = -4;
pixel_y = 8
},
/turf/open/floor/pod/dark,
/area/survivalpod)
"w" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"x" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/carpet/black,
/area/survivalpod)
"y" = (
/turf/open/floor/carpet/black,
/area/survivalpod)
"z" = (
/obj/machinery/vending/cigarette/beach,
/turf/open/floor/carpet/black,
/area/survivalpod)
"A" = (
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal/bin,
/turf/open/floor/carpet/black,
/area/survivalpod)
"B" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 9
},
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"C" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8
},
/obj/structure/window/reinforced/survival_pod{
dir = 4
},
/obj/structure/window/reinforced/survival_pod{
dir = 1
},
/obj/structure/window/reinforced/survival_pod,
/obj/structure/grille,
/turf/open/floor/pod/dark,
/area/survivalpod)
"D" = (
/obj/structure/chair/comfy/black,
/turf/open/floor/carpet/black,
/area/survivalpod)
"E" = (
/obj/machinery/door/airlock/survival_pod,
/turf/open/floor/pod/light,
/area/survivalpod)
"F" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/condiment/peppermill{
pixel_x = -4;
pixel_y = 12
},
/obj/item/reagent_containers/food/condiment/saltshaker{
pixel_x = 4;
pixel_y = 4
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"G" = (
/obj/structure/urinal{
pixel_y = 24
},
/turf/open/floor/pod/light,
/area/survivalpod)
"H" = (
/turf/open/floor/pod/light,
/area/survivalpod)
"J" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"K" = (
/obj/structure/chair/comfy/black{
dir = 1
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"L" = (
/obj/machinery/vending/snack/random,
/turf/open/floor/carpet/black,
/area/survivalpod)
"M" = (
/obj/machinery/light,
/turf/open/floor/carpet/black,
/area/survivalpod)
"N" = (
/obj/structure/toilet{
dir = 8
},
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/pod/light,
/area/survivalpod)
"O" = (
/obj/structure/sign/mining/survival{
dir = 4
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"P" = (
/obj/structure/sign/mining/survival,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"Q" = (
/obj/structure/sign/mining/survival,
/turf/closed/wall/mineral/titanium/survival/nodiagonal,
/area/survivalpod)
"R" = (
/obj/machinery/door/airlock/survival_pod/glass,
/obj/structure/fans/tiny,
/turf/open/floor/carpet/black,
/area/survivalpod)
"S" = (
/obj/structure/table/wood/fancy/black,
/obj/item/storage/box/fancy/cigarettes/cigars/cohiba,
/obj/item/storage/box/fancy/cigarettes/cigars/havana{
pixel_y = 5
},
/obj/item/storage/box/fancy/cigarettes/cigars{
pixel_y = 10
},
/turf/open/floor/pod/dark,
/area/survivalpod)
"X" = (
/obj/structure/sink{
dir = 4;
pixel_x = 11
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/pod/light,
/area/survivalpod)
"Z" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/survivalpod)
(1,1,1) = {"
a
e
Z
e
c
e
C
e
C
e
a
"}
(2,1,1) = {"
b
f
q
s
x
y
D
F
K
L
P
"}
(3,1,1) = {"
c
g
q
t
x
y
y
y
y
M
c
"}
(4,1,1) = {"
d
h
q
t
x
y
D
F
K
y
Q
"}
(5,1,1) = {"
c
i
q
u
x
y
D
F
K
y
c
"}
(6,1,1) = {"
d
j
q
t
x
y
y
y
y
y
R
"}
(7,1,1) = {"
c
S
q
t
x
y
c
c
c
c
c
"}
(8,1,1) = {"
d
l
q
t
x
y
c
G
H
H
Q
"}
(9,1,1) = {"
c
m
q
k
y
y
E
H
c
E
c
"}
(10,1,1) = {"
b
n
q
t
z
A
c
X
c
N
P
"}
(11,1,1) = {"
a
o
r
w
r
B
c
J
c
O
a
"}

5
code/modules/mining/equipment/survival_pod.dm
View File

@@ -72,6 +72,11 @@
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
template_id = "shelter_beta"
/obj/item/survivalcapsule/luxuryelite
name = "luxury elite bar capsule"
desc = "A luxury bar in a capsule. Bartender required and not included."
template_id = "shelter_charlie"
//Pod objects
//Window

1
code/modules/mining/machine_vending.dm
View File

@@ -37,6 +37,7 @@
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000, VENDING_UPGRADE),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400, VENDING_TOOL),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000, VENDING_TOOL),
new /datum/data/mining_equipment("Luxury Elite Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 20000, VENDING_TOOL),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800, VENDING_TOOL),
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000, VENDING_TOOL),
new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400, VENDING_TOOL),

16
code/modules/mining/shelters.dm
View File

@@ -68,3 +68,19 @@
blacklisted_turfs += typecacheof(/turf/open/indestructible) //yogs added indestructible floors to the shelter black list
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
/datum/map_template/shelter/charlie
name = "Shelter Charlie"
shelter_id = "shelter_charlie"
description = "A luxury elite shelter which holds an entire bar \
along with two vending machines, tables, and a restroom that \
also has a sink. This isn't a survival capsule and so you can \
expect that this won't save you if you're bleeding out to \
death."
mappath = "_maps/templates/shelter_3.dmm"
/datum/map_template/shelter/charlie/New()
. = ..()
blacklisted_turfs += typecacheof(/turf/open/indestructible) //yogs added indestructible floors to the shelter black list
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)