Skip to content

Commit

Permalink
Merge branch 'master' into discord-verif
Browse files Browse the repository at this point in the history
  • Loading branch information
@MosleyTheMalO
MosleyTheMalO committed Jul 5, 2024
2 parents b2b5adc + 455147c commit 11c149c
Show file tree
Hide file tree
Showing 4 changed files with 271 additions and 10 deletions.
4 changes: 2 additions & 2 deletions _maps/bubber/automapper/automapper_config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ trait_name = "Station"
# Birdshot Barber
[templates.birdshot_barber]
map_files = ["birdshot_barber.dmm"]
directory = "_maps/skyrat/automapper/templates/birdshot/"
directory = "_maps/bubber/automapper/templates/Birdshot/barber.dmm"
required_map = "birdshot.dmm"
coordinates = [129, 127, 1]
coordinates = [118, 145, 1]
trait_name = "Station"

# Birdshot NTR Office
Expand Down
260 changes: 260 additions & 0 deletions _maps/bubber/automapper/templates/Birdshot/barber.dmm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/chair/sofa/bench/right{
dir = 8
},
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron,
/area/station/service/barber)
"b" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/holopad,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/barber)
"j" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/chair/sofa/bench/left{
dir = 8
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/barber)
"q" = (
/obj/effect/spawner/structure/window,
/obj/structure/curtain/cloth/fancy/mechanical{
id = "barbershopcurtains"
},
/turf/open/floor/plating,
/area/station/commons/fitness/locker_room)
"r" = (
/turf/closed/wall,
/area/station/commons/fitness/locker_room)
"s" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/iron,
/area/station/service/barber)
"w" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/table/glass,
/obj/item/reagent_containers/spray/quantum_hair_dye{
pixel_x = 6
},
/obj/item/lipstick/random,
/turf/open/floor/iron,
/area/station/service/barber)
"x" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/chair/comfy/barber_chair{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/turf/open/floor/iron,
/area/station/service/barber)
"z" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/service/barber)
"D" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/table/glass,
/obj/structure/mirror/directional/north,
/obj/item/hairbrush/comb{
pixel_y = 10
},
/obj/item/reagent_containers/spray/barbers_aid{
pixel_x = 6
},
/turf/open/floor/iron,
/area/station/service/barber)
"E" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/closet/secure_closet/barber,
/turf/open/floor/iron,
/area/station/service/barber)
"G" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/service/barber)
"I" = (
/obj/machinery/door/airlock/public/glass{
name = "Lockers"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/commons/fitness/locker_room)
"J" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/barber)
"K" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/service/barber)
"M" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/vending/barbervend,
/obj/machinery/camera/directional/north{
c_tag = "Salon"
},
/turf/open/floor/iron,
/area/station/service/barber)
"O" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/barber)
"S" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/service/barber)
"U" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/chair/comfy/barber_chair{
dir = 1
},
/turf/open/floor/iron,
/area/station/service/barber)
"W" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/service/barber)
"X" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/effect/landmark/start/barber,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/turf/open/floor/iron,
/area/station/service/barber)
"Y" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/machinery/button/curtain{
id = "barbershopcurtains";
pixel_y = 2;
pixel_x = 26;
dir = 8
},
/turf/open/floor/iron,
/area/station/service/barber)
"Z" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/structure/table/glass,
/obj/structure/mirror/directional/north,
/obj/item/reagent_containers/dropper,
/obj/item/razor{
pixel_x = -6
},
/turf/open/floor/iron,
/area/station/service/barber)

(1,1,1) = {"
D
x
G
W
r
"}
(2,1,1) = {"
w
S
z
J
I
"}
(3,1,1) = {"
Z
U
X
b
q
"}
(4,1,1) = {"
M
K
s
O
q
"}
(5,1,1) = {"
E
Y
a
j
r
"}
14 changes: 7 additions & 7 deletions _maps/skyrat/automapper/automapper_config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,13 @@ required_map = "birdshot.dmm"
coordinates = [136, 157, 1]
trait_name = "Station"

# Birdshot Barber
[templates.birdshot_barber]
map_files = ["birdshot_barber.dmm"]
directory = "_maps/skyrat/automapper/templates/birdshot/"
required_map = "birdshot.dmm"
coordinates = [129, 127, 1]
trait_name = "Station"
# Birdshot Barber - BUBBER REMOVED
## [templates.birdshot_barber]
## map_files = ["birdshot_barber.dmm"]
## directory = "_maps/skyrat/automapper/templates/birdshot/"
## required_map = "birdshot.dmm"
## coordinates = [129, 127, 1]
## trait_name = "Station"

# Birdshot NTR Office
[templates.birdshot_ntrep_office]
Expand Down
3 changes: 2 additions & 1 deletion _maps/ss13_construct.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"/datum/unit_test/breath/breath_sanity_ashwalker",
"/datum/unit_test/lungs/lungs_sanity_ashwalker",
"/datum/unit_test/spy_bounty",
"/datum/unit_test/cargo_dep_order_locations"
"/datum/unit_test/cargo_dep_order_locations",
"/datum/unit_test/mob_faction"
]
}

0 comments on commit 11c149c

Please sign in to comment.