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

Cigarettes and vapes are no longer subtypes of masks. #82942

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Cigarettes and vapes are no longer subtypes of masks. #82942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c06d571
Cigarettes and vapes are no longer subtypes of masks.
Ghommie Apr 28, 2024
70cff66
updatepaths, cig butts.
Ghommie Apr 28, 2024
91878cb
greyscale config AH!
Ghommie Apr 29, 2024
5c61637
oh
Ghommie Apr 29, 2024
f85f1f4
suggestion
Ghommie Apr 29, 2024
85017a7
Merge branch 'master' into Ghommie-tg444
Ghommie May 9, 2024
6176357
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Ghommie May 15, 2024
16e73f8
new icons moved
Ghommie May 15, 2024
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
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@
/area/ruin/smoking_room/room)
"E" = (
/obj/item/trash/shrimp_chips,
/obj/item/clothing/mask/cigarette/rollie/trippy{
/obj/item/cigarette/rollie/trippy{
pixel_x = 3;
pixel_y = -1
},
/obj/item/clothing/mask/cigarette/rollie/trippy{
/obj/item/cigarette/rollie/trippy{
pixel_x = 3;
pixel_y = 5
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
/obj/structure/closet/cardboard,
/obj/item/toy/plush/snakeplushie,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/mask/cigarette/cigar/havana,
/obj/item/cigarette/cigar/havana,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"wR" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"ih" = (
/obj/item/bedsheet/purple,
/obj/item/clothing/mask/cigarette/space_cigarette,
/obj/item/cigarette/space_cigarette,
/obj/structure/bed/maint,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/fuel_pool,
Expand Down Expand Up @@ -373,7 +373,7 @@
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/squat)
"tu" = (
/obj/item/clothing/mask/cigarette/robust,
/obj/item/cigarette/robust,
/obj/structure/closet/emcloset,
/obj/item/clothing/suit/utility/fire/heavy,
/obj/item/clothing/head/utility/hardhat/welding/atmos,
Expand Down Expand Up @@ -759,7 +759,7 @@
pixel_x = -4;
pixel_y = 10
},
/obj/item/clothing/mask/cigarette/space_cigarette{
/obj/item/cigarette/space_cigarette{
pixel_x = -5;
pixel_y = 7
},
Expand Down Expand Up @@ -906,7 +906,7 @@
"Xv" = (
/obj/item/food/deadmouse,
/obj/item/clothing/shoes/sneakers/red,
/obj/item/clothing/mask/cigarette/carp,
/obj/item/cigarette/carp,
/obj/item/extinguisher/mini,
/obj/effect/decal/cleanable/fuel_pool,
/turf/open/floor/plating/dumpsterair,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/the_faceoff.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
/area/ruin/space)
"mn" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/clothing/mask/cigarette/syndicate,
/obj/item/cigarette/syndicate,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
pixel_y = 7
},
Expand Down Expand Up @@ -622,7 +622,7 @@
/area/ruin/space)
"yd" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/clothing/mask/cigarette/syndicate,
/obj/item/cigarette/syndicate,
/obj/effect/spawner/random/entertainment/lighter,
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/space)
Expand Down Expand Up @@ -701,7 +701,7 @@
/area/ruin/space)
"Cz" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/clothing/mask/cigarette/syndicate,
/obj/item/cigarette/syndicate,
/obj/effect/spawner/random/entertainment/lighter,
/turf/open/floor/iron/dark/airless,
/area/ruin/space)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/the_outlet.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/under/costume/dutch,
/obj/item/clothing/suit/costume/poncho,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/TheBeach.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
/area/awaymission/beach)
"eT" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_y = 16;
pixel_x = -2
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6029,7 +6029,7 @@
/obj/structure/table/wood,
/obj/item/lighter,
/obj/machinery/newscaster/directional/east,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/turf/open/floor/carpet/orange,
/area/awaymission/moonoutpost19/arrivals)
"Ov" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/museum.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4755,7 +4755,7 @@
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing,
/obj/structure/table,
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
icon_state = "cigaron";
lit = 1
},
Expand Down
24 changes: 12 additions & 12 deletions _maps/map_files/Birdshot/birdshot.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4663,7 +4663,7 @@
pixel_y = 9;
pixel_x = 14
},
/obj/item/clothing/mask/cigarette{
/obj/item/cigarette{
pixel_y = 2
},
/turf/open/floor/iron/small,
Expand Down Expand Up @@ -8994,7 +8994,7 @@
pixel_x = -6;
pixel_y = 3
},
/obj/item/clothing/mask/cigarette{
/obj/item/cigarette{
pixel_x = 5;
pixel_y = 2
},
Expand Down Expand Up @@ -16245,7 +16245,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/stack/spacecash/c1,
/obj/item/clothing/mask/cigarette/cigar/havana,
/obj/item/cigarette/cigar/havana,
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/maintenance/starboard/central)
"gJS" = (
Expand Down Expand Up @@ -29993,7 +29993,7 @@
pixel_x = 5;
pixel_y = 9
},
/obj/item/clothing/mask/cigarette/candy{
/obj/item/cigarette/candy{
pixel_x = -3;
pixel_y = 10
},
Expand Down Expand Up @@ -32456,11 +32456,11 @@
/area/station/engineering/atmos)
"lNF" = (
/obj/effect/spawner/random/entertainment/lighter,
/obj/item/clothing/mask/cigarette/rollie/mindbreaker{
/obj/item/cigarette/rollie/mindbreaker{
pixel_x = -2;
pixel_y = 6
},
/obj/item/clothing/mask/cigarette/rollie/trippy{
/obj/item/cigarette/rollie/trippy{
pixel_x = 4
},
/obj/effect/mapping_helpers/burnt_floor,
Expand Down Expand Up @@ -33187,7 +33187,7 @@
pixel_x = -3;
pixel_y = 10
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = -1;
pixel_y = -2
},
Expand Down Expand Up @@ -35182,7 +35182,7 @@
pixel_y = 2
},
/obj/item/wrench,
/obj/item/clothing/mask/cigarette/xeno{
/obj/item/cigarette/xeno{
pixel_x = -3;
pixel_y = -9
},
Expand Down Expand Up @@ -50343,7 +50343,7 @@
pixel_y = -3;
pixel_x = -2
},
/obj/item/clothing/mask/cigarette{
/obj/item/cigarette{
pixel_x = 6;
pixel_y = 4
},
Expand Down Expand Up @@ -50713,7 +50713,7 @@
dir = 10
},
/obj/structure/table,
/obj/item/clothing/mask/cigarette,
/obj/item/cigarette,
/obj/item/toy/toy_dagger,
/obj/item/clothing/head/collectable/paper,
/obj/item/toy/figure/roboticist{
Expand Down Expand Up @@ -59719,7 +59719,7 @@
pixel_x = -2;
pixel_y = -3
},
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/smooth,
Expand Down Expand Up @@ -68775,7 +68775,7 @@
/obj/item/stock_parts/cell/crap{
pixel_y = 5
},
/obj/item/clothing/mask/cigarette/pipe/cobpipe{
/obj/item/cigarette/pipe/cobpipe{
pixel_x = 1;
pixel_y = -2
},
Expand Down
38 changes: 19 additions & 19 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2719,15 +2719,15 @@
pixel_x = -2;
pixel_y = 3
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = 2;
pixel_y = 2
},
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 3;
pixel_y = 1
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = 4
},
/obj/effect/turf_decal/tile/blue/half/contrasted{
Expand Down Expand Up @@ -6193,15 +6193,15 @@
"bAS" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/clothing/mask/cigarette/cigar/havana{
/obj/item/cigarette/cigar/havana{
pixel_x = 2;
pixel_y = 2
},
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 6;
pixel_y = 2
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = -2;
pixel_y = 2
},
Expand Down Expand Up @@ -13930,7 +13930,7 @@
/area/station/commons/vacant_room/office)
"dtk" = (
/obj/structure/table/wood/poker,
/obj/item/clothing/mask/cigarette/pipe,
/obj/item/cigarette/pipe,
/turf/open/floor/carpet/green,
/area/station/commons/lounge)
"dtn" = (
Expand Down Expand Up @@ -52135,13 +52135,13 @@
"mXr" = (
/obj/structure/cable,
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 3
},
/obj/item/clothing/mask/cigarette/cigar/havana{
/obj/item/cigarette/cigar/havana{
pixel_x = -3
},
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain)
"mXy" = (
Expand Down Expand Up @@ -54642,13 +54642,13 @@
/area/station/commons/vacant_room/commissary)
"nHc" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 3
},
/obj/item/clothing/mask/cigarette/cigar/havana{
/obj/item/cigarette/cigar/havana{
pixel_x = -3
},
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/turf/open/floor/wood,
/area/station/command/meeting_room/council)
"nHd" = (
Expand Down Expand Up @@ -73936,13 +73936,13 @@
pixel_x = -3;
pixel_y = 3
},
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 6
},
/obj/item/clothing/mask/cigarette/cigar/havana{
/obj/item/cigarette/cigar/havana{
pixel_x = 2
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = 4.5
},
/obj/structure/table/reinforced,
Expand Down Expand Up @@ -77368,14 +77368,14 @@
/obj/item/restraints/handcuffs{
pixel_y = 6
},
/obj/item/clothing/mask/cigarette/cigar/cohiba{
/obj/item/cigarette/cigar/cohiba{
pixel_x = 7;
pixel_y = -7
},
/obj/item/clothing/mask/cigarette/cigar/havana{
/obj/item/cigarette/cigar/havana{
pixel_x = -3
},
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = -1;
pixel_y = -7
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17619,7 +17619,7 @@
/area/station/hallway/secondary/service)
"fqc" = (
/obj/structure/table,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/cigarette/cigar,
/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/large,
/area/station/service/kitchen/diner)
Expand Down Expand Up @@ -37359,7 +37359,7 @@
/area/station/science/xenobiology)
"lvc" = (
/obj/item/clothing/mask/fakemoustache,
/obj/item/clothing/mask/cigarette/pipe,
/obj/item/cigarette/pipe,
/obj/structure/table/wood,
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/open/floor/wood/tile,
Expand Down Expand Up @@ -41344,7 +41344,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/clothing/mask/cigarette{
/obj/item/cigarette{
pixel_x = 6;
pixel_y = 12
},
Expand Down Expand Up @@ -58461,7 +58461,7 @@
/area/station/maintenance/starboard/aft)
"rPf" = (
/obj/structure/table/wood/poker,
/obj/item/clothing/mask/cigarette/pipe,
/obj/item/cigarette/pipe,
/turf/open/floor/wood/parquet,
/area/station/commons/lounge)
"rPn" = (
Expand Down Expand Up @@ -70524,7 +70524,7 @@
/area/station/cargo/drone_bay)
"vFb" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar{
/obj/item/cigarette/cigar{
pixel_x = 7;
pixel_y = 10
},
Expand Down