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

халаты и стаканы #59

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

халаты и стаканы #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177f317
новые стаканы
DarkSovet718 Jul 20, 2023
834bbc7
халаты
DarkSovet718 Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/modules/clothing/under/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,3 +753,11 @@
icon_state = "kimono"
worn_state = "kimono"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS

/obj/item/clothing/under/bathrobe
name = "bathrobe"
desc = "A classic bathrobe for your pastime in the sauna."
icon_state = "bathrobe"
item_state = "bathrobe"
worn_state = "bathrobe"
gender_icons = 1
11 changes: 11 additions & 0 deletions code/modules/reagents/reagent_containers/drinkingglass/glass_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
volume = 30
possible_transfer_amounts = "5;10;15;30"
rim_pos = "y=23;x_left=13;x_right=20"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/rocks
name = "rocks glass"
Expand All @@ -19,6 +20,7 @@
volume = 20
possible_transfer_amounts = "5;10;20"
rim_pos = "y=21;x_left=10;x_right=23"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/shake
name = "sherry glass"
Expand All @@ -30,6 +32,7 @@
volume = 30
possible_transfer_amounts = "5;10;15;30"
rim_pos = "y=25;x_left=13;x_right=21"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/cocktail
name = "cocktail glass"
Expand All @@ -41,6 +44,7 @@
volume = 15
possible_transfer_amounts = "5;10;15"
rim_pos = "y=22;x_left=13;x_right=21"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/shot
name = "shot glass"
Expand All @@ -53,6 +57,7 @@
matter = list(MATERIAL_GLASS = 15)
possible_transfer_amounts = "1;2;5"
rim_pos = "y=17;x_left=13;x_right=21"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/pint
name = "pint glass"
Expand All @@ -64,6 +69,7 @@
matter = list(MATERIAL_GLASS = 125)
possible_transfer_amounts = "5;10;15;30;60"
rim_pos = "y=25;x_left=12;x_right=21"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/mug
name = "glass mug"
Expand All @@ -75,6 +81,7 @@
volume = 40
possible_transfer_amounts = "5;10;20;40"
rim_pos = "y=22;x_left=12;x_right=20"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/wine
name = "wine glass"
Expand All @@ -86,6 +93,7 @@
volume = 25
possible_transfer_amounts = "5;10;15;25"
rim_pos = "y=25;x_left=12;x_right=21"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/flute
name = "flute glass"
Expand All @@ -97,6 +105,7 @@
volume = 25
possible_transfer_amounts = "5;10;15;25"
rim_pos = "y=24;x_left=13;x_right=19"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/carafe
name = "pitcher"
Expand Down Expand Up @@ -279,6 +288,7 @@
volume = 20
possible_transfer_amounts = "5;10;20"
rim_pos = "y=22;x_left=14;x_right=22"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/goblet
name = "goblet"
Expand All @@ -290,6 +300,7 @@
volume = 25
possible_transfer_amounts = "5;10;15;25"
rim_pos = "y=24;x_left=14;x_right=20"
filling_overlayed = TRUE

