ratge

modular_ss220/clothing/_clothing.dme

@@ -9,4 +9,4 @@
 #include "code/cloaks.dm"
 #include "code/garment_bag.dm"
 #include "code/hev_suit.dm"
-#include "code/wallets.dm"
+#include "code/hats.dm"

modular_ss220/clothing/code/gloves.dm

@@ -4,4 +4,3 @@
 	icon = 'modular_ss220/clothing/icons/object/gloves.dmi'
 	icon_state = "bike_gloves"
 	icon_override = 'modular_ss220/clothing/icons/mob/hands.dmi'
-	item_state = "bike_gloves"

modular_ss220/clothing/code/hats.dm

@@ -0,0 +1,40 @@
+/obj/machinery/economy/vending/autodrobe/Initialize(mapload)
+	products += list(
+		/obj/item/clothing/head/ratge = 1,
+		)
+	prices += list(
+		/obj/item/clothing/head/ratge = 75,
+		)
+	. = ..()
+
+/obj/item/clothing/head/ratge
+	name = "ratge head"
+	desc = "Ну ты и крыса!"
+	icon = 'modular_ss220/clothing/icons/object/hats.dmi'
+	icon_state = "ratgehead"
+	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+	flags = BLOCKHAIR
+	flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE
+	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	sprite_sheets = list(
+		"Abductor" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Ancient Skeleton" 	= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Diona" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Drask" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Golem" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Grey" 				= 	'modular_ss220/clothing/icons/mob/species/grey/hats.dmi',
+		"Human" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Kidan" 			= 	'modular_ss220/clothing/icons/mob/species/kidan/hats.dmi',
+		"Machine"			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Monkey" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Nian" 				= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Plasmaman" 		= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Shadow" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Skrell" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Slime People" 		= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Tajaran" 			= 	'modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi',
+		"Unathi" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Vox" 				= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Vulpkanin" 		= 	'modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi',
+		)

modular_ss220/clothing/code/helmet.dm

@@ -3,8 +3,6 @@
 	desc = "Крутой шлем."
 	icon = 'modular_ss220/clothing/icons/object/hats.dmi'
 	icon_state = "bike_helmet"
-	icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi'
-	item_state = "bike_helmet"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	toggle_message = "Вы опустили защитное стекло"
@@ -14,12 +12,25 @@
 	toggle_sound = 'sound/weapons/tap.ogg'
 	dog_fashion = null
 	sprite_sheets = list(
-		"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi',
-		"Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/helmet.dmi',
-		"Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi',
-		"Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi',
-		"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi',
-		"Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi',
+		"Abductor" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Ancient Skeleton" 	= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Diona" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Drask" 			= 	'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi',
+		"Golem" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Grey" 				= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Human" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Kidan" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Machine"			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Monkey" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Nian" 				= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Plasmaman" 		= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Shadow" 			= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Skrell" 			= 	'modular_ss220/clothing/icons/mob/species/skrell/helmet.dmi',
+		"Slime People" 		= 	'modular_ss220/clothing/icons/mob/hats.dmi',
+		"Tajaran" 			= 	'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi',
+		"Unathi" 			= 	'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi',
+		"Vox" 				= 	'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi',
+		"Vulpkanin" 		= 	'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi',
 		)
 
 /obj/item/clothing/head/helmet/bike_helmet/replica
@@ -32,4 +43,3 @@
 	icon = 'modular_ss220/clothing/icons/object/hats.dmi'
 	icon_state = "cap_beret_black"
 	icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi'
-	item_state = "cap_beret_black"

modular_ss220/clothing/code/hev_suit.dm

@@ -8,7 +8,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "hev"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "hev"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	resistance_flags = FIRE_PROOF | ACID_PROOF | FREEZE_PROOF | STOPSPRESSUREDMAGE

modular_ss220/clothing/code/mask.dm

@@ -60,12 +60,10 @@
 	icon = 'modular_ss220/clothing/icons/object/masks.dmi'
 	icon_state = "red_gas"
 	icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
-	item_state = "red_gas"
 
 /obj/item/clothing/mask/breath/breathscarf
 	name = "шарф с системой дыхания"
 	desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях."
 	icon = 'modular_ss220/clothing/icons/object/masks.dmi'
 	icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
 	icon_state = "breathscarf"
-	item_state = "breathscarf"

modular_ss220/clothing/code/shoes.dm

@@ -7,7 +7,6 @@
 	icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
 	icon_state = "neon"
 	icon_override = 'modular_ss220/clothing/icons/mob/shoes.dmi'
-	item_color = "neon"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	actions_types = list(/datum/action/item_action/toggle_light, /datum/action/item_action/change_color)
@@ -58,11 +57,9 @@
 	icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
 	icon_state = "shark"
 	icon_override = 'modular_ss220/clothing/icons/mob/shoes.dmi'
-	item_state = "shark"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 
 /obj/item/clothing/shoes/shark/light
 	name = "светло-голубые акульи тапочки"
 	icon_state = "shark_light"
-	item_state = "shark_light"

modular_ss220/clothing/code/suits.dm

