Skip to content

Commit

Permalink
Barber(ing) the station (#3733)
Browse files Browse the repository at this point in the history
* Gives service borgs hair tools and insures a barber vending/locker

* Patch

AAAAA

* Adds barber research

* comb is more fitting probs for a service borg

* a

* Thanks lucy

* Absolucy requested changes 5 hours ago

* LATEJOIN BARBER

* touchups

* Update barber.dm

* Latejoin + barber more

* AAAAA

* update huds

* update colour

* configs

* crew monitor

* Family hierloom

Whoops
  • Loading branch information
Gw0sty authored Nov 1, 2024
1 parent 626ce54 commit fb597a4
Show file tree
Hide file tree
Showing 24 changed files with 3,472 additions and 3,241 deletions.
61 changes: 30 additions & 31 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16133,6 +16133,22 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
"fvw" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/freezer{
name = "Coldroom"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/service/kitchen/coldroom)
"fvz" = (
/obj/structure/disposalpipe/segment{
dir = 10
Expand Down Expand Up @@ -21959,22 +21975,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/large,
/area/station/hallway/secondary/service)
"hoq" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/freezer{
name = "Coldroom"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/obj/structure/disposalpipe/segment,
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/service/kitchen/coldroom)
"hoR" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
Expand Down Expand Up @@ -29587,6 +29587,11 @@
"jQu" = (
/turf/open/floor/wood,
/area/station/commons/locker)
"jQS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/barber,
/turf/open/floor/plating,
/area/station/maintenance/port)
"jRl" = (
/obj/machinery/door/window/left/directional/south,
/obj/structure/table/wood/fancy,
Expand Down Expand Up @@ -38515,12 +38520,6 @@
/obj/machinery/status_display/ai/directional/west,
/turf/open/floor/iron/vaporwave,
/area/station/command/heads_quarters/rd)
"mSe" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/mopbucket,
/obj/item/mop,
/turf/open/floor/plating,
/area/station/maintenance/port)
"mSx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
Expand Down Expand Up @@ -57722,11 +57721,6 @@
/obj/effect/spawner/random/entertainment/coin,
/turf/open/floor/iron,
/area/station/commons/dorms)
"tsD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/caution_sign,
/turf/open/floor/plating,
/area/station/maintenance/port)
"tsL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -62596,6 +62590,11 @@
/obj/item/instrument/eguitar,
/turf/open/floor/wood,
/area/station/maintenance/starboard/fore)
"uZv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/barbervend,
/turf/open/floor/plating,
/area/station/maintenance/port)
"uZz" = (
/obj/machinery/camera/directional/south{
c_tag = "Engineering - Atmospherics, External HFR Room, South";
Expand Down Expand Up @@ -90638,13 +90637,13 @@ pWG
iay
pWG
vqJ
hoq
fvw
sWm
bia
bia
sWm
sWm
hoq
fvw
sjw
nKV
vBA
Expand Down Expand Up @@ -91677,7 +91676,7 @@ hlF
qXb
jiL
bnl
tsD
uZv
slx
dgd
bnl
Expand Down Expand Up @@ -91934,7 +91933,7 @@ gMs
qwd
nUi
bnl
mSe
jQS
kSL
mNd
ejD
Expand Down
Loading

0 comments on commit fb597a4

Please sign in to comment.