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.

Sign up for GitHub

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

Jump to bottom

Add more ashtrays and cigarette vendors to bar. #15628

Merged
merged 2 commits into from Sep 2, 2023
Merged

Add more ashtrays and cigarette vendors to bar. #15628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f937835
let them smoke
TheTyrant25 Sep 1, 2023
8ec5073
remove superfluous things
TheTyrant25 Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions maps/clarion.dmm
View file
Open in desktop
Expand Up @@ -7760,6 +7760,7 @@
"aEy" = (
/obj/table/wood/auto,
/obj/item/card_box/plain,
/obj/item/decoration/ashtray,
/turf/simulated/floor/carpet{
dir = 5;
icon_state = "fpurple1"
Expand Down
2 changes: 1 addition & 1 deletion maps/cogmap2.dmm
View file
Open in desktop
Expand Up @@ -10531,7 +10531,6 @@
/area/station/crew_quarters/kitchen)
"aDw" = (
/obj/table/reinforced/bar/auto,
/obj/item/decoration/ashtray,
/obj/disposalpipe/segment/food{
icon_state = "pipe-c"
},
Expand Down Expand Up @@ -11072,6 +11071,7 @@
"aES" = (
/obj/table/reinforced/bar/auto,
/obj/item/card_box/plain,
/obj/item/decoration/ashtray,
/turf/simulated/floor/carpet{
icon_state = "fpurple1"
},
Expand Down
8 changes: 7 additions & 1 deletion maps/donut2.dmm
View file
Open in desktop
Expand Up @@ -32886,6 +32886,7 @@
pixel_y = 7
},
/obj/item/clothing/mask/cigarette/propuffs,
/obj/item/decoration/ashtray,
/turf/simulated/floor/carpet{
icon_state = "fblue1"
},
Expand Down Expand Up @@ -44740,6 +44741,11 @@
/obj/random_item_spawner/junk/one_or_zero,
/turf/simulated/floor/plating,
/area/station/maintenance/inner/central)
"sse" = (
/obj/machinery/light/incandescent,
/obj/machinery/vending/cigarette,
/turf/simulated/floor,
/area/station/hallway/primary/south)
"ssf" = (
/obj/disposalpipe/segment/mail,
/obj/disposalpipe/segment/horizontal,
Expand Down Expand Up @@ -75209,7 +75215,7 @@ aCy
mmb
azU
bgH
bjs
sse
ygD
bwR
bjo
Expand Down
1 change: 1 addition & 0 deletions maps/donut3.dmm
View file
Open in desktop
Expand Up @@ -45246,6 +45246,7 @@
layer = 3.1;
name = "Bar Shutter"
},
/obj/item/decoration/ashtray,
/turf/simulated/floor/carpet/red/fancy/edge{
dir = 8
},
Expand Down
1 change: 1 addition & 0 deletions maps/oshan.dmm
View file
Open in desktop
Expand Up @@ -18879,6 +18879,7 @@
/area/station/crew_quarters/bar)
"bmz" = (
/obj/table/reinforced/bar/auto,
/obj/item/decoration/ashtray,
/turf/simulated/floor/carpet/blue/fancy/narrow/se,
/area/station/crew_quarters/bar)
"bmA" = (
Expand Down