From a20f17241f09995d58186ff0bdc8e4258311a20d Mon Sep 17 00:00:00 2001 From: FatFatFat1 <48385210+FatFatFat1@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:39:04 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?= =?UTF-8?q?=D0=BF=D1=83=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../character_menu/loadout/loadout_hats.dm | 2 +- code/modules/holidays/new_year/clothing.dm | 5 +-- maps/centcom/centcom.dmm | 31 ++++++------------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/code/modules/client/character_menu/loadout/loadout_hats.dm b/code/modules/client/character_menu/loadout/loadout_hats.dm index 62b87da97bd1..52746fd13760 100644 --- a/code/modules/client/character_menu/loadout/loadout_hats.dm +++ b/code/modules/client/character_menu/loadout/loadout_hats.dm @@ -109,5 +109,5 @@ ..() var/hats = list() hats["blue"] = /obj/item/clothing/head/pluvia - hats["white"] = /obj/item/clothing/head/wpluvia + hats["white"] = /obj/item/clothing/head/pluvia/white gear_tweaks += new/datum/gear_tweak/path(hats) diff --git a/code/modules/holidays/new_year/clothing.dm b/code/modules/holidays/new_year/clothing.dm index 919004aaf9c8..7c47ab689fe2 100644 --- a/code/modules/holidays/new_year/clothing.dm +++ b/code/modules/holidays/new_year/clothing.dm @@ -211,12 +211,9 @@ item_state = "pluvia_hat" flags = HEADCOVERSEYES -/obj/item/clothing/head/wpluvia - name = "pluvia non la" - desc = "Prepare to heavy rain" +/obj/item/clothing/head/pluvia/white icon_state = "wpluvia_hat" item_state = "wpluvia_hat" - flags = HEADCOVERSEYES /obj/item/clothing/head/ricehat name = "non la" diff --git a/maps/centcom/centcom.dmm b/maps/centcom/centcom.dmm index 29128a19cb6e..33b1b14cfb0a 100644 --- a/maps/centcom/centcom.dmm +++ b/maps/centcom/centcom.dmm @@ -25566,16 +25566,12 @@ /turf/unsimulated/floor, /area/velocity) "fRY" = ( -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, /obj/structure/rack, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, /turf/simulated/floor, /area/space) "fSb" = ( @@ -31723,18 +31719,11 @@ /obj/item/clothing/head/pluvia, /obj/item/clothing/head/pluvia, /obj/item/clothing/head/pluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, -/obj/item/clothing/head/wpluvia, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, +/obj/item/clothing/head/pluvia/white, /turf/unsimulated/floor/carpet/blue2, /area/space) "tCc" = (