diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm index fd292ec7685..047d4b4c042 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm @@ -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 }, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 65c448e94c4..a81508dbe1f 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -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" = ( diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm index 0f2f425fe62..03a9b87ff4e 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm @@ -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, @@ -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, @@ -758,7 +758,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 }, @@ -905,7 +905,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, diff --git a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm index 08175777752..b31a11cba31 100644 --- a/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_faceoff.dmm @@ -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 }, @@ -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) @@ -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) diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm index b2b8fd17fbe..327b0f558ca 100644 --- a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm @@ -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, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 3f18eb1d627..c18eba4fbc2 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -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 }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 479242b1fa4..9473a5e3ba0 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -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" = ( diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm index cdea9ba141a..2937250b1f9 100644 --- a/_maps/RandomZLevels/museum.dmm +++ b/_maps/RandomZLevels/museum.dmm @@ -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 }, diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 54cd4e0f046..63d4314d7ca 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -256,7 +256,7 @@ /area/station/medical/virology) "agp" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/cigarette/cigar/cohiba, /turf/open/floor/carpet, /area/station/commons/dorms) "agy" = ( @@ -3804,7 +3804,7 @@ /obj/structure/rack, /obj/item/weldingtool/mini, /obj/item/tank/internals/emergency_oxygen/empty, -/obj/item/clothing/mask/cigarette/rollie, +/obj/item/cigarette/rollie, /turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/central/lesser) "bxl" = ( @@ -4027,7 +4027,7 @@ /obj/item/stock_parts/power_store/cell/crap{ pixel_y = 5 }, -/obj/item/clothing/mask/cigarette/pipe/cobpipe{ +/obj/item/cigarette/pipe/cobpipe{ pixel_x = 1; pixel_y = -2 }, @@ -5449,7 +5449,7 @@ pixel_y = 9; pixel_x = 14 }, -/obj/item/clothing/mask/cigarette{ +/obj/item/cigarette{ pixel_y = 2 }, /turf/open/floor/iron/small, @@ -10568,7 +10568,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/clothing/mask/cigarette{ +/obj/item/cigarette{ pixel_x = 5; pixel_y = 2 }, @@ -18583,7 +18583,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" = ( @@ -28888,7 +28888,7 @@ /turf/open/floor/iron, /area/station/security/prison/rec) "jUr" = ( -/obj/item/clothing/mask/cigarette, +/obj/item/cigarette, /obj/item/storage/fancy/cigarettes/cigpack_robust{ pixel_y = 5; pixel_x = 6 @@ -32622,7 +32622,7 @@ pixel_x = 5; pixel_y = 9 }, -/obj/item/clothing/mask/cigarette/candy{ +/obj/item/cigarette/candy{ pixel_x = -3; pixel_y = 10 }, @@ -35129,11 +35129,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, @@ -35657,7 +35657,7 @@ pixel_x = 5; pixel_y = -5 }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ +/obj/item/cigarette/cigar/cohiba{ pixel_y = 4 }, /turf/open/floor/iron/dark/small, @@ -35833,7 +35833,7 @@ pixel_x = -3; pixel_y = 10 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = -1; pixel_y = -2 }, @@ -37813,7 +37813,7 @@ pixel_y = 2 }, /obj/item/wrench, -/obj/item/clothing/mask/cigarette/xeno{ +/obj/item/cigarette/xeno{ pixel_x = -3; pixel_y = -9 }, @@ -45658,7 +45658,7 @@ /area/station/command/corporate_suite) "pot" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar/premium{ +/obj/item/cigarette/cigar/premium{ pixel_y = 5 }, /turf/open/floor/stone, @@ -51419,7 +51419,7 @@ pixel_y = -3; pixel_x = -2 }, -/obj/item/clothing/mask/cigarette{ +/obj/item/cigarette{ pixel_x = 6; pixel_y = 4 }, @@ -51686,7 +51686,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{ @@ -59590,7 +59590,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, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 898ee622a1b..8926779d32f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2712,15 +2712,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{ @@ -6189,15 +6189,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 }, @@ -13910,7 +13910,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" = ( @@ -52036,13 +52036,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" = ( @@ -54527,13 +54527,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" = ( @@ -73798,13 +73798,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, @@ -77225,14 +77225,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 }, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 5cb80509dd1..5dc1bc40a94 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -41966,7 +41966,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 }, @@ -56692,7 +56692,7 @@ "qTp" = ( /obj/structure/table/wood, /obj/item/clothing/mask/fakemoustache, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /obj/item/clothing/glasses/monocle, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/grimy, @@ -72266,7 +72266,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 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 79f3cc97bae..f8f2420ae02 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3789,7 +3789,7 @@ /obj/item/clothing/mask/animal/horsehead, /obj/structure/table/wood, /obj/machinery/airalarm/directional/south, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /obj/item/clothing/mask/fakemoustache, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/wood, @@ -3812,7 +3812,7 @@ /area/station/engineering/atmospherics_engine) "bqC" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /turf/open/floor/wood, /area/station/commons/lounge) "bqJ" = ( @@ -7224,7 +7224,7 @@ pixel_x = 6; pixel_y = -4 }, -/obj/item/clothing/mask/cigarette/rollie/cannabis{ +/obj/item/cigarette/rollie/cannabis{ pixel_y = -3 }, /turf/open/space/basic, @@ -13788,11 +13788,11 @@ pixel_x = -7; pixel_y = 8 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 4; pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 8 }, /obj/effect/turf_decal/siding/wood{ @@ -37480,7 +37480,7 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/item/reagent_containers/cup/glass/flask/gold, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) @@ -56553,7 +56553,7 @@ /obj/machinery/firealarm/directional/south, /obj/structure/rack, /obj/item/storage/briefcase/secure, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -61134,7 +61134,7 @@ /area/station/hallway/secondary/entry) "vwi" = ( /obj/structure/table, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /turf/open/floor/plating, /area/station/maintenance/port) "vwn" = ( @@ -63769,15 +63769,15 @@ pixel_x = -2; pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 4; pixel_y = 1 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = -4; pixel_y = 1 }, -/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/cigarette/cigar/cohiba, /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/command/corporate_showroom) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index b38b99867ab..5bc3a711a1b 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -7308,7 +7308,7 @@ }, /area/mine/laborcamp) "Sc" = ( -/obj/item/clothing/mask/cigarette/robust{ +/obj/item/cigarette/robust{ pixel_x = 3; pixel_y = -10 }, @@ -7608,7 +7608,7 @@ /turf/open/floor/plating, /area/mine/laborcamp/security/maintenance) "TX" = ( -/obj/item/clothing/mask/cigarette/robust{ +/obj/item/cigarette/robust{ pixel_x = 8; pixel_y = 8 }, diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 6772e09a7ae..9c40b9131fd 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -284,7 +284,7 @@ /area/station/maintenance/floor3/starboard/fore) "acL" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/cigarette/cigar/cohiba, /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, @@ -52999,7 +52999,7 @@ /obj/item/fishing_rod, /obj/structure/closet, /obj/effect/spawner/random/maintenance/three, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /turf/open/floor/pod/light, /area/station/maintenance/floor2/starboard/fore) "nEO" = ( @@ -92288,7 +92288,7 @@ /area/station/maintenance/floor3/port) "xJX" = ( /obj/structure/table, -/obj/item/clothing/mask/cigarette/candy{ +/obj/item/cigarette/candy{ pixel_x = 4 }, /turf/open/floor/iron/dark/smooth_large, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 30a6759d52e..9b5baa411fa 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -8578,13 +8578,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/machinery/status_display/evac/directional/north, @@ -8765,13 +8765,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/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -8996,13 +8996,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/machinery/airalarm/directional/south, @@ -9475,7 +9475,7 @@ pixel_y = 19; pixel_x = 7 }, -/obj/item/clothing/mask/cigarette/cigar/havana{ +/obj/item/cigarette/cigar/havana{ pixel_x = -6; pixel_y = 5 }, @@ -10242,13 +10242,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/machinery/newscaster/directional/north, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 575b405d6af..c7686749c50 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -1962,7 +1962,7 @@ /area/station/commons/vacant_room) "agG" = ( /obj/structure/dresser, -/obj/item/clothing/mask/cigarette/cigar/havana, +/obj/item/cigarette/cigar/havana, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room) "agH" = ( @@ -10735,15 +10735,15 @@ pixel_x = -2; pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = -4; pixel_y = 1 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 4; pixel_y = 1 }, -/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/cigarette/cigar/cohiba, /turf/open/floor/wood, /area/station/command/meeting_room) "cFP" = ( diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 2d384218d87..c1cc549c450 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -19388,7 +19388,7 @@ dir = 8 }, /obj/effect/spawner/random/entertainment/cigarette_pack, -/obj/item/clothing/mask/cigarette/rollie/mindbreaker, +/obj/item/cigarette/rollie/mindbreaker, /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/cargo/miningoffice) diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index cb50d42c56d..aef9231e620 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -99,7 +99,7 @@ pixel_x = 3; pixel_y = 2 }, -/obj/item/clothing/mask/cigarette/dromedary{ +/obj/item/cigarette/dromedary{ pixel_x = 8; pixel_y = 15 }, diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm index de99a937b35..5afa72919cb 100644 --- a/_maps/shuttles/emergency_shadow.dmm +++ b/_maps/shuttles/emergency_shadow.dmm @@ -468,7 +468,7 @@ }, /obj/item/kirbyplants/organic/plant21, /obj/structure/sign/warning/hot_temp/directional/west, -/obj/item/clothing/mask/cigarette/rollie/cannabis, +/obj/item/cigarette/rollie/cannabis, /turf/open/floor/iron/dark/textured_large, /area/shuttle/escape) "yg" = ( diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 6acff639725..b60aae281e0 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -475,7 +475,7 @@ pixel_x = 6; pixel_y = 12 }, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index fb36638173e..b599698bc6f 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -618,7 +618,7 @@ pixel_x = -4; pixel_y = 12 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 4 }, /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index a705c471a25..dae5d84a869 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -2518,7 +2518,7 @@ pixel_x = -5; pixel_y = 2 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 5; pixel_y = 7 }, diff --git a/_maps/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm index 3807be667cb..defc5771555 100644 --- a/_maps/templates/holodeck_lounge.dmm +++ b/_maps/templates/holodeck_lounge.dmm @@ -43,7 +43,7 @@ /area/template_noop) "h" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /obj/effect/holodeck_effect/random_book, /turf/open/floor/holofloor/carpet, /area/template_noop) @@ -256,7 +256,7 @@ /area/template_noop) "T" = ( /obj/structure/table/wood/poker, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index febfc926cdc..bc136b886be 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -2590,7 +2590,7 @@ pixel_x = 3; pixel_y = 6 }, -/obj/item/clothing/mask/cigarette/robust{ +/obj/item/cigarette/robust{ pixel_x = -4; pixel_y = 1 }, diff --git a/_maps/templates/lazy_templates/wizard_den.dmm b/_maps/templates/lazy_templates/wizard_den.dmm index 472dde511c4..2415fe227c6 100644 --- a/_maps/templates/lazy_templates/wizard_den.dmm +++ b/_maps/templates/lazy_templates/wizard_den.dmm @@ -46,7 +46,7 @@ /area/centcom/wizard_station) "dr" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_y = -9; pixel_x = -5 }, diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm index 28e64519e57..5ad9c23595d 100644 --- a/_maps/virtual_domains/pirates.dmm +++ b/_maps/virtual_domains/pirates.dmm @@ -186,7 +186,7 @@ /obj/item/melee/energy/sword/pirate{ pixel_y = 10 }, -/obj/item/clothing/mask/cigarette/cigar{ +/obj/item/cigarette/cigar{ pixel_x = 4 }, /obj/item/lighter{ diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index fd26aab0e87..131e530ce82 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/clothing/suit/hooded/carp_costume, /obj/item/clothing/head/fedora/carpskin, /obj/item/clothing/mask/gas/carp, - /obj/item/clothing/mask/cigarette/carp, + /obj/item/cigarette/carp, /obj/item/clothing/under/suit/carpskin, /obj/item/food/cubancarp, /obj/item/food/fishmeat/carp, diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 9ff049e21fc..81a29b56c6d 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -161,8 +161,8 @@ return if(is_type_in_typecache(item, sm_item_whitelist)) return FALSE - if(istype(item, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/cig = item + if(istype(item, /obj/item/cigarette)) + var/obj/item/cigarette/cig = item var/clumsy = HAS_TRAIT(user, TRAIT_CLUMSY) if(clumsy) var/which_hand = BODY_ZONE_L_ARM diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm index 69e78ec74b3..a3866971aae 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm @@ -255,7 +255,7 @@ /datum/greyscale_config/vape name = "Vape" - icon_file = 'icons/obj/clothing/masks.dmi' + icon_file = 'icons/obj/cigarettes.dmi' json_config = 'code/datums/greyscale/json_configs/vape.json' /datum/greyscale_config/vape/worn diff --git a/code/datums/quirks/negative_quirks/addict.dm b/code/datums/quirks/negative_quirks/addict.dm index f97dae32c26..767d9283bae 100644 --- a/code/datums/quirks/negative_quirks/addict.dm +++ b/code/datums/quirks/negative_quirks/addict.dm @@ -123,7 +123,7 @@ /obj/effect/spawner/random/entertainment/cigarette_pack, /obj/effect/spawner/random/entertainment/cigar, /obj/effect/spawner/random/entertainment/lighter, - /obj/item/clothing/mask/cigarette/pipe, + /obj/item/cigarette/pipe, ) /datum/quirk_constant_data/smoker @@ -162,7 +162,7 @@ . = ..() var/mob/living/carbon/human/human_holder = quirk_holder var/obj/item/mask_item = human_holder.get_item_by_slot(ITEM_SLOT_MASK) - if(istype(mask_item, /obj/item/clothing/mask/cigarette)) + if(istype(mask_item, /obj/item/cigarette)) var/obj/item/storage/fancy/cigarettes/cigarettes = drug_container_type if(istype(mask_item, initial(cigarettes.spawn_type))) quirk_holder.clear_mood_event("wrong_cigs") diff --git a/code/datums/storage/subtypes/pockets.dm b/code/datums/storage/subtypes/pockets.dm index d441c6fdc5f..edf3816c274 100644 --- a/code/datums/storage/subtypes/pockets.dm +++ b/code/datums/storage/subtypes/pockets.dm @@ -108,7 +108,7 @@ /obj/item/ammo_box/magazine/toy/pistol, /obj/item/ammo_casing, /obj/item/lipstick, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/lighter, /obj/item/match, /obj/item/holochip, @@ -116,7 +116,7 @@ /obj/item/reagent_containers/cup/glass/flask), list(/obj/item/screwdriver/power, /obj/item/ammo_casing/rocket, - /obj/item/clothing/mask/cigarette/pipe, + /obj/item/cigarette/pipe, /obj/item/toy/crayon/spraycan) ) @@ -134,7 +134,7 @@ /obj/item/ammo_box/magazine/m9mm, /obj/item/ammo_casing, /obj/item/bikehorn, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/dnainjector, /obj/item/firing_pin, /obj/item/holochip, @@ -158,7 +158,7 @@ ), cant_hold_list = list( /obj/item/ammo_casing/rocket, - /obj/item/clothing/mask/cigarette/pipe, + /obj/item/cigarette/pipe, /obj/item/screwdriver/power, /obj/item/toy/crayon/spraycan, ), diff --git a/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm b/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm index de2f3d82275..c8cfa12f9ab 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_consumables.dm @@ -31,11 +31,11 @@ cost_per_order = 100 /datum/orderable_item/consumables/havana_cigars - item_path = /obj/item/clothing/mask/cigarette/cigar/havana + item_path = /obj/item/cigarette/cigar/havana cost_per_order = 150 /datum/orderable_item/consumables/havana_cigars - item_path = /obj/item/clothing/mask/cigarette/cigar/havana + item_path = /obj/item/cigarette/cigar/havana cost_per_order = 150 /datum/orderable_item/consumables/tracking_implants diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index b0af5c3ca02..21eff5028b5 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -84,7 +84,7 @@ qdel(src) return if(W.get_temperature()) //todo: make heating a reagent holder proc - if(istype(W, /obj/item/clothing/mask/cigarette)) + if(istype(W, /obj/item/cigarette)) return else var/hotness = W.get_temperature() diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index 6eb3f801f73..e5280f7e661 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -40,7 +40,7 @@ items = list( /obj/item/clothing/under/rank/captain/suit, /obj/item/clothing/head/flatcap, - /obj/item/clothing/mask/cigarette/cigar/havana, + /obj/item/cigarette/cigar/havana, /obj/item/clothing/shoes/jackboots, ) diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 3ad477b0294..74ca4213b0d 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -121,10 +121,10 @@ icon_state = "pill" loot = list( /obj/item/reagent_containers/cup/glass/bottle/hooch = 50, - /obj/item/clothing/mask/cigarette/rollie/cannabis = 15, + /obj/item/cigarette/rollie/cannabis = 15, /obj/item/reagent_containers/syringe = 15, /obj/item/cigbutt/roach = 15, - /obj/item/clothing/mask/cigarette/rollie/mindbreaker = 5, + /obj/item/cigarette/rollie/mindbreaker = 5, ) /obj/effect/spawner/random/entertainment/dice @@ -157,23 +157,23 @@ name = "cigarette spawner" icon_state = "cigarettes" loot = list( - /obj/item/clothing/mask/cigarette/space_cigarette = 3, - /obj/item/clothing/mask/cigarette/rollie/cannabis = 3, - /obj/item/clothing/mask/cigarette/rollie/nicotine = 3, - /obj/item/clothing/mask/cigarette/dromedary = 2, - /obj/item/clothing/mask/cigarette/uplift = 2, - /obj/item/clothing/mask/cigarette/robust = 2, - /obj/item/clothing/mask/cigarette/carp = 1, - /obj/item/clothing/mask/cigarette/robustgold = 1, + /obj/item/cigarette/space_cigarette = 3, + /obj/item/cigarette/rollie/cannabis = 3, + /obj/item/cigarette/rollie/nicotine = 3, + /obj/item/cigarette/dromedary = 2, + /obj/item/cigarette/uplift = 2, + /obj/item/cigarette/robust = 2, + /obj/item/cigarette/carp = 1, + /obj/item/cigarette/robustgold = 1, ) /obj/effect/spawner/random/entertainment/cigar name = "cigar spawner" icon_state = "cigarettes" loot = list( - /obj/item/clothing/mask/cigarette/cigar = 3, - /obj/item/clothing/mask/cigarette/cigar/havana = 2, - /obj/item/clothing/mask/cigarette/cigar/cohiba = 1, + /obj/item/cigarette/cigar = 3, + /obj/item/cigarette/cigar/havana = 2, + /obj/item/cigarette/cigar/cohiba = 1, ) /obj/effect/spawner/random/entertainment/wallet_lighter diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 7c0ebfda5f4..27647feb924 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -94,7 +94,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(M)] on fire with [src] at [AREACOORD(user)]") user.log_message("set [key_name(M)] on fire with [src]", LOG_ATTACK) - var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) + var/obj/item/cigarette/cig = help_light_cig(M) if(!lit || !cig || user.combat_mode) ..() return @@ -109,7 +109,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /// Finds a cigarette on another mob to help light. /obj/item/proc/help_light_cig(mob/living/M) var/mask_item = M.get_item_by_slot(ITEM_SLOT_MASK) - if(istype(mask_item, /obj/item/clothing/mask/cigarette)) + if(istype(mask_item, /obj/item/cigarette)) return mask_item /obj/item/match/get_temperature() @@ -129,14 +129,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM ////////////////// //FINE SMOKABLES// ////////////////// -/obj/item/clothing/mask/cigarette +/obj/item/cigarette name = "cigarette" desc = "A roll of tobacco and nicotine." + icon = 'icons/obj/cigarettes.dmi' icon_state = "cigoff" inhand_icon_state = "cigon" //gets overriden during intialize(), just have it for unit test sanity. throw_speed = 0.5 w_class = WEIGHT_CLASS_TINY - body_parts_covered = null + slot_flags = ITEM_SLOT_MASK grind_results = list() heat = 1000 throw_verb = "flick" @@ -180,7 +181,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /// How long the current mob has been smoking this cigarette VAR_FINAL/how_long_have_we_been_smokin = 0 SECONDS -/obj/item/clothing/mask/cigarette/Initialize(mapload) +/obj/item/cigarette/Initialize(mapload) . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) if(list_reagents) @@ -193,24 +194,23 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = icon_off inhand_icon_state = inhand_icon_off -/obj/item/clothing/mask/cigarette/Destroy() +/obj/item/cigarette/Destroy() STOP_PROCESSING(SSobj, src) QDEL_NULL(mob_smoke) QDEL_NULL(cig_smoke) return ..() -/obj/item/clothing/mask/cigarette/equipped(mob/equipee, slot) +/obj/item/cigarette/equipped(mob/equipee, slot) . = ..() if(!(slot & ITEM_SLOT_MASK)) UnregisterSignal(equipee, list(COMSIG_HUMAN_FORCESAY, COMSIG_ATOM_DIR_CHANGE)) return RegisterSignal(equipee, COMSIG_HUMAN_FORCESAY, PROC_REF(on_forcesay)) RegisterSignal(equipee, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_mob_dir_change)) - if(lit && iscarbon(loc)) make_mob_smoke(loc) -/obj/item/clothing/mask/cigarette/dropped(mob/dropee, silent) +/obj/item/cigarette/dropped(mob/dropee) . = ..() // Moving the cigarette from mask to hands (or pocket I guess) will emit a larger puff of smoke if(!QDELETED(src) && !QDELETED(dropee) && how_long_have_we_been_smokin >= 4 SECONDS && iscarbon(dropee) && iscarbon(loc)) @@ -223,17 +223,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM QDEL_NULL(mob_smoke) how_long_have_we_been_smokin = 0 SECONDS -/obj/item/clothing/mask/cigarette/proc/on_forcesay(mob/living/source) +/obj/item/cigarette/proc/on_forcesay(mob/living/source) SIGNAL_HANDLER source.apply_status_effect(/datum/status_effect/choke, src, lit, choke_forever ? -1 : rand(25 SECONDS, choke_time_max)) -/obj/item/clothing/mask/cigarette/proc/on_mob_dir_change(mob/living/source, old_dir, new_dir) +/obj/item/cigarette/proc/on_mob_dir_change(mob/living/source, old_dir, new_dir) SIGNAL_HANDLER if(isnull(mob_smoke)) return update_particle_position(mob_smoke, new_dir) -/obj/item/clothing/mask/cigarette/proc/update_particle_position(obj/effect/abstract/particle_holder/to_edit, new_dir = loc.dir) +/obj/item/cigarette/proc/update_particle_position(obj/effect/abstract/particle_holder/to_edit, new_dir = loc.dir) var/new_x = 0 var/new_layer = initial(to_edit.layer) if(new_dir & NORTH) @@ -248,11 +248,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_edit.set_particle_position(new_x, 8, 0) to_edit.layer = new_layer -/obj/item/clothing/mask/cigarette/suicide_act(mob/living/user) +/obj/item/cigarette/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")) return (TOXLOSS|OXYLOSS) -/obj/item/clothing/mask/cigarette/attackby(obj/item/W, mob/user, params) +/obj/item/cigarette/attackby(obj/item/W, mob/user, params) if(lit) return ..() @@ -270,7 +270,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, span_warning("There is nothing to smoke!")) /// Checks that we have enough air to smoke -/obj/item/clothing/mask/cigarette/proc/check_oxygen(mob/user) +/obj/item/cigarette/proc/check_oxygen(mob/user) if (reagents.has_reagent(/datum/reagent/oxygen)) return TRUE var/datum/gas_mixture/air = return_air() @@ -281,7 +281,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/mob/living/carbon/the_smoker = user return the_smoker.can_breathe_helmet() -/obj/item/clothing/mask/cigarette/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) +/obj/item/cigarette/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead) return NONE var/obj/item/reagent_containers/cup/glass = interacting_with @@ -298,7 +298,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, span_warning("[src] is full!")) return ITEM_INTERACT_SUCCESS -/obj/item/clothing/mask/cigarette/update_icon_state() +/obj/item/cigarette/update_icon_state() . = ..() if(lit) icon_state = icon_on @@ -308,7 +308,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM inhand_icon_state = inhand_icon_off -/obj/item/clothing/mask/cigarette/proc/sparks_touched(datum/source, obj/effect/particle_effect) +/obj/item/cigarette/proc/sparks_touched(datum/source, obj/effect/particle_effect) SIGNAL_HANDLER if(lit) @@ -316,7 +316,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM light() /// Lights the cigarette with given flavor text. -/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) +/obj/item/cigarette/proc/light(flavor_text = null) if(lit) return @@ -357,7 +357,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(src == smoker.wear_mask) make_mob_smoke(smoker) -/obj/item/clothing/mask/cigarette/extinguish() +/obj/item/cigarette/extinguish() . = ..() if(!lit) return @@ -375,7 +375,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM QDEL_NULL(cig_smoke) QDEL_NULL(mob_smoke) -/obj/item/clothing/mask/cigarette/proc/long_exhale(mob/living/carbon/smoker) +/obj/item/cigarette/proc/long_exhale(mob/living/carbon/smoker) smoker.visible_message( span_notice("[smoker] exhales a large cloud of smoke from [src]."), span_notice("You exhale a large cloud of smoke from [src]."), @@ -388,7 +388,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM QDEL_IN(big_smoke, big_smoke.particles.lifespan) /// Handles processing the reagents in the cigarette. -/obj/item/clothing/mask/cigarette/proc/handle_reagents(seconds_per_tick) +/obj/item/cigarette/proc/handle_reagents(seconds_per_tick) if(!reagents.total_volume) return reagents.expose_temperature(heat, 0.05) @@ -424,7 +424,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.trans_to(smoker, to_smoke, methods = INGEST, ignore_stomach = TRUE)) reagents.remove_all(to_smoke) -/obj/item/clothing/mask/cigarette/process(seconds_per_tick) +/obj/item/cigarette/process(seconds_per_tick) var/mob/living/user = isliving(loc) ? loc : null user?.ignite_mob() @@ -442,12 +442,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM COOLDOWN_START(src, drag_cooldown, dragtime) handle_reagents(seconds_per_tick) -/obj/item/clothing/mask/cigarette/attack_self(mob/user) +/obj/item/cigarette/attack_self(mob/user) if(lit) put_out(user, TRUE) return ..() -/obj/item/clothing/mask/cigarette/proc/put_out(mob/user, done_early = FALSE) +/obj/item/cigarette/proc/put_out(mob/user, done_early = FALSE) var/atom/location = drop_location() if(!isnull(user)) if(done_early) @@ -463,13 +463,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM new type_butt(location) qdel(src) -/obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user) +/obj/item/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M)) return ..() if(M.on_fire && !lit) light(span_notice("[user] lights [src] with [M]'s burning body. What a cold-blooded badass.")) return - var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) + var/obj/item/cigarette/cig = help_light_cig(M) if(!lit || !cig || user.combat_mode) return ..() @@ -480,54 +480,54 @@ CIGARETTE PACKETS ARE IN FANCY.DM else cig.light(span_notice("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].")) -/obj/item/clothing/mask/cigarette/fire_act(exposed_temperature, exposed_volume) +/obj/item/cigarette/fire_act(exposed_temperature, exposed_volume) light() -/obj/item/clothing/mask/cigarette/get_temperature() +/obj/item/cigarette/get_temperature() return lit * heat -/obj/item/clothing/mask/cigarette/proc/make_mob_smoke(mob/living/smoker) +/obj/item/cigarette/proc/make_mob_smoke(mob/living/smoker) mob_smoke = new(smoker, /particles/smoke/cig) update_particle_position(mob_smoke, smoker.dir) return mob_smoke -/obj/item/clothing/mask/cigarette/proc/make_cig_smoke() +/obj/item/cigarette/proc/make_cig_smoke() cig_smoke = new(src, /particles/smoke/cig) cig_smoke.particles.scale *= 1.5 return cig_smoke // Cigarette brands. -/obj/item/clothing/mask/cigarette/space_cigarette +/obj/item/cigarette/space_cigarette desc = "A Space brand cigarette that can be smoked anywhere." list_reagents = list(/datum/reagent/drug/nicotine = 9, /datum/reagent/oxygen = 9) smoketime = 4 MINUTES // space cigs have a shorter burn time than normal cigs smoke_all = TRUE // so that it doesn't runout of oxygen while being smoked in space -/obj/item/clothing/mask/cigarette/dromedary +/obj/item/cigarette/dromedary desc = "A DromedaryCo brand cigarette. Contrary to popular belief, does not contain Calomel, but is reported to have a watery taste." list_reagents = list(/datum/reagent/drug/nicotine = 13, /datum/reagent/water = 5) //camel has water -/obj/item/clothing/mask/cigarette/uplift +/obj/item/cigarette/uplift desc = "An Uplift Smooth brand cigarette. Smells refreshing." list_reagents = list(/datum/reagent/drug/nicotine = 13, /datum/reagent/consumable/menthol = 5) -/obj/item/clothing/mask/cigarette/robust +/obj/item/cigarette/robust desc = "A Robust brand cigarette." -/obj/item/clothing/mask/cigarette/robustgold +/obj/item/cigarette/robustgold desc = "A Robust Gold brand cigarette." list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/gold = 3) // Just enough to taste a hint of expensive metal. -/obj/item/clothing/mask/cigarette/carp +/obj/item/cigarette/carp desc = "A Carp Classic brand cigarette. A small label on its side indicates that it does NOT contain carpotoxin." -/obj/item/clothing/mask/cigarette/carp/Initialize(mapload) +/obj/item/cigarette/carp/Initialize(mapload) . = ..() if(!prob(5)) return reagents?.add_reagent(/datum/reagent/toxin/carpotoxin , 3) // They lied -/obj/item/clothing/mask/cigarette/syndicate +/obj/item/cigarette/syndicate desc = "An unknown brand cigarette." chem_volume = 60 smoketime = 2 MINUTES @@ -535,19 +535,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM lung_harm = 1.5 list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15) -/obj/item/clothing/mask/cigarette/shadyjims +/obj/item/cigarette/shadyjims desc = "A Shady Jim's Super Slims cigarette." lung_harm = 1.5 list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5) -/obj/item/clothing/mask/cigarette/xeno +/obj/item/cigarette/xeno desc = "A Xeno Filtered brand cigarette." lung_harm = 2 list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4) // Rollies. -/obj/item/clothing/mask/cigarette/rollie +/obj/item/cigarette/rollie name = "rollie" desc = "A roll of dried plant matter wrapped in thin paper." icon_state = "spliffoff" @@ -560,7 +560,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = null choke_time_max = 40 SECONDS -/obj/item/clothing/mask/cigarette/rollie/Initialize(mapload) +/obj/item/cigarette/rollie/Initialize(mapload) name = pick(list( "bifta", "bifter", @@ -606,20 +606,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) -/obj/item/clothing/mask/cigarette/rollie/nicotine +/obj/item/cigarette/rollie/nicotine list_reagents = list(/datum/reagent/drug/nicotine = 15) -/obj/item/clothing/mask/cigarette/rollie/trippy +/obj/item/cigarette/rollie/trippy list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/drug/mushroomhallucinogen = 35) starts_lit = TRUE -/obj/item/clothing/mask/cigarette/rollie/cannabis +/obj/item/cigarette/rollie/cannabis list_reagents = list(/datum/reagent/drug/cannabis = 15) -/obj/item/clothing/mask/cigarette/rollie/mindbreaker +/obj/item/cigarette/rollie/mindbreaker list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/toxin/lipolicide = 15) -/obj/item/clothing/mask/cigarette/candy +/obj/item/cigarette/candy name = "\improper Little Timmy's candy cigarette" desc = "For all ages*! Doesn't contain any amount of nicotine. Health and safety risks can be read on the tip of the cigarette." smoketime = 2 MINUTES @@ -633,7 +633,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = list(/datum/reagent/consumable/sugar = 20) choke_time_max = 70 SECONDS // This shit really is deadly -/obj/item/clothing/mask/cigarette/candy/nicotine +/obj/item/cigarette/candy/nicotine desc = "For all ages*! Doesn't contain any* amount of nicotine. Health and safety risks can be read on the tip of the cigarette." type_butt = /obj/item/food/candy_trash/nicotine list_reagents = list(/datum/reagent/consumable/sugar = 20, /datum/reagent/drug/nicotine = 20) //oh no! @@ -653,7 +653,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //////////// // CIGARS // //////////// -/obj/item/clothing/mask/cigarette/cigar +/obj/item/cigarette/cigar name = "cigar" desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!" icon_state = "cigaroff" @@ -669,11 +669,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = list(/datum/reagent/drug/nicotine = 25) choke_time_max = 40 SECONDS -/obj/item/clothing/mask/cigarette/cigar/premium +/obj/item/cigarette/cigar/premium name = "premium cigar" //this is the version that actually spawns in premium cigar cases, the distinction is made so that the smoker quirk can differentiate between the default cigar box and its subtypes -/obj/item/clothing/mask/cigarette/cigar/cohiba +/obj/item/cigarette/cigar/cohiba name = "\improper Cohiba Robusto cigar" desc = "There's little more you could want from a cigar." icon_state = "cigar2off" @@ -683,7 +683,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM chem_volume = 80 list_reagents = list(/datum/reagent/drug/nicotine = 40) -/obj/item/clothing/mask/cigarette/cigar/havana +/obj/item/cigarette/cigar/havana name = "premium Havanian cigar" desc = "A cigar fit for only the best of the best." icon_state = "cigar2off" @@ -696,7 +696,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/cigbutt name = "cigarette butt" desc = "A manky old cigarette butt." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/obj/cigarettes.dmi' icon_state = "cigbutt" w_class = WEIGHT_CLASS_TINY throwforce = 0 @@ -710,7 +710,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ///////////////// //SMOKING PIPES// ///////////////// -/obj/item/clothing/mask/cigarette/pipe +/obj/item/cigarette/pipe name = "smoking pipe" desc = "A pipe, for smoking. Probably made of meerschaum or something." icon_state = "pipeoff" @@ -727,15 +727,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM ///name of the stuff packed inside this pipe var/packeditem -/obj/item/clothing/mask/cigarette/pipe/Initialize(mapload) +/obj/item/cigarette/pipe/Initialize(mapload) . = ..() update_appearance(UPDATE_NAME) -/obj/item/clothing/mask/cigarette/pipe/update_name() +/obj/item/cigarette/pipe/update_name() . = ..() name = packeditem ? "[packeditem]-packed [initial(name)]" : "empty [initial(name)]" -/obj/item/clothing/mask/cigarette/pipe/put_out(mob/user, done_early = FALSE) +/obj/item/cigarette/pipe/put_out(mob/user, done_early = FALSE) lit = FALSE if(done_early) user.visible_message(span_notice("[user] puts out [src]."), span_notice("You put out [src].")) @@ -748,7 +748,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) QDEL_NULL(cig_smoke) -/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/thing, mob/user, params) +/obj/item/cigarette/pipe/attackby(obj/item/thing, mob/user, params) if(!istype(thing, /obj/item/food/grown)) return ..() @@ -769,7 +769,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM qdel(to_smoke) -/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user) +/obj/item/cigarette/pipe/attack_self(mob/user) var/atom/location = drop_location() if(packeditem && !lit) to_chat(user, span_notice("You empty [src] onto [location].")) @@ -781,7 +781,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return return ..() -/obj/item/clothing/mask/cigarette/pipe/cobpipe +/obj/item/cigarette/pipe/cobpipe name = "corn cob pipe" desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters. Can be loaded with objects." icon_state = "cobpipeoff" @@ -962,7 +962,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit && M.ignite_mob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(M)] on fire with [src] at [AREACOORD(user)]") log_game("[key_name(user)] set [key_name(M)] on fire with [src] at [AREACOORD(user)]") - var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) + var/obj/item/cigarette/cig = help_light_cig(M) if(!lit || !cig || user.combat_mode) ..() return @@ -1110,13 +1110,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/rollingpaper/Initialize(mapload) . = ..() - AddComponent(/datum/component/customizable_reagent_holder, /obj/item/clothing/mask/cigarette/rollie, CUSTOM_INGREDIENT_ICON_NOCHANGE, ingredient_type=CUSTOM_INGREDIENT_TYPE_DRYABLE, max_ingredients=2) + AddComponent(/datum/component/customizable_reagent_holder, /obj/item/cigarette/rollie, CUSTOM_INGREDIENT_ICON_NOCHANGE, ingredient_type=CUSTOM_INGREDIENT_TYPE_DRYABLE, max_ingredients=2) /////////////// //VAPE NATION// /////////////// -/obj/item/clothing/mask/vape +/obj/item/vape name = "\improper E-Cigarette" desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that. icon_state = "vape" @@ -1126,6 +1126,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM greyscale_colors = "#2e2e2e" inhand_icon_state = null w_class = WEIGHT_CLASS_TINY + slot_flags = ITEM_SLOT_MASK flags_1 = IS_PLAYER_COLORABLE_1 /// The capacity of the vape. @@ -1139,16 +1140,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM /// Whether the vape has been overloaded to spread smoke. var/super = FALSE -/obj/item/clothing/mask/vape/Initialize(mapload) +/obj/item/vape/Initialize(mapload) . = ..() create_reagents(chem_volume, NO_REACT) reagents.add_reagent(/datum/reagent/drug/nicotine, 50) -/obj/item/clothing/mask/vape/suicide_act(mob/living/user) +/obj/item/vape/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!"))//it doesn't give you cancer, it is cancer return (TOXLOSS|OXYLOSS) -/obj/item/clothing/mask/vape/screwdriver_act(mob/living/user, obj/item/tool) +/obj/item/vape/screwdriver_act(mob/living/user, obj/item/tool) if(!screw) screw = TRUE to_chat(user, span_notice("You open the cap on [src].")) @@ -1169,7 +1170,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = initial(icon_state) set_greyscale(new_config = initial(greyscale_config)) -/obj/item/clothing/mask/vape/multitool_act(mob/living/user, obj/item/tool) +/obj/item/vape/multitool_act(mob/living/user, obj/item/tool) . = TRUE if(screw && !(obj_flags & EMAGGED))//also kinky if(!super) @@ -1186,7 +1187,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(screw && (obj_flags & EMAGGED)) to_chat(user, span_warning("[src] can't be modified!")) -/obj/item/clothing/mask/vape/emag_act(mob/user, obj/item/card/emag/emag_card) // I WON'T REGRET WRITTING THIS, SURLY. +/obj/item/vape/emag_act(mob/user, obj/item/card/emag/emag_card) // I WON'T REGRET WRITTING THIS, SURLY. if (!screw) balloon_alert(user, "open the cap first!") @@ -1206,12 +1207,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM sp.start() return TRUE -/obj/item/clothing/mask/vape/attack_self(mob/user) +/obj/item/vape/attack_self(mob/user) if(reagents.total_volume > 0) to_chat(user, span_notice("You empty [src] of all reagents.")) reagents.clear_reagents() -/obj/item/clothing/mask/vape/equipped(mob/user, slot) +/obj/item/vape/equipped(mob/user, slot) . = ..() if(!(slot & ITEM_SLOT_MASK)) return @@ -1224,13 +1225,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM reagents.flags &= ~(NO_REACT) START_PROCESSING(SSobj, src) -/obj/item/clothing/mask/vape/dropped(mob/user) +/obj/item/vape/dropped(mob/user) . = ..() if(user.get_item_by_slot(ITEM_SLOT_MASK) == src) reagents.flags |= NO_REACT STOP_PROCESSING(SSobj, src) -/obj/item/clothing/mask/vape/proc/handle_reagents() +/obj/item/vape/proc/handle_reagents() if(!reagents.total_volume) return @@ -1253,7 +1254,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.trans_to(vaper, REAGENTS_METABOLISM, methods = INGEST, ignore_stomach = TRUE)) reagents.remove_all(REAGENTS_METABOLISM) -/obj/item/clothing/mask/vape/process(seconds_per_tick) +/obj/item/vape/process(seconds_per_tick) var/mob/living/M = loc if(isliving(loc)) @@ -1292,34 +1293,34 @@ CIGARETTE PACKETS ARE IN FANCY.DM handle_reagents() -/obj/item/clothing/mask/vape/red +/obj/item/vape/red greyscale_colors = "#A02525" flags_1 = NONE -/obj/item/clothing/mask/vape/blue +/obj/item/vape/blue greyscale_colors = "#294A98" flags_1 = NONE -/obj/item/clothing/mask/vape/purple +/obj/item/vape/purple greyscale_colors = "#9900CC" flags_1 = NONE -/obj/item/clothing/mask/vape/green +/obj/item/vape/green greyscale_colors = "#3D9829" flags_1 = NONE -/obj/item/clothing/mask/vape/yellow +/obj/item/vape/yellow greyscale_colors = "#DAC20E" flags_1 = NONE -/obj/item/clothing/mask/vape/orange +/obj/item/vape/orange greyscale_colors = "#da930e" flags_1 = NONE -/obj/item/clothing/mask/vape/black +/obj/item/vape/black greyscale_colors = "#2e2e2e" flags_1 = NONE -/obj/item/clothing/mask/vape/white +/obj/item/vape/white greyscale_colors = "#DCDCDC" flags_1 = NONE diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index 1c3cb7736ce..cb64c6df522 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -157,7 +157,7 @@ /obj/item/food/candy_trash name = "candy cigarette butt" - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/obj/cigarettes.dmi' icon_state = "candybum" desc = "The leftover from a smoked-out candy cigarette. Can be eaten!" food_reagents = list( diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index c56e1eb7cdc..35e4c7ff72e 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -676,7 +676,7 @@ ) AddElement(/datum/element/connect_loc, loc_connections) -/obj/item/toy/plush/goatplushie/attackby(obj/item/clothing/mask/cigarette/rollie/fat_dart, mob/user, params) +/obj/item/toy/plush/goatplushie/attackby(obj/item/cigarette/rollie/fat_dart, mob/user, params) if(!istype(fat_dart)) return ..() if(splat) diff --git a/code/game/objects/items/rcd/RSF.dm b/code/game/objects/items/rcd/RSF.dm index b267ecd05cf..ef0be22acc4 100644 --- a/code/game/objects/items/rcd/RSF.dm +++ b/code/game/objects/items/rcd/RSF.dm @@ -45,7 +45,7 @@ RSF /obj/item/toy/cards/deck = 200, /obj/item/paper = 10, /obj/item/pen = 50, - /obj/item/clothing/mask/cigarette = 10, + /obj/item/cigarette = 10, ) ///An associated list of fuel and it's value var/list/matter_by_item = list(/obj/item/rcd_ammo = 10,) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 662f94c61d5..cc9bc3bcb96 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 5 SECONDS, crafting_flags = NONE, category = CAT_TOOLS),\ new/datum/stack_recipe("mannequin", /obj/structure/mannequin/wood, 25, time = 5 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF, category = CAT_ENTERTAINMENT), \ new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2, crafting_flags = NONE, category = CAT_CLOTHING), \ - new/datum/stack_recipe("smoking pipe", /obj/item/clothing/mask/cigarette/pipe, 2, crafting_flags = NONE, category = CAT_CLOTHING), \ + new/datum/stack_recipe("smoking pipe", /obj/item/cigarette/pipe, 2, crafting_flags = NONE, category = CAT_CLOTHING), \ new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 1 SECONDS, crafting_flags = NONE, category = CAT_TOOLS),\ new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/cup/bucket/wooden, 3, time = 1 SECONDS, crafting_flags = NONE, category = CAT_CONTAINERS),\ new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 1 SECONDS, crafting_flags = NONE, category = CAT_TOOLS),\ diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e3636876189..996cd933647 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -363,7 +363,7 @@ atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY //Plates are required bulky to keep them out of backpacks atom_storage.set_holdable( can_hold_list = list( - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/food, /obj/item/kitchen, /obj/item/lighter, diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 4aa93cc5433..1c5490301a5 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -202,7 +202,7 @@ w_class = WEIGHT_CLASS_TINY throwforce = 0 slot_flags = ITEM_SLOT_BELT - spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette + spawn_type = /obj/item/cigarette/space_cigarette spawn_count = 6 custom_price = PAYCHECK_CREW age_restricted = TRUE @@ -233,18 +233,18 @@ /obj/item/storage/fancy/cigarettes/Initialize(mapload) . = ..() atom_storage.display_contents = FALSE - atom_storage.set_holdable(list(/obj/item/clothing/mask/cigarette, /obj/item/lighter)) + atom_storage.set_holdable(list(/obj/item/cigarette, /obj/item/lighter)) register_context() /obj/item/storage/fancy/cigarettes/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) . = ..() if(interacting_with != user) // you can quickly put a cigarette in your mouth only return ..() - quick_remove_item(/obj/item/clothing/mask/cigarette, user, equip_to_mouth = TRUE) + quick_remove_item(/obj/item/cigarette, user, equip_to_mouth = TRUE) /obj/item/storage/fancy/cigarettes/attack_hand_secondary(mob/user, list/modifiers) . = ..() - quick_remove_item(/obj/item/clothing/mask/cigarette, user) + quick_remove_item(/obj/item/cigarette, user) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/item/storage/fancy/cigarettes/click_alt(mob/user) @@ -252,7 +252,7 @@ if(lighter) quick_remove_item(lighter, user) else - quick_remove_item(/obj/item/clothing/mask/cigarette, user) + quick_remove_item(/obj/item/cigarette, user) return CLICK_ACTION_SUCCESS /// Removes an item or puts it in mouth from the packet, if any @@ -316,49 +316,49 @@ desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" icon_state = "dromedary" base_icon_state = "dromedary" - spawn_type = /obj/item/clothing/mask/cigarette/dromedary + spawn_type = /obj/item/cigarette/dromedary /obj/item/storage/fancy/cigarettes/cigpack_uplift name = "\improper Uplift Smooth packet" desc = "Your favorite brand, now menthol flavored." icon_state = "uplift" base_icon_state = "uplift" - spawn_type = /obj/item/clothing/mask/cigarette/uplift + spawn_type = /obj/item/cigarette/uplift /obj/item/storage/fancy/cigarettes/cigpack_robust name = "\improper Robust packet" desc = "Smoked by the robust." icon_state = "robust" base_icon_state = "robust" - spawn_type = /obj/item/clothing/mask/cigarette/robust + spawn_type = /obj/item/cigarette/robust /obj/item/storage/fancy/cigarettes/cigpack_robustgold name = "\improper Robust Gold packet" desc = "Smoked by the truly robust." icon_state = "robustg" base_icon_state = "robustg" - spawn_type = /obj/item/clothing/mask/cigarette/robustgold + spawn_type = /obj/item/cigarette/robustgold /obj/item/storage/fancy/cigarettes/cigpack_carp name = "\improper Carp Classic packet" desc = "Since 2313." icon_state = "carp" base_icon_state = "carp" - spawn_type = /obj/item/clothing/mask/cigarette/carp + spawn_type = /obj/item/cigarette/carp /obj/item/storage/fancy/cigarettes/cigpack_syndicate name = "cigarette packet" desc = "An obscure brand of cigarettes." icon_state = "syndie" base_icon_state = "syndie" - spawn_type = /obj/item/clothing/mask/cigarette/syndicate + spawn_type = /obj/item/cigarette/syndicate /obj/item/storage/fancy/cigarettes/cigpack_midori name = "\improper Midori Tabako packet" desc = "You can't understand the runes, but the packet smells funny." icon_state = "midori" base_icon_state = "midori" - spawn_type = /obj/item/clothing/mask/cigarette/rollie/nicotine + spawn_type = /obj/item/cigarette/rollie/nicotine /obj/item/storage/fancy/cigarettes/cigpack_candy name = "\improper Timmy's First Candy Smokes packet" @@ -366,42 +366,42 @@ icon_state = "candy" base_icon_state = "candy" contents_tag = "candy cigarette" - spawn_type = /obj/item/clothing/mask/cigarette/candy + spawn_type = /obj/item/cigarette/candy candy = TRUE age_restricted = FALSE /obj/item/storage/fancy/cigarettes/cigpack_candy/Initialize(mapload) . = ..() if(prob(7)) - spawn_type = /obj/item/clothing/mask/cigarette/candy/nicotine //uh oh! + spawn_type = /obj/item/cigarette/candy/nicotine //uh oh! /obj/item/storage/fancy/cigarettes/cigpack_shadyjims name = "\improper Shady Jim's Super Slims packet" desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!" icon_state = "shadyjim" base_icon_state = "shadyjim" - spawn_type = /obj/item/clothing/mask/cigarette/shadyjims + spawn_type = /obj/item/cigarette/shadyjims /obj/item/storage/fancy/cigarettes/cigpack_xeno name = "\improper Xeno Filtered packet" desc = "Loaded with 100% pure slime. And also nicotine." icon_state = "slime" base_icon_state = "slime" - spawn_type = /obj/item/clothing/mask/cigarette/xeno + spawn_type = /obj/item/cigarette/xeno /obj/item/storage/fancy/cigarettes/cigpack_cannabis name = "\improper Freak Brothers' Special packet" desc = "A label on the packaging reads, \"Endorsed by Phineas, Freddy and Franklin.\"" icon_state = "midori" base_icon_state = "midori" - spawn_type = /obj/item/clothing/mask/cigarette/rollie/cannabis + spawn_type = /obj/item/cigarette/rollie/cannabis /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker name = "\improper Leary's Delight packet" desc = "Banned in over 36 galaxies." icon_state = "shadyjim" base_icon_state = "shadyjim" - spawn_type = /obj/item/clothing/mask/cigarette/rollie/mindbreaker + spawn_type = /obj/item/cigarette/rollie/mindbreaker /obj/item/storage/fancy/rollingpapers name = "rolling paper pack" @@ -437,14 +437,14 @@ base_icon_state = "cigarcase" w_class = WEIGHT_CLASS_NORMAL contents_tag = "premium cigar" - spawn_type = /obj/item/clothing/mask/cigarette/cigar/premium + spawn_type = /obj/item/cigarette/cigar/premium spawn_count = 5 spawn_coupon = FALSE display_cigs = FALSE /obj/item/storage/fancy/cigarettes/cigars/Initialize(mapload) . = ..() - atom_storage.set_holdable(/obj/item/clothing/mask/cigarette/cigar) + atom_storage.set_holdable(/obj/item/cigarette/cigar) /obj/item/storage/fancy/cigarettes/cigars/update_icon_state() . = ..() @@ -456,7 +456,7 @@ if(!open_status) return var/cigar_position = 1 //generate sprites for cigars in the box - for(var/obj/item/clothing/mask/cigarette/cigar/smokes in contents) + for(var/obj/item/cigarette/cigar/smokes in contents) . += "[smokes.icon_off]_[cigar_position]" cigar_position++ @@ -465,14 +465,14 @@ desc = "A case of imported Cohiba cigars, renowned for their strong flavor." icon_state = "cohibacase" base_icon_state = "cohibacase" - spawn_type = /obj/item/clothing/mask/cigarette/cigar/cohiba + spawn_type = /obj/item/cigarette/cigar/cohiba /obj/item/storage/fancy/cigarettes/cigars/havana name = "\improper premium Havanian cigar case" desc = "A case of classy Havanian cigars." icon_state = "cohibacase" base_icon_state = "cohibacase" - spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana + spawn_type = /obj/item/cigarette/cigar/havana /* * Heart Shaped Box w/ Chocolates diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 469a14e0e78..e485d6997f0 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -18,7 +18,7 @@ /obj/item/stack/spacecash, /obj/item/holochip, /obj/item/card, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/clothing/accessory/dogtag, /obj/item/coin, /obj/item/coupon, diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index 53450b85db0..23e2b6b38db 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -205,8 +205,8 @@ to_chat(user, span_warning("You need one rod to build a heatproof lattice.")) return // Light a cigarette in the lava - if(istype(C, /obj/item/clothing/mask/cigarette)) - var/obj/item/clothing/mask/cigarette/ciggie = C + if(istype(C, /obj/item/cigarette)) + var/obj/item/cigarette/ciggie = C if(ciggie.lit) to_chat(user, span_warning("The [ciggie.name] is already lit!")) return TRUE diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index bc22eedbfa1..440feb91b76 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -443,7 +443,7 @@ name = "Syndicate Monkey Agent Kit" head = /obj/item/clothing/head/fedora - mask = /obj/item/clothing/mask/cigarette/syndicate + mask = /obj/item/cigarette/syndicate uniform = /obj/item/clothing/under/syndicate l_pocket = /obj/item/reagent_containers/cup/soda_cans/monkey_energy r_pocket = /obj/item/storage/fancy/cigarettes/cigpack_syndicate diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index ed256acae03..e1530ba16ed 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -75,7 +75,7 @@ back = /obj/item/storage/backpack/satchel/leather shoes = /obj/item/clothing/shoes/laceup glasses = /obj/item/clothing/glasses/monocle - mask = /obj/item/clothing/mask/cigarette/pipe + mask = /obj/item/cigarette/pipe ears = /obj/item/radio/headset backpack_contents = list( diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm index e8ae07ffdde..5cd89e6c842 100644 --- a/code/modules/antagonists/nukeop/outfits.dm +++ b/code/modules/antagonists/nukeop/outfits.dm @@ -136,7 +136,7 @@ suit = /obj/item/clothing/suit/jacket/oversized gloves = /obj/item/clothing/gloves/fingerless glasses = /obj/item/clothing/glasses/sunglasses - mask = /obj/item/clothing/mask/cigarette/cigar + mask = /obj/item/cigarette/cigar faction = "Cybersun Industries" /datum/outfit/syndicate/reinforcement/donk diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index 15a3d4fe2dc..aef7f1d9d4b 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -72,7 +72,7 @@ id_trim = /datum/id_trim/pirate/captain/silverscale head = /obj/item/clothing/head/costume/crown - mask = /obj/item/clothing/mask/cigarette/cigar/havana + mask = /obj/item/cigarette/cigar/havana l_pocket = /obj/item/lighter /datum/outfit/pirate/interdyne diff --git a/code/modules/antagonists/traitor/contractor/contract_teammate.dm b/code/modules/antagonists/traitor/contractor/contract_teammate.dm index 54fc958c1f8..965d99e89ac 100644 --- a/code/modules/antagonists/traitor/contractor/contract_teammate.dm +++ b/code/modules/antagonists/traitor/contractor/contract_teammate.dm @@ -24,7 +24,7 @@ suit = /obj/item/clothing/suit/chameleon back = /obj/item/storage/backpack belt = /obj/item/modular_computer/pda/chameleon - mask = /obj/item/clothing/mask/cigarette/syndicate + mask = /obj/item/cigarette/syndicate shoes = /obj/item/clothing/shoes/chameleon/noslip ears = /obj/item/radio/headset/chameleon id = /obj/item/card/id/advanced/chameleon @@ -41,5 +41,5 @@ /datum/outfit/contractor_partner/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - var/obj/item/clothing/mask/cigarette/syndicate/cig = H.get_item_by_slot(ITEM_SLOT_MASK) + var/obj/item/cigarette/syndicate/cig = H.get_item_by_slot(ITEM_SLOT_MASK) cig.light() diff --git a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm index 275b2c6e0fc..bd15bb908f2 100644 --- a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm +++ b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm @@ -64,6 +64,11 @@ . = ..() chameleon_blacklist |= typecacheof(/obj/item/clothing/mask/changeling, only_root_path = TRUE) +/datum/action/item_action/chameleon/change/mask/initialize_disguises() + . = ..() + add_chameleon_items(/obj/item/cigarette) + add_chameleon_items(/obj/item/vape) + /datum/action/item_action/chameleon/change/hat chameleon_type = /obj/item/clothing/head chameleon_name = "Hat" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index ef90fcf97e1..36fe591a63e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( ///Does the mask have an FOV? var/has_fov = TRUE ///Cigarette in the mask - var/obj/item/clothing/mask/cigarette/cig + var/obj/item/cigarette/cig voice_filter = "lowpass=f=750,volume=2" /datum/armor/mask_gas @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( /obj/item/clothing/mask/gas/attackby(obj/item/tool, mob/user) var/valid_wearer = ismob(loc) var/mob/wearer = loc - if(istype(tool, /obj/item/clothing/mask/cigarette)) + if(istype(tool, /obj/item/cigarette)) if(flags_cover & MASKCOVERSMOUTH) balloon_alert(user, "mask's mouth is covered!") return ..() diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6c088760f07..422cb34fa09 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -11,7 +11,7 @@ glasses = /obj/item/clothing/glasses/thermal/eyepatch gloves = /obj/item/clothing/gloves/tackler/combat/insulated head = /obj/item/clothing/head/helmet/space/beret - mask = /obj/item/clothing/mask/cigarette/cigar/havana + mask = /obj/item/cigarette/cigar/havana shoes = /obj/item/clothing/shoes/combat/swat r_pocket = /obj/item/lighter @@ -245,7 +245,7 @@ glasses = /obj/item/clothing/glasses/sunglasses gloves = /obj/item/clothing/gloves/tackler/combat/insulated head = /obj/item/clothing/head/hats/centhat - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba + mask = /obj/item/cigarette/cigar/cohiba shoes = /obj/item/clothing/shoes/combat/swat l_pocket = /obj/item/ammo_box/a357 r_pocket = /obj/item/lighter diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index bc091aaeb66..f333ec53917 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -61,7 +61,7 @@ body_parts_covered = CHEST|GROIN|ARMS allowed = list( /obj/item/assembly/flash/handheld, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/disk, /obj/item/lighter, /obj/item/melee, diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index b4c6af04304..a24663b3ba4 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -371,7 +371,7 @@ display_name = "Cowboy" desc = "Yeehaw partner" - r_hand = /obj/item/clothing/mask/cigarette/cigar + r_hand = /obj/item/cigarette/cigar l_hand = /obj/item/melee/curator_whip l_pocket = /obj/item/lighter accessory = /obj/item/clothing/accessory/vest_sheriff @@ -405,7 +405,7 @@ suit = /obj/item/clothing/suit/wizrobe/red head = /obj/item/clothing/head/wizard/red - mask = /obj/item/clothing/mask/cigarette + mask = /obj/item/cigarette granted_spells = list( /datum/action/cooldown/spell/pointed/projectile/fireball, /datum/action/cooldown/spell/smoke, diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 683b36304a3..ab305bbff99 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -38,7 +38,7 @@ switch(item_set) if(BIG_FAT_DOOBIE) - loadout += /obj/item/clothing/mask/cigarette/rollie/trippy + loadout += /obj/item/cigarette/rollie/trippy ruins_spaceworthiness = TRUE if(BOXING) loadout += /obj/item/clothing/mask/luchador diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 8eab962d751..d5f9f94e1b2 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -50,7 +50,7 @@ /obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params) if(W.get_sharpness()) to_chat(user, span_notice("You use [W] to fashion a pipe out of the corn cob!")) - new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) + new /obj/item/cigarette/pipe/cobpipe (user.loc) qdel(src) else return ..() diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 13e358bdcd5..5b82c9adb71 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -35,7 +35,7 @@ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/flask/gold, /obj/item/toy/captainsaid/collector) mail_goodies = list( - /obj/item/clothing/mask/cigarette/cigar/havana = 20, + /obj/item/cigarette/cigar/havana = 20, /obj/item/storage/fancy/cigarettes/cigars/havana = 15, /obj/item/reagent_containers/cup/glass/bottle/champagne = 5, /obj/item/reagent_containers/cup/glass/bottle/champagne/cursed = 5, diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index b6984e24b42..0ed502b2529 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -61,7 +61,7 @@ ears = /obj/item/radio/headset/headset_sec/alt gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat - mask = /obj/item/clothing/mask/cigarette + mask = /obj/item/cigarette neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown l_pocket = /obj/item/toy/crayon/white @@ -76,12 +76,12 @@ /datum/outfit/job/detective/pre_equip(mob/living/carbon/human/human, visualsOnly = FALSE) . = ..() if (human.age < AGE_MINOR) - mask = /obj/item/clothing/mask/cigarette/candy + mask = /obj/item/cigarette/candy head = /obj/item/clothing/head/fedora/det_hat/minor /datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() - var/obj/item/clothing/mask/cigarette/cig = H.wear_mask + var/obj/item/cigarette/cig = H.wear_mask if(istype(cig)) //Some species specfic changes can mess this up (plasmamen) cig.light("") diff --git a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm index 87ad65c2c7a..6fcb8d94707 100644 --- a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm +++ b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm @@ -63,7 +63,7 @@ uniform = /obj/item/clothing/under/rank/security/officer/formal head = /obj/item/clothing/head/soft/veteran - mask = /obj/item/clothing/mask/cigarette/cigar + mask = /obj/item/cigarette/cigar suit = /obj/item/clothing/suit/jacket/trenchcoat belt = /obj/item/storage/belt/holster/detective/full/ert //M1911 pistol ears = /obj/item/radio/headset/heads/hos/advisor diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 5c6450adb90..3b805bd92f9 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -64,7 +64,7 @@ suit = /obj/item/clothing/suit/jacket/det_suit gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat - mask = /obj/item/clothing/mask/cigarette + mask = /obj/item/cigarette /datum/outfit/mafia/psychologist name = "Mafia Psychologist" diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index caa082d6927..4aecd64aa16 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -209,7 +209,7 @@ new /obj/item/clothing/glasses/science(src) if(7) new /obj/item/clothing/glasses/sunglasses/big(src) - new /obj/item/clothing/mask/cigarette/rollie(src) + new /obj/item/cigarette/rollie(src) else //empty grave return diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index fa15060d282..40cb967d3a0 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -141,7 +141,7 @@ new /obj/item/lighter(src) new /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium(src) for(var/i in 1 to 3) - new /obj/item/clothing/mask/cigarette/rollie(src) + new /obj/item/cigarette/rollie(src) if(6 to 10) new /obj/item/melee/skateboard/pro(src) if(11 to 15) diff --git a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm index 0940815f1fc..0ed30e5a521 100644 --- a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm +++ b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm @@ -25,7 +25,7 @@ suit = /obj/item/clothing/suit/armor/bulletproof ears = /obj/item/radio/headset/heads/captain glasses = /obj/item/clothing/glasses/eyepatch - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba + mask = /obj/item/cigarette/cigar/cohiba head = /obj/item/clothing/head/hats/centhat gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/combat/swat diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm index 764d20c9a76..79d028bdbcb 100644 --- a/code/modules/mob_spawn/ghost_roles/space_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm @@ -181,6 +181,6 @@ ears = /obj/item/radio/headset/syndicate/alt/leader glasses = /obj/item/clothing/glasses/thermal/eyepatch head = /obj/item/clothing/head/hats/hos/cap/syndicate - mask = /obj/item/clothing/mask/cigarette/cigar/havana + mask = /obj/item/cigarette/cigar/havana l_pocket = /obj/item/melee/energy/sword/saber/red r_pocket = /obj/item/melee/baton/telescopic diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index ca10b6c53ad..2fb7863445d 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -46,7 +46,7 @@ /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/reagent_containers/hypospray/medipen, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, ) /obj/item/modular_computer/pda/Initialize(mapload) diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index 554d226ed2e..36fc4570540 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -16,7 +16,7 @@ uniform = /obj/item/clothing/under/suit/tuxedo glasses = /obj/item/clothing/glasses/sunglasses - mask = /obj/item/clothing/mask/cigarette/cigar/havana + mask = /obj/item/cigarette/cigar/havana shoes = /obj/item/clothing/shoes/laceup l_hand = /obj/item/stack/spacecash/c1000 r_hand = /obj/item/stack/spacecash/c1000 @@ -25,19 +25,19 @@ /datum/outfit/duffel_user name = "Mr. Runtime" back = /obj/item/storage/backpack/duffelbag - backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana) + backpack_contents = list(/obj/item/cigarette/cigar/havana) /// Satchels too /datum/outfit/stachel_user name = "Mr. Runtime" back = /obj/item/storage/backpack/satchel - backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana) + backpack_contents = list(/obj/item/cigarette/cigar/havana) /// And just in case we'll check backpacks /datum/outfit/backpack_user name = "Mr. Runtime" back = /obj/item/storage/backpack - backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana) + backpack_contents = list(/obj/item/cigarette/cigar/havana) /datum/unit_test/outfit_sanity/Run() var/datum/outfit/prototype_outfit = /datum/outfit diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index ddcfd9bb244..61379e56354 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -17,7 +17,7 @@ /obj/item/storage/fancy/rollingpapers = 5, ) contraband = list( - /obj/item/clothing/mask/vape = 5, + /obj/item/vape = 5, ) premium = list( /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, @@ -66,7 +66,7 @@ ) premium = list( /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5, - /obj/item/clothing/mask/vape = 5, + /obj/item/vape = 5, /obj/item/lighter = 3, ) initial_language_holder = /datum/language_holder/beachbum diff --git a/icons/mob/inhands/clothing/masks_lefthand.dmi b/icons/mob/inhands/clothing/masks_lefthand.dmi index 64fcf4d70bd..cac122916bd 100644 Binary files a/icons/mob/inhands/clothing/masks_lefthand.dmi and b/icons/mob/inhands/clothing/masks_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/masks_righthand.dmi b/icons/mob/inhands/clothing/masks_righthand.dmi index 99f45bd1b17..f68f2d905e6 100644 Binary files a/icons/mob/inhands/clothing/masks_righthand.dmi and b/icons/mob/inhands/clothing/masks_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 967968b339b..5515ad69c34 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index beb3c84860d..fdad955fd9a 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index 3612c747f50..1be85df6c15 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 5cb090978ae..436785ce6e5 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt b/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt new file mode 100644 index 00000000000..22cf75332bf --- /dev/null +++ b/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt @@ -0,0 +1,2 @@ +/obj/item/clothing/mask/cigarette/@SUBTYPES : /obj/item/cigarette/@SUBTYPES{@OLD} +/obj/item/clothing/mask/vape/@SUBTYPES : /obj/item/vape/@SUBTYPES{@OLD} \ No newline at end of file