@@ -4,7 +4,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "v_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "v_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	flags_inv = HIDEJUMPSUIT
@@ -15,7 +14,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "takemura_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "takemura_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	flags_inv = HIDEJUMPSUIT
@@ -26,7 +24,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "katarina_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "katarina_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	flags_inv = HIDEJUMPSUIT
@@ -37,7 +34,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "katarina_cyberjacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "katarina_cyberjacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	flags_inv = HIDEJUMPSUIT
@@ -48,7 +44,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "shark_casual"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "shark_casual"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -63,7 +58,6 @@
 	icon = 'modular_ss220/clothing/icons/object/hats.dmi'
 	icon_state = "shark_casual"
 	icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi'
-	item_state = "shark_casual"
 	body_parts_covered = HEAD
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -73,37 +67,32 @@
 /obj/item/clothing/suit/hooded/shark_costume/light
 	name = "светло-голубой костюм акулы"
 	icon_state = "shark_casual_light"
-	item_state = "shark_casual_light"
 	hoodtype = /obj/item/clothing/head/hooded/shark_hood/light
 
 /obj/item/clothing/head/hooded/shark_hood/light
 	name = "светло-голубой акулий капюшон"
 	icon_state = "shark_casual_light"
-	item_state = "shark_casual_light"
 
 /obj/item/clothing/suit/space/deathsquad/officer/syndie
 	name = "куртка офицера синдиката"
 	desc = "Длинная куртка из высокопрочного волокна."
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "jacket_syndie"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "jacket_syndie"
 
 /obj/item/clothing/suit/space/deathsquad/officer/field
 	name = "полевая форма офицера флота Нанотрейзен"
 	desc = "Парадный плащ, разработанный в качестве массового варианта формы Верховного Главнокомандующего. У этой униформы нет тех же защитных свойств, что и у оригинала, но она все ещё является довольно удобным и стильным предметом гардероба."
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "ntsc_uniform"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "ntsc_uniform"
 
 /obj/item/clothing/suit/hooded/vi_arcane
 	name = "куртка Вай"
 	desc = "Слегка потрёпанный жакет боевой девчушки Вай."
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "vi_arcane"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "vi_arcane"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	flags_inv = HIDEJUMPSUIT
@@ -115,7 +104,6 @@
 	icon = 'modular_ss220/clothing/icons/object/hats.dmi'
 	icon_state = "vi_arcane"
 	icon_override = 'modular_ss220/clothing/icons/mob/hats.dmi'
-	item_state = "vi_arcane"
 	body_parts_covered = HEAD
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -125,21 +113,18 @@
 /obj/item/clothing/suit/hooded/vi_arcane
 	name = "жакет Вай"
 	icon_state = "vi_arcane"
-	item_state = "vi_arcane"
 	hoodtype = /obj/item/clothing/head/hooded/vi_arcane
 
 /obj/item/clothing/head/hooded/vi_arcane
 	name = "капюшон Вай"
 	icon_state = "vi_arcane"
-	item_state = "vi_arcane"
 
 /obj/item/clothing/suit/soundhand_black_jacket
 	name = "черная куртка группы Саундхэнд."
 	desc = "Легендарная черная куртка группы Саундхэнд."
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "soundhand_black_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "soundhand_black_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 
@@ -159,7 +144,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "soundhand_olive_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "soundhand_olive_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 
@@ -179,7 +163,6 @@
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "soundhand_brown_jacket"
 	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-	item_state = "soundhand_brown_jacket"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 

modular_ss220/clothing/code/under.dm

@@ -4,20 +4,16 @@
 	icon = 'modular_ss220/clothing/icons/object/under.dmi'
 	icon_state = "katarina_cybersuit"
 	icon_override = 'modular_ss220/clothing/icons/mob/under.dmi'
-	item_state = "katarina_cybersuit"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	item_color = "katarina_cybersuit"
-	sprite_sheets = null
 
 /obj/item/clothing/under/costume/katarina_suit
 	name = "костюм Катарины"
 	desc = "Костюм так называемой Катарины."
 	icon = 'modular_ss220/clothing/icons/object/under.dmi'
 	icon_state = "katarina_suit"
 	icon_override = 'modular_ss220/clothing/icons/mob/under.dmi'
-	item_state = "katarina_suit"
 	lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
 	righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
 	item_color = "katarina_suit"
-	sprite_sheets = null

modular_ss220/objects/_objects.dme

@@ -19,3 +19,4 @@
 #include "code/key.dm"
 #include "code/musician.dm"
 #include "code/flag.dm"
+#include "code/wallets.dm"

modular_ss220/clothing/code/wallets.dm → modular_ss220/objects/code/wallets.dm

@@ -4,14 +4,14 @@
 /obj/item/storage/wallet/wallet_NT
 	name = "leather wallet NT"
 	desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе."
-	icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
+	icon = 'modular_ss220/objects/icons/wallets.dmi'
 	icon_state = "wallet_NT"
 	photo_overlay = "photo_NT"
 
 /obj/item/storage/wallet/wallet_USSP_1
 	name = "leather wallet USSP"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
-	icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
+	icon = 'modular_ss220/objects/icons/wallets.dmi'
 	icon_state = "wallet_USSP_1"
 	photo_overlay = "photo_USSP"
 	storage_slots = 5
@@ -25,6 +25,6 @@
 /obj/item/storage/wallet/wallet_USSP_2
 	name = "leather wallet USSP"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
-	icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
+	icon = 'modular_ss220/objects/icons/wallets.dmi'
 	icon_state = "wallet_USSP_2"
 	photo_overlay = "photo_USSP"