/obj/item/reagent_containers/food/drinks/glass2/coffeecup/glass
name = "glass coffee cup"
Expand Down
Binary file modified icons/mob/onmob/onmob_under.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/obj_under.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/cocktail.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/cognac.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/flute.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/goblet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/mug.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/pint.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/rocks.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/shake.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/shot.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/square.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/teacup.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drink_glasses/wine.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions maps/torch/torch3_deck3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@
"gK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/head)
"gL" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/hygiene/drain,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/head)
"gM" = (/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/techfloor,/area/maintenance/thirddeck/foreport)
"gN" = (/obj/structure/closet/athletic_mixed,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/head)
"gO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/head)
"gP" = (/obj/effect/floor_decal/techfloor{dir = 4; icon_state = "techfloor_edges"},/obj/item/modular_computer/telescreen/preset/engineering{pixel_y = 32},/turf/simulated/floor/tiled/techfloor/grid,/area/engineering/hardstorage)
"gQ" = (/obj/structure/railing/mapped{dir = 1; icon_state = "railing0-1"},/obj/structure/railing/mapped{dir = 8; icon_state = "railing0-1"},/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/thirddeck/foreport)
Expand Down Expand Up @@ -1951,7 +1952,6 @@
"TW" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/camera/network/third_deck{c_tag = "Mess Hall - Galley"; dir = 4},/obj/machinery/cooker/cereal,/turf/simulated/floor/tiled/white,/area/crew_quarters/galley)
"TX" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/green/mono,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/monotile,/area/hydroponics)
"TY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/camera/network/third_deck{c_tag = "Chapel - Chaplain's Office"; dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/office)
"TZ" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/head)
"Ub" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/closet/medical_wall/filled{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/cryo)
"Uc" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window{base_state = "right"; dir = 2; icon_state = "right"; name = "Core Modules"},/obj/item/aiModule/freeform,/obj/item/aiModule/corp,/obj/item/aiModule/solgov_aggressive,/obj/item/aiModule/robocop,/obj/item/aiModule/paladin,/obj/item/aiModule/asimov,/turf/simulated/floor/tiled/dark,/area/turret_protected/ai_upload)
"Ud" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 6; icon_state = "intact"},/turf/simulated/floor/reinforced/oxygen,/area/thruster/d3starboard)
Expand Down Expand Up @@ -2304,7 +2304,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqx
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqxFnYrmNYrZLyuZLmLYrZXyHtswIwJCbwLwMwNwOwPwQoQWDwRqLsNfCgFrbuMKSphqEqFqXuMrothtYrouMCZEXvWvSvTvUvVykFdeEuUeEfzYKYKYKYKYKflwfTsxgwlPrxSwlsWxlwlOgxoxusHCQviRGxsxtMjxsxtxxOLxyxyOGTETEqZMMaImvSOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqxYBYrYrYrmNYrYrYrYrZXyHxIxJpqVbxMxNIQUoxPxQuNXXxRxTipiILCxXuMvAvOwbwcweuMPBFCxcxeuMybycydyeyfyfygfmFdYKTtYKYKYKYKMXinfDuUwfTssQwlbfxSwlfuypwlyqxpXFTLytNIRGyvywuqyvywxxXUyByCNmTETEJUjZaIaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqxDinpIXKZyGPHzzyIZnzByHmjtRmjyNyPyNyNyNyOyNezBmBmBmBnjhBmzSuMQxmbxjxwxDuMxKxLzczmuMyUyVyWyXyYyYyZPJfSgKfVfWgrgKgKgLIxfDuUwfBSZzwlOFNfjmfxYQwlYnYnYnYnYnYnRGzrzsMjzutNTETETYBRXahqTEJUjZaIaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiDivtyHyHyHyHyHyHyHyHKdPcEUyNzLOCzHzIzJyNAiBmjNNYRAjPBmABuMuMuMuMBquMuMADAFBhBpuMDaEXvWvSvTvUvVzVFduUFquUuUTZLLhjinhpuUwfEzANANbgzYPAMNANANErvowKdJwHyrRGCLAgXYlQlQlQRmJRReLIVBTEJUjZjZaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiDivtyHyHyHyHyHyHyHyHKdPcEUyNzLOCzHzIzJyNAiBmjNNYRAjPBmABuMuMuMuMBquMuMADAFBhBpuMDaEXvWvSvTvUvVzVFduUFquUuUgNLLhjinhpuUwfEzANANbgzYPAMNANANErvowKdJwHyrRGCLAgXYlQlQlQRmJRReLIVBTEJUjZjZaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQwQwBVBVBVCFYcYclPWXSXZkPcZkyNgqXHAtAtAuyNAiBmjRxVxVjSBmBrBvYbUruMDBCouMuMCzuMuMuMEtEXvWvSvTvUvVAEFdBHgOREhLhLhPiyhPhLhLwfLKANzEAIHuAKALAMANXBAPRRLQmBKeRGAVAWWAAWyzAgRGRGRGTEEjTEJUjZjZaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQwQwBVBVBVCFLSoOYkUFMoMoOkBDyNXcBjBiMGBkyNAiBmlKNYNYksBmBmQzEvGtGwRXGyGAHoHpICKOFWGxGZvWvSvTvUvVBwFdiBiDAGhLiFiViZjljphLwfOOANBzBAZiBKBKBLANiCASAQUwDAIvrEBOBNZWBPLMAgAgRGNzTEBUTEJUjZjZjZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBVBVBVBVBWCFzDTTSFWlnYMFPzUtyNCgCfCcCcCeyNAiBmPEtGkPlvBmBmBmKYuMuMCnLBLRLVLWLVMauMXRPwvWvSvTvUvVCtFdjsjuByhLjOkekfkgkhhLwfDvANTVnuCvCwCxCyANYnDuYnYnYnYnRGCICJBFCJSWAgAgNZFlTECNTESDjZjZjZjZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Expand Down