cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg

Browse Source
This commit is contained in:
Gandalf
2021-08-15 23:36:27 +01:00
parent e360865853 82503aaa29
commit 61317efd99
7 changed files with 204 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/CentCom.dmm
+36 -36
View File
@@ -176,6 +176,14 @@
/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/iron/dark,
/area/centcom/control)
"ek" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/iron/fifty,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/turf/open/floor/wood,
/area/centcom/holding)
"ev" = (
/obj/structure/rack,
/obj/item/clothing/under/color/green,
@@ -268,6 +276,12 @@
"gu" = (
/turf/closed/indestructible/splashscreen,
/area/start)
"gE" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/safe/floor,
/obj/item/seeds/cherry/bomb,
/turf/open/floor/wood,
/area/centcom/holding)
"hh" = (
/turf/closed/indestructible/rock/snow,
/area/syndicate_mothership)
@@ -7805,12 +7819,6 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/grass,
/area/wizard_station)
"yM" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/safe/floor,
/obj/item/seeds/cherry/bomb,
/turf/open/floor/wood,
/area/centcom/holding)
"yU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
@@ -14452,14 +14460,6 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
"Tq" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/iron/fifty,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/turf/open/floor/wood,
/area/centcom/holding)
"Tr" = (
/obj/structure/closet/chefcloset,
/turf/open/floor/iron/cafeteria,
@@ -14492,11 +14492,6 @@
/obj/machinery/door/window/eastright,
/turf/open/floor/carpet/black,
/area/centcom/holding)
"TK" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/mirror/directional/north,
/turf/open/floor/wood,
/area/centcom/holding)
"TT" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/donut_box,
@@ -14661,6 +14656,10 @@
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/iron/dark,
/area/centcom/control)
"Vg" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/centcom/supplypod)
"Vk" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -14885,10 +14884,11 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
"XT" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/centcom/supplypod)
"XV" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/mirror/directional/north,
/turf/open/floor/wood,
/area/centcom/holding)
"Ya" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -41209,7 +41209,7 @@ aa
aa
aa
Nd
Tq
ek
CT
MG
YN
@@ -42237,7 +42237,7 @@ aa
aa
aa
Nd
yM
gE
CT
oV
CT
@@ -42751,7 +42751,7 @@ aa
aa
aa
Nd
TK
XV
CT
CT
CT
@@ -64621,7 +64621,7 @@ Yn
NE
NE
NE
XT
Vg
aa
aa
aa
@@ -64878,7 +64878,7 @@ Yn
NE
NE
NE
XT
Vg
aa
aa
aa
@@ -65893,8 +65893,8 @@ Yn
Yn
Yn
Yn
XT
XT
Vg
Vg
Yn
Yn
Yn
@@ -66163,7 +66163,7 @@ Yn
NE
NE
NE
XT
Vg
aa
aa
aa
@@ -66420,7 +66420,7 @@ Yn
NE
NE
NE
XT
Vg
aa
aa
aa
@@ -67682,8 +67682,8 @@ sV
qx
qx
qx
XT
XT
Vg
Vg
Yn
Yn
Yn
@@ -67702,8 +67702,8 @@ Yn
Yn
Yn
Yn
XT
XT
Vg
Vg
Yn
Yn
aa
_maps/map_files/generic/CentCom_skyrat.dmm
+24 -24
View File
@@ -3363,14 +3363,6 @@
/obj/structure/punching_bag,
/turf/open/floor/carpet,
/area/wizard_station)
"aoS" = (
/obj/structure/table/wood/bar,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/iron/fifty,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/turf/open/floor/wood,
/area/centcom/holding)
"aoT" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -3479,12 +3471,6 @@
},
/turf/open/floor/iron,
/area/centcom/evac)
"app" = (
/obj/structure/table/wood/bar,
/obj/structure/safe/floor,
/obj/item/seeds/cherry/bomb,
/turf/open/floor/wood,
/area/centcom/holding)
"aps" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -3579,13 +3565,6 @@
},
/turf/open/floor/iron,
/area/centcom/ferry)
"apN" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/mirror{
pixel_y = 28
},
/turf/open/floor/wood,
/area/centcom/holding)
"apP" = (
/obj/machinery/computer/cargo{
dir = 4
@@ -15000,6 +14979,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/tdome/arena_source)
"mWI" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/mirror{
pixel_y = 28
},
/turf/open/floor/wood,
/area/centcom/holding)
"mYf" = (
/obj/machinery/door/airlock/centcom{
locked = 1;
@@ -15065,6 +15051,14 @@
},
/turf/open/floor/circuit/green,
/area/tdome/arena_source)
"pIM" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/iron/fifty,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
/turf/open/floor/wood,
/area/centcom/holding)
"qag" = (
/obj/structure/rack,
/obj/item/clothing/under/color/green,
@@ -15191,6 +15185,12 @@
},
/turf/open/floor/carpet/black,
/area/centcom/holding)
"wcN" = (
/obj/structure/table/wood/shuttle_bar,
/obj/structure/safe/floor,
/obj/item/seeds/cherry/bomb,
/turf/open/floor/wood,
/area/centcom/holding)
"wgi" = (
/obj/effect/landmark/ctf,
/turf/open/space/basic,
@@ -41362,7 +41362,7 @@ aaa
aaa
aaa
ank
aoS
pIM
ape
atP
auu
@@ -42390,7 +42390,7 @@ aaa
aaa
aaa
ank
app
wcN
ape
atv
ape
@@ -42904,7 +42904,7 @@ aaa
aaa
aaa
ank
apN
mWI
ape
ape
ape
_maps/shuttles/emergency_bar.dmm
+128 -129
View File
@@ -165,13 +165,6 @@
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair/stool/directional/east{
can_buckle = 1;
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"aH" = (
/obj/machinery/flasher/directional/west{
id = "shuttle_flasher"
@@ -223,34 +216,6 @@
},
/turf/open/floor/iron,
/area/shuttle/escape)
"aO" = (
/obj/structure/table/wood/bar{
boot_dir = 9
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"aP" = (
/obj/structure/table/wood/bar,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"aR" = (
/obj/structure/table/wood/bar{
boot_dir = 8
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"aS" = (
/obj/structure/extinguisher_cabinet/directional/east,
/obj/structure/table,
@@ -306,11 +271,6 @@
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"ba" = (
/obj/structure/table/wood/bar,
/obj/effect/spawner/lootdrop/gambling,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bc" = (
/obj/item/kirbyplants{
icon_state = "plant-21";
@@ -319,26 +279,6 @@
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bd" = (
/obj/structure/table/wood/bar{
boot_dir = 10
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"be" = (
/obj/structure/table/wood/bar{
boot_dir = 2
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"bg" = (
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
@@ -462,30 +402,12 @@
"bH" = (
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bI" = (
/obj/structure/table/wood/bar,
/obj/item/instrument/guitar,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"bJ" = (
/obj/structure/table/wood/bar,
/obj/item/storage/fancy/donut_box,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bK" = (
/obj/structure/chair/wood{
dir = 8
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bL" = (
/obj/structure/table/wood/bar,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bM" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -503,19 +425,6 @@
},
/turf/open/floor/iron,
/area/shuttle/escape)
"bO" = (
/obj/structure/table/wood/bar,
/obj/item/folder/red,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bP" = (
/obj/structure/table/wood/bar,
/obj/item/toy/cards/deck/cas,
/obj/item/toy/cards/deck/cas/black{
pixel_y = 6
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"bQ" = (
/obj/structure/chair/wood{
dir = 1
@@ -558,19 +467,6 @@
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bV" = (
/obj/structure/table/wood/bar{
boot_dir = 8
},
/obj/effect/fun_balloon/sentience/emergency_shuttle{
group_name = "bar staff on the Emergency Escape Bar"
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"bW" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/grimy,
@@ -615,7 +511,7 @@
/obj/machinery/stasis,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"qr" = (
"en" = (
/obj/structure/chair/stool/bar/directional/west{
can_buckle = 1;
name = "buckleable bar stool"
@@ -626,6 +522,96 @@
},
/turf/open/floor/iron,
/area/shuttle/escape)
"fz" = (
/obj/structure/table/wood/shuttle_bar{
boot_dir = 8
},
/obj/effect/fun_balloon/sentience/emergency_shuttle{
group_name = "bar staff on the Emergency Escape Bar"
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"jC" = (
/obj/structure/chair/stool/directional/east{
can_buckle = 1
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"lJ" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/folder/red,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"mO" = (
/obj/structure/table/wood/shuttle_bar,
/obj/effect/spawner/lootdrop/gambling,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"tb" = (
/obj/structure/table/wood/shuttle_bar,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"te" = (
/obj/structure/table/wood/shuttle_bar{
boot_dir = 10
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"va" = (
/obj/structure/table/wood/shuttle_bar{
boot_dir = 8
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"wz" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/instrument/guitar,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"yi" = (
/obj/structure/table/wood/shuttle_bar{
boot_dir = 2
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"Ae" = (
/obj/structure/table/wood/shuttle_bar{
boot_dir = 9
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/turf/open/floor/iron,
/area/shuttle/escape)
"Cy" = (
/obj/structure/table/wood/shuttle_bar,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"EL" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -634,6 +620,19 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron,
/area/shuttle/escape)
"Gf" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/toy/cards/deck/cas,
/obj/item/toy/cards/deck/cas/black{
pixel_y = 6
},
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
"IX" = (
/obj/structure/table/wood/shuttle_bar,
/obj/item/storage/fancy/donut_box,
/turf/open/floor/iron/grimy,
/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -695,9 +694,9 @@ aM
ab
aE
aW
ba
bL
bO
mO
Cy
lJ
bQ
bR
ab
@@ -719,9 +718,9 @@ aM
ab
aE
aW
bJ
IX
bM
bP
Gf
bQ
aE
ab
@@ -787,13 +786,13 @@ an
az
aE
aE
qr
qr
qr
qr
qr
qr
qr
en
en
en
en
en
en
en
aE
ca
ae
@@ -811,13 +810,13 @@ ao
ab
bG
aE
aO
aR
bV
aR
aR
aR
bd
Ae
va
fz
va
va
va
te
aN
aE
bn
@@ -835,13 +834,13 @@ au
ab
aF
bH
aP
tb
aE
aU
aX
aE
aE
be
yi
aE
aE
bq
@@ -857,15 +856,15 @@ ab
ab
ab
ab
aG
jC
bW
bI
wz
aS
ad
aY
aj
bN
be
yi
bT
bk
ac
_maps/shuttles/emergency_rollerdome.dmm
+5 -5
View File
@@ -53,7 +53,7 @@
/turf/open/floor/eighties,
/area/shuttle/escape)
"ns" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/effect/fun_balloon/sentience/emergency_shuttle{
group_name = "snack bar drone at Uncle Pete's Rollerdome"
},
@@ -111,7 +111,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/escape)
"uN" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/storage/bag/tray,
/turf/open/floor/wood,
/area/shuttle/escape)
@@ -226,7 +226,7 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"Ox" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/pizzabox/meat,
/obj/item/pizzabox/meat,
/obj/item/pizzabox/meat,
@@ -285,7 +285,7 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"Wg" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/storage/bag/tray,
/obj/item/food/cake/birthday,
/obj/item/kitchen/knife,
@@ -299,7 +299,7 @@
/turf/open/floor/wood,
/area/shuttle/escape)
"Zo" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/turf/open/floor/wood,
/area/shuttle/escape)
"ZN" = (
_maps/templates/holodeck_lounge.dmm
+6 -6
View File
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/reagent_containers/glass/rag{
pixel_x = 10;
pixel_y = 1
@@ -30,7 +30,7 @@
},
/area/template_noop)
"d" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/turf/open/floor/holofloor{
dir = 9;
icon_state = "wood"
@@ -53,7 +53,7 @@
/turf/open/floor/holofloor/carpet,
/area/template_noop)
"i" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/reagent_containers/food/drinks/shaker,
/turf/open/floor/holofloor{
dir = 9;
@@ -114,7 +114,7 @@
/turf/open/floor/holofloor/carpet,
/area/template_noop)
"t" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/book/manual/wiki/barman_recipes,
/turf/open/floor/holofloor{
dir = 9;
@@ -181,7 +181,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/item/storage/box/cups,
/turf/open/floor/holofloor{
dir = 9;
@@ -292,7 +292,7 @@
},
/area/template_noop)
"Y" = (
/obj/structure/table/wood/bar,
/obj/structure/table/wood/shuttle_bar,
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
code/modules/shuttle/shuttle_rotate.dm
+1 -1
View File
@@ -69,7 +69,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
new_dpdir = new_dpdir | angle2dir(rotation+dir2angle(D))
dpdir = new_dpdir
/obj/structure/table/wood/bar/shuttleRotate(rotation, params)
/obj/structure/table/wood/shuttle_bar/shuttleRotate(rotation, params)
. = ..()
boot_dir = angle2dir(rotation + dir2angle(boot_dir))
code/modules/shuttle/special.dm
+4 -4
View File
@@ -189,20 +189,20 @@
// barstaff (defined as someone who was a roundstart bartender or someone
// with CENTCOM_BARSTAFF)
/obj/structure/table/wood/bar
/obj/structure/table/wood/shuttle_bar
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_1 = NODECONSTRUCT_1
max_integrity = 1000
var/boot_dir = 1
/obj/structure/table/wood/bar/Initialize(mapload, _buildstack)
/obj/structure/table/wood/shuttle_bar/Initialize(mapload, _buildstack)
. = ..()
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = .proc/on_entered,
)
AddElement(/datum/element/connect_loc, loc_connections)
/obj/structure/table/wood/bar/proc/on_entered(datum/source, atom/movable/AM)
/obj/structure/table/wood/shuttle_bar/proc/on_entered(datum/source, atom/movable/AM)
SIGNAL_HANDLER
var/mob/living/M = AM
if(istype(M) && !M.incorporeal_move && !is_barstaff(M))
@@ -212,7 +212,7 @@
M.throw_at(throwtarget, 5, 1)
to_chat(M, span_notice("No climbing on the bar please."))
/obj/structure/table/wood/bar/proc/is_barstaff(mob/living/user)
/obj/structure/table/wood/shuttle_bar/proc/is_barstaff(mob/living/user)
. = FALSE
if(ishuman(user))
var/mob/living/carbon/human/human_user = user