diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 83e159b832d4..102388c501da 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -21450,7 +21450,7 @@ req_access = null }, /obj/item/clothing/head/towel/orange, -/obj/item/clothing/under/towel_long/orange, +/obj/item/clothing/under/towel/long/orange, /obj/item/megaphone{ pixel_y = 5; color = "#ffea2e" diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index c287a36fec6f..0435a0d79c57 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -53624,7 +53624,7 @@ pixel_x = -8; id = "CMO_Bed" }, -/obj/item/clothing/under/towel_long_alt/cyan{ +/obj/item/clothing/under/towel/long/alt/cyan{ pixel_y = -5; pixel_x = -7 }, @@ -61173,18 +61173,18 @@ dir = 1 }, /obj/structure/table, -/obj/item/clothing/under/towel_long_alt/red{ +/obj/item/clothing/under/towel/long/alt/red{ pixel_x = -8; pixel_y = -5 }, -/obj/item/clothing/under/towel_long/red{ +/obj/item/clothing/under/towel/long/red{ pixel_x = -8 }, -/obj/item/clothing/under/towel_short_alt/red{ +/obj/item/clothing/under/towel/short/alt/red{ pixel_x = 8; pixel_y = -8 }, -/obj/item/clothing/under/towel_short/red{ +/obj/item/clothing/under/towel/short/red{ pixel_x = 8; pixel_y = -3 }, @@ -65122,7 +65122,7 @@ pixel_y = 14 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/clothing/under/towel_long/blue, +/obj/item/clothing/under/towel/long/blue, /obj/item/clothing/head/towel/blue, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -69242,7 +69242,7 @@ /obj/machinery/door_control/shutter/west{ id = "hos_secure_doors" }, -/obj/item/clothing/under/towel_long_alt/red, +/obj/item/clothing/under/towel/long/alt/red, /obj/item/clothing/head/towel/red, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -80297,7 +80297,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/clothing/under/towel_long_alt/blue{ +/obj/item/clothing/under/towel/long/alt/blue{ pixel_y = -5 }, /obj/item/clothing/head/towel/blue{ @@ -92305,11 +92305,11 @@ "uCJ" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/clothing/under/towel_short_alt{ +/obj/item/clothing/under/towel/short/alt{ pixel_x = 5; pixel_y = 5 }, -/obj/item/clothing/under/towel_short{ +/obj/item/clothing/under/towel/short{ pixel_y = 10; pixel_x = 5 }, @@ -97789,11 +97789,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "wEb" = ( -/obj/item/clothing/under/towel_long{ +/obj/item/clothing/under/towel/long{ pixel_x = -5; pixel_y = 5 }, -/obj/item/clothing/under/towel_long_alt{ +/obj/item/clothing/under/towel/long/alt{ pixel_y = 10; pixel_x = -5 }, diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index 87e64224d785..1e1093818e5a 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -6978,7 +6978,7 @@ req_one_access_txt = "19"; pixel_x = -8 }, -/obj/item/clothing/under/towel_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) @@ -12647,7 +12647,7 @@ /obj/structure/mirror{ pixel_x = 26 }, -/obj/item/clothing/under/towel_long_alt/cyan, +/obj/item/clothing/under/towel/long/alt/cyan, /obj/item/clothing/head/towel/cyan, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -23099,7 +23099,7 @@ "bQm" = ( /obj/structure/dresser, /obj/machinery/status_display/directional/north, -/obj/item/clothing/under/towel_long_alt/orange, +/obj/item/clothing/under/towel/long/alt/orange, /obj/item/clothing/head/towel/orange{ pixel_y = 7 }, @@ -27126,7 +27126,7 @@ /area/station/command/office/captain/bedroom) "cea" = ( /obj/structure/dresser, -/obj/item/clothing/under/towel_long_alt/blue, +/obj/item/clothing/under/towel/long/alt/blue, /obj/item/clothing/head/towel/blue{ pixel_y = 7 }, @@ -33632,8 +33632,8 @@ }, /obj/machinery/alarm/directional/east, /obj/structure/table, -/obj/item/clothing/under/towel_long_alt, -/obj/item/clothing/under/towel_long{ +/obj/item/clothing/under/towel/long/alt, +/obj/item/clothing/under/towel/long{ pixel_y = 7 }, /obj/item/clothing/head/towel{ @@ -41595,7 +41595,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/clothing/under/towel_long_alt/purple, +/obj/item/clothing/under/towel/long/alt/purple, /obj/item/clothing/head/towel/purple{ pixel_y = 7 }, @@ -47050,7 +47050,7 @@ "dUJ" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/dresser, -/obj/item/clothing/under/towel_short_alt/green, +/obj/item/clothing/under/towel/short/alt/green, /obj/item/clothing/head/towel/green{ pixel_y = 7 }, @@ -61413,7 +61413,7 @@ /obj/machinery/light/directional/north, /obj/machinery/light_switch/east, /obj/structure/dresser, -/obj/item/clothing/under/towel_short_alt/blue, +/obj/item/clothing/under/towel/short/alt/blue, /obj/item/clothing/head/towel/blue{ pixel_y = 7 }, @@ -67136,11 +67136,11 @@ }, /obj/machinery/firealarm/directional/west, /obj/structure/table, -/obj/item/clothing/under/towel_short_alt, -/obj/item/clothing/under/towel_short{ +/obj/item/clothing/under/towel/short/alt, +/obj/item/clothing/under/towel/short{ pixel_y = 7 }, -/obj/item/clothing/under/towel_short{ +/obj/item/clothing/under/towel/short{ pixel_y = 7 }, /obj/item/clothing/head/towel{ @@ -93657,7 +93657,7 @@ "sjM" = ( /obj/structure/dresser, /obj/machinery/light_switch/north, -/obj/item/clothing/under/towel_long_alt/red, +/obj/item/clothing/under/towel/long/alt/red, /obj/item/clothing/head/towel/red{ pixel_y = 7 }, diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 991fe3fd652a..24f731384ed3 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -17175,7 +17175,7 @@ /obj/machinery/light_switch/east{ pixel_y = -6 }, -/obj/item/clothing/under/towel_long_alt/blue{ +/obj/item/clothing/under/towel/long/alt/blue{ pixel_y = -5 }, /obj/item/clothing/head/towel/blue{ @@ -23169,11 +23169,11 @@ "bEr" = ( /obj/structure/dresser, /obj/structure/sign/poster/official/random/south, -/obj/item/clothing/under/towel_long{ +/obj/item/clothing/under/towel/long{ pixel_x = -7; pixel_y = -3 }, -/obj/item/clothing/under/towel_short{ +/obj/item/clothing/under/towel/short{ pixel_x = 8; pixel_y = -5 }, @@ -57273,7 +57273,7 @@ /obj/structure/dresser, /obj/machinery/light/small/directional/north, /obj/machinery/newscaster/directional/north, -/obj/item/clothing/under/towel_long/green{ +/obj/item/clothing/under/towel/long/green{ pixel_y = -5 }, /obj/item/clothing/head/towel/green{ diff --git a/modular_ss220/clothing/_clothing.dm b/modular_ss220/clothing/_clothing.dm index 7480dacd0d4f..d6e8b24db3df 100644 --- a/modular_ss220/clothing/_clothing.dm +++ b/modular_ss220/clothing/_clothing.dm @@ -6,5 +6,5 @@ /datum/modpack/clothing/initialize() . = ..() GLOB.cloth_recipes += list( - new /datum/stack_recipe("полотенце", /obj/item/clothing/under/towel_long, 4, time = 1 SECONDS) + new /datum/stack_recipe("полотенце", /obj/item/clothing/under/towel/long, 4, time = 1 SECONDS) ) diff --git a/modular_ss220/clothing/code/hats.dm b/modular_ss220/clothing/code/hats.dm index bb54225bdd62..fa24b469073d 100644 --- a/modular_ss220/clothing/code/hats.dm +++ b/modular_ss220/clothing/code/hats.dm @@ -95,6 +95,18 @@ "Nucleation" = 'modular_ss220/clothing/icons/mob/hats.dmi', ) +/obj/item/clothing/head/towel/attackby(obj/item/S, mob/user, params) + . = ..() + if(istype(S, /obj/item/toy/crayon/spraycan)) + var/obj/item/toy/crayon/spraycan/spcan = S + var/list/hsl = rgb2hsl(hex2num(copytext(spcan.colour, 2, 4)), hex2num(copytext(spcan.colour, 4, 6)), hex2num(copytext(spcan.colour, 6, 8))) + hsl[3] = max(hsl[3], 0.4) + var/list/rgb = hsl2rgb(arglist(hsl)) + var/new_color = "#[num2hex(rgb[1], 2)][num2hex(rgb[2], 2)][num2hex(rgb[3], 2)]" + color = new_color + to_chat(user, "Вы перекрашиваете [src.name].") + return + /obj/item/clothing/head/towel/red name = "красная шапочка из полотенца" color = "#EE204D" diff --git a/modular_ss220/clothing/code/under.dm b/modular_ss220/clothing/code/under.dm index ab8d3bece75c..81f74fe12210 100644 --- a/modular_ss220/clothing/code/under.dm +++ b/modular_ss220/clothing/code/under.dm @@ -267,15 +267,8 @@ "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', ) -/obj/item/clothing/under/towel_long - name = "полотенце" - desc = "Полотенце, сотканное из синтетической ткани. Можно обмотать вокруг тела." +/obj/item/clothing/under/towel icon = 'modular_ss220/clothing/icons/object/under.dmi' - icon_state = "towel_long" - item_color = "towel_long" - has_sensor = 0 - lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' - righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' sprite_sheets = list( "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi', @@ -298,211 +291,158 @@ "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi', "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi' ) + lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' + righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' + has_sensor = 0 + +/obj/item/clothing/under/towel/attackby(obj/item/S, mob/user, params) + . = ..() + if(istype(S, /obj/item/toy/crayon/spraycan)) + var/obj/item/toy/crayon/spraycan/spcan = S + var/list/hsl = rgb2hsl(hex2num(copytext(spcan.colour, 2, 4)), hex2num(copytext(spcan.colour, 4, 6)), hex2num(copytext(spcan.colour, 6, 8))) + hsl[3] = max(hsl[3], 0.4) + var/list/rgb = hsl2rgb(arglist(hsl)) + var/new_color = "#[num2hex(rgb[1], 2)][num2hex(rgb[2], 2)][num2hex(rgb[3], 2)]" + color = new_color + to_chat(user, "Вы перекрашиваете [src.name].") + return + +/obj/item/clothing/under/towel/long + name = "полотенце" + desc = "Полотенце, сотканное из синтетической ткани. Можно обмотать вокруг тела." + icon_state = "towel_long" + item_color = "towel_long" -/obj/item/clothing/under/towel_long_alt +/obj/item/clothing/under/towel/long/alt name = "махровое полотенце" desc = "Полотенце, сотканное из синтетической ткани, на взгляд шершавое. Можно обмотать вокруг тела." - icon = 'modular_ss220/clothing/icons/object/under.dmi' icon_state = "towel_long_alt" item_color = "towel_long_alt" - has_sensor = 0 - lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' - righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' - sprite_sheets = list( - "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Kidan" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Plasmaman" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi', - "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', - "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/under.dmi', - "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', - "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/under.dmi', - "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Adbuctor" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi', - ) -/obj/item/clothing/under/towel_short +/obj/item/clothing/under/towel/short name = "маленькое полотенце" desc = "Полотенце, сотканное из синтетической ткани, но маленькое. Можно обмотать вокруг тела." - icon = 'modular_ss220/clothing/icons/object/under.dmi' icon_state = "towel_short" item_color = "towel_short" - has_sensor = 0 - sprite_sheets = list( - "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Kidan" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Plasmaman" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi', - "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', - "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/under.dmi', - "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', - "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/under.dmi', - "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Adbuctor" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi', - ) -/obj/item/clothing/under/towel_short_alt +/obj/item/clothing/under/towel/short/alt name = "маленькое махровое полотенце" desc = "Полотенце, сотканное из синтетической ткани, на взгляд шершавое и маленькое. Можно обмотать вокруг тела." - icon = 'modular_ss220/clothing/icons/object/under.dmi' icon_state = "towel_short_alt" item_color = "towel_short_alt" - has_sensor = 0 - sprite_sheets = list( - "Human" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Kidan" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Plasmaman" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi', - "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', - "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/under.dmi', - "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', - "Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/under.dmi', - "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Adbuctor" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi', - "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi', - ) // Длинное полотенце -/obj/item/clothing/under/towel_long/red +/obj/item/clothing/under/towel/long/red name = "красное полотенце" color = "#EE204D" -/obj/item/clothing/under/towel_long/green +/obj/item/clothing/under/towel/long/green name = "зелёное полотенце" color = "#32CD32" -/obj/item/clothing/under/towel_long/blue +/obj/item/clothing/under/towel/long/blue name = "синее полотенце" color = "#1E90FF" -/obj/item/clothing/under/towel_long/orange +/obj/item/clothing/under/towel/long/orange name = "оранжевое полотенце" color = "#FFA500" -/obj/item/clothing/under/towel_long/purple +/obj/item/clothing/under/towel/long/purple name = "фиолетовое полотенце" color = "#DA70D6" -/obj/item/clothing/under/towel_long/cyan +/obj/item/clothing/under/towel/long/cyan name = "голубое полотенце" color = "#40E0D0" -/obj/item/clothing/under/towel_long/brown +/obj/item/clothing/under/towel/long/brown name = "коричневое полотенце" color = "#DEB887" // Длинное махровое полотенце -/obj/item/clothing/under/towel_long_alt/red +/obj/item/clothing/under/towel/long/alt/red name = "красное махровое полотенце" color = "#EE204D" -/obj/item/clothing/under/towel_long_alt/green +/obj/item/clothing/under/towel/long/alt/green name = "зелёное махровое полотенце" color = "#32CD32" -/obj/item/clothing/under/towel_long_alt/blue +/obj/item/clothing/under/towel/long/alt/blue name = "синее махровое полотенце" color = "#1E90FF" -/obj/item/clothing/under/towel_long_alt/orange +/obj/item/clothing/under/towel/long/alt/orange name = "оранжевое махровое полотенце" color = "#FFA500" -/obj/item/clothing/under/towel_long_alt/purple +/obj/item/clothing/under/towel/long/alt/purple name = "фиолетовое махровое полотенце" color = "#DA70D6" -/obj/item/clothing/under/towel_long_alt/cyan +/obj/item/clothing/under/towel/long/alt/cyan name = "голубое махровое полотенце" color = "#40E0D0" -/obj/item/clothing/under/towel_long_alt/brown +/obj/item/clothing/under/towel/long/alt/brown name = "коричневое махровое полотенце" color = "#DEB887" // Маленькое полотенце -/obj/item/clothing/under/towel_short/red +/obj/item/clothing/under/towel/short/red name = "красное маленькое полотенце" color = "#EE204D" -/obj/item/clothing/under/towel_short/green +/obj/item/clothing/under/towel/short/green name = "зелёное маленькое полотенце" color = "#32CD32" -/obj/item/clothing/under/towel_short/blue +/obj/item/clothing/under/towel/short/blue name = "синее маленькое полотенце" color = "#1E90FF" -/obj/item/clothing/under/towel_short/orange +/obj/item/clothing/under/towel/short/orange name = "оранжевое маленькое полотенце" color = "#FFA500" -/obj/item/clothing/under/towel_short/purple +/obj/item/clothing/under/towel/short/purple name = "фиолетовое маленькое полотенце" color = "#DA70D6" -/obj/item/clothing/under/towel_short/cyan +/obj/item/clothing/under/towel/short/cyan name = "голубое маленькое полотенце" color = "#40E0D0" -/obj/item/clothing/under/towel_short/brown +/obj/item/clothing/under/towel/short/brown name = "коричневое маленькое полотенце" color = "#DEB887" // Маленькое махровое полотенце -/obj/item/clothing/under/towel_short_alt/red +/obj/item/clothing/under/towel/short/alt/red name = "красное махровое маленькое полотенце" color = "#EE204D" -/obj/item/clothing/under/towel_short_alt/green +/obj/item/clothing/under/towel/short/alt/green name = "зелёное махровое маленькое полотенце" color = "#32CD32" -/obj/item/clothing/under/towel_short_alt/blue +/obj/item/clothing/under/towel/short/alt/blue name = "синее махровое маленькое полотенце" color = "#1E90FF" -/obj/item/clothing/under/towel_short_alt/orange +/obj/item/clothing/under/towel/short/alt/orange name = "оранжевое махровое маленькое полотенце" color = "#FFA500" -/obj/item/clothing/under/towel_short_alt/purple +/obj/item/clothing/under/towel/short/alt/purple name = "фиолетовое махровое маленькое полотенце" color = "#DA70D6" -/obj/item/clothing/under/towel_short_alt/cyan +/obj/item/clothing/under/towel/short/alt/cyan name = "голубое махровое маленькое полотенце" color = "#40E0D0" -/obj/item/clothing/under/towel_short_alt/brown +/obj/item/clothing/under/towel/short/alt/brown name = "коричневое махровое маленькое полотенце" color = "#DEB887"