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.

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

[TWEAK] Покраска полотенец балончиками и рефактор кода небольшой #1246

Merged
merged 6 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Ещё один небольшой рефактор
  • Loading branch information
Chorden523 committed May 23, 2024
commit 8f5d10f115157c9d6578b8b30a935bea980dd566
2 changes: 1 addition & 1 deletion _maps/map_files220/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -21450,7 +21450,7 @@
req_access = null
},
/obj/item/clothing/head/towel/orange,
/obj/item/clothing/under/towel/body/long/orange,
/obj/item/clothing/under/towel/long/orange,
/obj/item/megaphone{
pixel_y = 5;
color = "#ffea2e"
Expand Down
24 changes: 12 additions & 12 deletions _maps/map_files220/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -53552,7 +53552,7 @@
pixel_x = -8;
id = "CMO_Bed"
},
/obj/item/clothing/under/towel/body/long/alt/cyan{
/obj/item/clothing/under/towel/long/alt/cyan{
pixel_y = -5;
pixel_x = -7
},
Expand Down Expand Up @@ -61083,18 +61083,18 @@
dir = 1
},
/obj/structure/table,
/obj/item/clothing/under/towel/body/long/alt/red{
/obj/item/clothing/under/towel/long/alt/red{
pixel_x = -8;
pixel_y = -5
},
/obj/item/clothing/under/towel/body/long/red{
/obj/item/clothing/under/towel/long/red{
pixel_x = -8
},
/obj/item/clothing/under/towel/body/short/alt/red{
/obj/item/clothing/under/towel/short/alt/red{
pixel_x = 8;
pixel_y = -8
},
/obj/item/clothing/under/towel/body/short/red{
/obj/item/clothing/under/towel/short/red{
pixel_x = 8;
pixel_y = -3
},
Expand Down Expand Up @@ -65025,7 +65025,7 @@
pixel_y = 14
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/clothing/under/towel/body/long/blue,
/obj/item/clothing/under/towel/long/blue,
/obj/item/clothing/head/towel/blue,
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
Expand Down Expand Up @@ -69132,7 +69132,7 @@
/obj/machinery/door_control/shutter/west{
id = "hos_secure_doors"
},
/obj/item/clothing/under/towel/body/long/alt/red,
/obj/item/clothing/under/towel/long/alt/red,
/obj/item/clothing/head/towel/red,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
Expand Down Expand Up @@ -80134,7 +80134,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/item/clothing/under/towel/body/long/alt/blue{
/obj/item/clothing/under/towel/long/alt/blue{
pixel_y = -5
},
/obj/item/clothing/head/towel/blue{
Expand Down Expand Up @@ -92132,11 +92132,11 @@
"uCJ" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/item/clothing/under/towel/body/short/alt{
/obj/item/clothing/under/towel/short/alt{
pixel_x = 5;
pixel_y = 5
},
/obj/item/clothing/under/towel/body/short{
/obj/item/clothing/under/towel/short{
pixel_y = 10;
pixel_x = 5
},
Expand Down Expand Up @@ -97572,11 +97572,11 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/west)
"wEb" = (
/obj/item/clothing/under/towel/body/long{
/obj/item/clothing/under/towel/long{
pixel_x = -5;
pixel_y = 5
},
/obj/item/clothing/under/towel/body/long/alt{
/obj/item/clothing/under/towel/long/alt{
pixel_y = 10;
pixel_x = -5
},
Expand Down
26 changes: 13 additions & 13 deletions _maps/map_files220/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6978,7 +6978,7 @@
req_one_access_txt = "19";
pixel_x = -8
},
/obj/item/clothing/under/towel/body/long/alt/brown,
/obj/item/clothing/under/towel/long/alt/brown,
/obj/item/clothing/head/towel/brown,
/turf/simulated/floor/carpet/orange,
/area/station/supply/qm)
Expand Down Expand Up @@ -12651,7 +12651,7 @@
/obj/structure/mirror{
pixel_x = 26
},
/obj/item/clothing/under/towel/body/long/alt/cyan,
/obj/item/clothing/under/towel/long/alt/cyan,
/obj/item/clothing/head/towel/cyan,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -23103,7 +23103,7 @@
"bQm" = (
/obj/structure/dresser,
/obj/machinery/status_display/directional/north,
/obj/item/clothing/under/towel/body/long/alt/orange,
/obj/item/clothing/under/towel/long/alt/orange,
/obj/item/clothing/head/towel/orange{
pixel_y = 7
},
Expand Down Expand Up @@ -27130,7 +27130,7 @@
/area/station/command/office/captain/bedroom)
"cea" = (
/obj/structure/dresser,
/obj/item/clothing/under/towel/body/long/alt/blue,
/obj/item/clothing/under/towel/long/alt/blue,
/obj/item/clothing/head/towel/blue{
pixel_y = 7
},
Expand Down Expand Up @@ -33676,8 +33676,8 @@
},
/obj/machinery/alarm/directional/east,
/obj/structure/table,
/obj/item/clothing/under/towel/body/long/alt,
/obj/item/clothing/under/towel/body/long{
/obj/item/clothing/under/towel/long/alt,
/obj/item/clothing/under/towel/long{
pixel_y = 7
},
/obj/item/clothing/head/towel{
Expand Down Expand Up @@ -41636,7 +41636,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/item/clothing/under/towel/body/long/alt/purple,
/obj/item/clothing/under/towel/long/alt/purple,
/obj/item/clothing/head/towel/purple{
pixel_y = 7
},
Expand Down Expand Up @@ -47088,7 +47088,7 @@
"dUJ" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/dresser,
/obj/item/clothing/under/towel/body/short/alt/green,
/obj/item/clothing/under/towel/short/alt/green,
/obj/item/clothing/head/towel/green{
pixel_y = 7
},
Expand Down Expand Up @@ -61443,7 +61443,7 @@
/obj/machinery/light/directional/north,
/obj/machinery/light_switch/east,
/obj/structure/dresser,
/obj/item/clothing/under/towel/body/short/alt/blue,
/obj/item/clothing/under/towel/short/alt/blue,
/obj/item/clothing/head/towel/blue{
pixel_y = 7
},
Expand Down Expand Up @@ -67166,11 +67166,11 @@
},
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/item/clothing/under/towel/body/short/alt,
/obj/item/clothing/under/towel/body/short{
/obj/item/clothing/under/towel/short/alt,
/obj/item/clothing/under/towel/short{
pixel_y = 7
},
/obj/item/clothing/under/towel/body/short{
/obj/item/clothing/under/towel/short{
pixel_y = 7
},
/obj/item/clothing/head/towel{
Expand Down Expand Up @@ -93677,7 +93677,7 @@
"sjM" = (
/obj/structure/dresser,
/obj/machinery/light_switch/north,
/obj/item/clothing/under/towel/body/long/alt/red,
/obj/item/clothing/under/towel/long/alt/red,
/obj/item/clothing/head/towel/red{
pixel_y = 7
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files220/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17169,7 +17169,7 @@
/obj/machinery/light_switch/east{
pixel_y = -6
},
/obj/item/clothing/under/towel/body/long/alt/blue{
/obj/item/clothing/under/towel/long/alt/blue{
pixel_y = -5
},
/obj/item/clothing/head/towel/blue{
Expand Down Expand Up @@ -23163,11 +23163,11 @@
"bEr" = (
/obj/structure/dresser,
/obj/structure/sign/poster/official/random/south,
/obj/item/clothing/under/towel/body/long{
/obj/item/clothing/under/towel/long{
pixel_x = -7;
pixel_y = -3
},
/obj/item/clothing/under/towel/body/short{
/obj/item/clothing/under/towel/short{
pixel_x = 8;
pixel_y = -5
},
Expand Down Expand Up @@ -57354,7 +57354,7 @@
/obj/structure/dresser,
/obj/machinery/light/small/directional/north,
/obj/machinery/newscaster/directional/north,
/obj/item/clothing/under/towel/body/long/green{
/obj/item/clothing/under/towel/long/green{
pixel_y = -5
},
/obj/item/clothing/head/towel/green{
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/clothing/_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
/datum/modpack/clothing/initialize()
. = ..()
GLOB.cloth_recipes += list(
new /datum/stack_recipe("полотенце", /obj/item/clothing/under/towel/body/long, 4, time = 1 SECONDS)
new /datum/stack_recipe("полотенце", /obj/item/clothing/under/towel/long, 4, time = 1 SECONDS)
)
Loading
Loading