From ae3487596a3feca8a08b58b99100dc1062be86ce Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Sun, 24 Nov 2024 23:16:08 +0300 Subject: [PATCH 01/12] Merge branch --- .../_failu_skrell_clothes.dm | 8 +- .../code/lists/xenowear.dm | 72 +++--- mods/failu_skrell_clothes/code/suits.dm | 14 +- mods/failu_skrell_clothes/code/uniforms.dm | 244 +++++++++--------- 4 files changed, 169 insertions(+), 169 deletions(-) diff --git a/mods/failu_skrell_clothes/_failu_skrell_clothes.dm b/mods/failu_skrell_clothes/_failu_skrell_clothes.dm index 2429145207f6c..5415f13cbe6c8 100644 --- a/mods/failu_skrell_clothes/_failu_skrell_clothes.dm +++ b/mods/failu_skrell_clothes/_failu_skrell_clothes.dm @@ -1,4 +1,4 @@ -/singleton/modpack/failu_skrell_clothes - name = "Skrell Clothes by Failu" - desc = "Мод добавляет одежду для скреллов всех каст." - author = "KOJIECO" +/singleton/modpack/failu_skrell_clothes + name = "Skrell Clothes by Failu" + desc = "Мод добавляет одежду для скреллов всех каст." + author = "KOJIECO" diff --git a/mods/failu_skrell_clothes/code/lists/xenowear.dm b/mods/failu_skrell_clothes/code/lists/xenowear.dm index 264f192ed0942..b2a7005c8326d 100644 --- a/mods/failu_skrell_clothes/code/lists/xenowear.dm +++ b/mods/failu_skrell_clothes/code/lists/xenowear.dm @@ -1,36 +1,36 @@ -// Alien clothing - -// Skrell clothing - -// Коммент от Колеса: если по какой-то причине у вас не отображается вещь в нужной вкладке лодаута, почекайте -// её в других вкладках. Если отображается не там, где нужно, поищите в коркоде определенные флаги сортировки. -// У меня например пришлось брать из коркода sort_category = "Xenowear" -/datum/gear/suit/skrell_robe - display_name = "(Skrell) Skrellian robe" - path = /obj/item/clothing/suit/skrell_robe - sort_category = "Xenowear" - cost = 1 - slot = slot_wear_suit - -/datum/gear/suit/skrell_clothes - display_name = "(Skrell) Skrell clothes selection" - path = /obj/item/clothing/under/ - sort_category = "Xenowear" - -/datum/gear/suit/skrell_clothes/New() - ..() - var/skrell_clothes = list() - skrell_clothes["Talum-Katish blue dress"] = /obj/item/clothing/under/uniform/skrell_talum_bluedress - skrell_clothes["Talum-Katish green waist cloak"] = /obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak - skrell_clothes["Raskinta-Katish navy clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_navyclothes - skrell_clothes["Malish-Katish blue office suit"] = /obj/item/clothing/under/uniform/skrell_malish_officesuit - skrell_clothes["Talum-Katish white and red dress"] = /obj/item/clothing/under/uniform/skrell_talum_whitereddress - skrell_clothes["Malish-Katish office suit with tie"] = /obj/item/clothing/under/uniform/skrell_malish_greentiedsuit - skrell_clothes["Kanin-Katish sand-blue turtleneck"] = /obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck - skrell_clothes["Kanin-Katish orange-cyan uniform"] = /obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform - skrell_clothes["Kanin-Katish yellow-black costume"] = /obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume - skrell_clothes["Malish-Katish green office suit with suspenders"] = /obj/item/clothing/under/uniform/skrell_malish_greenofficesuit - skrell_clothes["Raskinta-Katish red clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_redclothes - skrell_clothes["Skrellian diving suit"] = /obj/item/clothing/under/uniform/skrell_skrellian_divingsuit - gear_tweaks += new/datum/gear_tweak/path(skrell_clothes) - +// Alien clothing + +// Skrell clothing + +// Коммент от Колеса: если по какой-то причине у вас не отображается вещь в нужной вкладке лодаута, почекайте +// её в других вкладках. Если отображается не там, где нужно, поищите в коркоде определенные флаги сортировки. +// У меня например пришлось брать из коркода sort_category = "Xenowear" +/datum/gear/suit/skrell_robe + display_name = "(Skrell) Skrellian robe" + path = /obj/item/clothing/suit/skrell_robe + sort_category = "Xenowear" + cost = 1 + slot = slot_wear_suit + +/datum/gear/suit/skrell_clothes + display_name = "(Skrell) Skrell clothes selection" + path = /obj/item/clothing/under/ + sort_category = "Xenowear" + +/datum/gear/suit/skrell_clothes/New() + ..() + var/skrell_clothes = list() + skrell_clothes["Talum-Katish blue dress"] = /obj/item/clothing/under/uniform/skrell_talum_bluedress + skrell_clothes["Talum-Katish green waist cloak"] = /obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak + skrell_clothes["Raskinta-Katish navy clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_navyclothes + skrell_clothes["Malish-Katish blue office suit"] = /obj/item/clothing/under/uniform/skrell_malish_officesuit + skrell_clothes["Talum-Katish white and red dress"] = /obj/item/clothing/under/uniform/skrell_talum_whitereddress + skrell_clothes["Malish-Katish office suit with tie"] = /obj/item/clothing/under/uniform/skrell_malish_greentiedsuit + skrell_clothes["Kanin-Katish sand-blue turtleneck"] = /obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck + skrell_clothes["Kanin-Katish orange-cyan uniform"] = /obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform + skrell_clothes["Kanin-Katish yellow-black costume"] = /obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume + skrell_clothes["Malish-Katish green office suit with suspenders"] = /obj/item/clothing/under/uniform/skrell_malish_greenofficesuit + skrell_clothes["Raskinta-Katish red clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_redclothes + skrell_clothes["Skrellian diving suit"] = /obj/item/clothing/under/uniform/skrell_skrellian_divingsuit + gear_tweaks += new/datum/gear_tweak/path(skrell_clothes) + diff --git a/mods/failu_skrell_clothes/code/suits.dm b/mods/failu_skrell_clothes/code/suits.dm index 2bb16a43f6c13..c15e0db6e6a74 100644 --- a/mods/failu_skrell_clothes/code/suits.dm +++ b/mods/failu_skrell_clothes/code/suits.dm @@ -1,7 +1,7 @@ -// Skrell outfits -/obj/item/clothing/suit/skrell_robe - name = "Skrellian robe" - desc = "Skrellian robe, worn by Qerr-Katish." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_skrell_robe.dmi' - item_icons = list(slot_wear_suit_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_skrell_robe.dmi') - icon_state = "skrell_robe" +// Skrell outfits +/obj/item/clothing/suit/skrell_robe + name = "Skrellian robe" + desc = "Skrellian robe, worn by Qerr-Katish." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_skrell_robe.dmi' + item_icons = list(slot_wear_suit_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_skrell_robe.dmi') + icon_state = "skrell_robe" diff --git a/mods/failu_skrell_clothes/code/uniforms.dm b/mods/failu_skrell_clothes/code/uniforms.dm index 3103d8579bf09..7ae3d750a8b76 100644 --- a/mods/failu_skrell_clothes/code/uniforms.dm +++ b/mods/failu_skrell_clothes/code/uniforms.dm @@ -1,122 +1,122 @@ -// Skrell outfits - - -/obj/item/clothing/under/uniform/skrell_talum_bluedress - name = "Talum-Katish blue dress" - desc = "Talum's blue dress, seems luminous, it's light and pleasant to the touch. The dress has a purple cape on the shoulders." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "talum_bluedress_s" - item_state = "talum_bluedress_s" - worn_state = "talum_bluedress" - - -/obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak - name = "Talum-Katish green waist cloak" - desc = "Talum's white-green clothes with the translucent veil at the waist." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "talum_greenwaistcloak_s" - item_state = "talum_greenwaistcloak_s" - worn_state = "talum_greenwaistcloak" - - -/obj/item/clothing/under/uniform/skrell_raskinta_navyclothes - name = "Raskinta-Katish navy clothes" - desc = "Raskinta's navy clothes. Has no Qarr-Morr'Kon markings, and pretty flexible!" - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "raskinta_navyclothes_s" - item_state = "raskinta_navyclothes_s" - worn_state = "raskinta_navyclothes" - - - -/obj/item/clothing/under/uniform/skrell_malish_officesuit - name = "Malish-Katish blue office suit" - desc = "Malish's office suit, light top, dark bottom, and some glowing purple-teal jewelry." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "malish_officesuit_s" - item_state = "malish_officesuit_s" - worn_state = "malish_officesuit" - - -/obj/item/clothing/under/uniform/skrell_talum_whitereddress - name = "Talum-Katish white and red dress" - desc = "Talum's white-red dress. The sparkling red skirt is attached to one of the legs. It looks unusual." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "talum_whitereddress_s" - item_state = "talum_whitereddress_s" - worn_state = "talum_whitereddress" - - - -/obj/item/clothing/under/uniform/skrell_malish_greentiedsuit - name = "Malish-Katish office suit with tie" - desc = "Malish's office suit, light top, green bottom, and a nice-looking green tie that barely touches the neck, made of soft material." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "malish_greentiedsuit_s" - item_state = "malish_greentiedsuit_s" - worn_state = "malish_greentiedsuit" - - -/obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck - name = "Kanin-Katish sand-blue turtleneck" - desc = "Comfortable Kanin's clothing that has padded inserts and cleverly stitched fabric, allowing the wearer's skin to breathe." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "kanin_sandblueturtleneck_s" - item_state = "kanin_sandblueturtleneck_s" - worn_state = "kanin_sandblueturtleneck" - -/obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform - name = "Kanin-Katish orange-cyan uniform" - desc = "Lightweight, breathable uniform designed for work in non-traumatic conditions, providing its owner with ease of movement." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "kanin_orangecyanuniform_s" - item_state = "kanin_orangecyanuniform_s" - worn_state = "kanin_orangecyanuniform" - - -/obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume - name = "Kanin-Katish yellow-black costume" - desc = "Kanin's black and yellow suit is of high quality, the contrast of colors makes a highly qualified employee stand out. White helmet is not included!" - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "kanin_yellowblackcostume_s" - item_state = "kanin_yellowblackcostume_s" - worn_state = "kanin_yellowblackcostume" - -/obj/item/clothing/under/uniform/skrell_malish_greenofficesuit - name = "Malish-Katish green office suit with suspenders" - desc = "Malish's office suit, light top, black bottom, and a fancy lime-green thin veil above the belt." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "malish_greenofficesuit_s" - item_state = "malish_greenofficesuit_s" - worn_state = "malish_greenofficesuit" - - -/obj/item/clothing/under/uniform/skrell_raskinta_redclothes - name = "Raskinta-Katish red clothes" - desc = "Raskinta's red clothes. Has no Qarr-Morr'Kon markings, and pretty flexible!" - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "raskinta_redclothes_s" - item_state = "raskinta_redclothes_s" - worn_state = "raskinta_redclothes" - - -/obj/item/clothing/under/uniform/skrell_skrellian_divingsuit - name = "Skrellian diving suit" - desc = "A highly detailed Skrellian diving suit. Found mainly among the inhabitants of the planets of the Empire." - icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' - item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') - icon_state = "skrellian_divingsuit_s" - item_state = "skrellian_divingsuit_s" - worn_state = "skrellian_divingsuit" - +// Skrell outfits + + +/obj/item/clothing/under/uniform/skrell_talum_bluedress + name = "Talum-Katish blue dress" + desc = "Talum's blue dress, seems luminous, it's light and pleasant to the touch. The dress has a purple cape on the shoulders." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "talum_bluedress_s" + item_state = "talum_bluedress_s" + worn_state = "talum_bluedress" + + +/obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak + name = "Talum-Katish green waist cloak" + desc = "Talum's white-green clothes with the translucent veil at the waist." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "talum_greenwaistcloak_s" + item_state = "talum_greenwaistcloak_s" + worn_state = "talum_greenwaistcloak" + + +/obj/item/clothing/under/uniform/skrell_raskinta_navyclothes + name = "Raskinta-Katish navy clothes" + desc = "Raskinta's navy clothes. Has no Qarr-Morr'Kon markings, and pretty flexible!" + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "raskinta_navyclothes_s" + item_state = "raskinta_navyclothes_s" + worn_state = "raskinta_navyclothes" + + + +/obj/item/clothing/under/uniform/skrell_malish_officesuit + name = "Malish-Katish blue office suit" + desc = "Malish's office suit, light top, dark bottom, and some glowing purple-teal jewelry." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "malish_officesuit_s" + item_state = "malish_officesuit_s" + worn_state = "malish_officesuit" + + +/obj/item/clothing/under/uniform/skrell_talum_whitereddress + name = "Talum-Katish white and red dress" + desc = "Talum's white-red dress. The sparkling red skirt is attached to one of the legs. It looks unusual." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "talum_whitereddress_s" + item_state = "talum_whitereddress_s" + worn_state = "talum_whitereddress" + + + +/obj/item/clothing/under/uniform/skrell_malish_greentiedsuit + name = "Malish-Katish office suit with tie" + desc = "Malish's office suit, light top, green bottom, and a nice-looking green tie that barely touches the neck, made of soft material." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "malish_greentiedsuit_s" + item_state = "malish_greentiedsuit_s" + worn_state = "malish_greentiedsuit" + + +/obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck + name = "Kanin-Katish sand-blue turtleneck" + desc = "Comfortable Kanin's clothing that has padded inserts and cleverly stitched fabric, allowing the wearer's skin to breathe." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "kanin_sandblueturtleneck_s" + item_state = "kanin_sandblueturtleneck_s" + worn_state = "kanin_sandblueturtleneck" + +/obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform + name = "Kanin-Katish orange-cyan uniform" + desc = "Lightweight, breathable uniform designed for work in non-traumatic conditions, providing its owner with ease of movement." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "kanin_orangecyanuniform_s" + item_state = "kanin_orangecyanuniform_s" + worn_state = "kanin_orangecyanuniform" + + +/obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume + name = "Kanin-Katish yellow-black costume" + desc = "Kanin's black and yellow suit is of high quality, the contrast of colors makes a highly qualified employee stand out. White helmet is not included!" + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "kanin_yellowblackcostume_s" + item_state = "kanin_yellowblackcostume_s" + worn_state = "kanin_yellowblackcostume" + +/obj/item/clothing/under/uniform/skrell_malish_greenofficesuit + name = "Malish-Katish green office suit with suspenders" + desc = "Malish's office suit, light top, black bottom, and a fancy lime-green thin veil above the belt." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "malish_greenofficesuit_s" + item_state = "malish_greenofficesuit_s" + worn_state = "malish_greenofficesuit" + + +/obj/item/clothing/under/uniform/skrell_raskinta_redclothes + name = "Raskinta-Katish red clothes" + desc = "Raskinta's red clothes. Has no Qarr-Morr'Kon markings, and pretty flexible!" + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "raskinta_redclothes_s" + item_state = "raskinta_redclothes_s" + worn_state = "raskinta_redclothes" + + +/obj/item/clothing/under/uniform/skrell_skrellian_divingsuit + name = "Skrellian diving suit" + desc = "A highly detailed Skrellian diving suit. Found mainly among the inhabitants of the planets of the Empire." + icon = 'mods/failu_skrell_clothes/icons/skrell/obj_under_skrell.dmi' + item_icons = list(slot_w_uniform_str = 'mods/failu_skrell_clothes/icons/skrell/onmob_under_skrell.dmi') + icon_state = "skrellian_divingsuit_s" + item_state = "skrellian_divingsuit_s" + worn_state = "skrellian_divingsuit" + From 5594650c926b1a89e80bf7d092218d295b0bfb4b Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Mon, 25 Nov 2024 00:12:20 +0300 Subject: [PATCH 02/12] v --- mods/_maps/liberia/maps/liberia.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/_maps/liberia/maps/liberia.dmm b/mods/_maps/liberia/maps/liberia.dmm index 14412afa6cbe3..547726294da71 100644 --- a/mods/_maps/liberia/maps/liberia.dmm +++ b/mods/_maps/liberia/maps/liberia.dmm @@ -4452,7 +4452,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) + products = list(/obj/item/storage/fancy/smokable/luckystars=5,/obj/item/storage/fancy/smokable/professionals=5,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/simulated/floor/wood/walnut, /area/liberia/bar) From 74475c49ffee397791169326cbed06bd01c77199 Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Mon, 2 Dec 2024 19:02:46 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=85=D1=83=D0=B8=D0=BD=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/utility_items/_utility_items.dme | 1 + mods/utility_items/code/ma21.dm | 5 +++++ mods/utility_items/icons/lefthand_guns.dmi | Bin 0 -> 1060 bytes mods/utility_items/icons/righthand_guns.dmi | Bin 0 -> 1039 bytes 4 files changed, 6 insertions(+) create mode 100644 mods/utility_items/code/ma21.dm create mode 100644 mods/utility_items/icons/lefthand_guns.dmi create mode 100644 mods/utility_items/icons/righthand_guns.dmi diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme index b02c3a4e3eaba..fd92a92250f05 100644 --- a/mods/utility_items/_utility_items.dme +++ b/mods/utility_items/_utility_items.dme @@ -25,6 +25,7 @@ #include "code/advanced_landing.dm" #include "code/chemistry.dm" #include "code/jobs.dm" +#include "code/ma21.dm" #endif diff --git a/mods/utility_items/code/ma21.dm b/mods/utility_items/code/ma21.dm new file mode 100644 index 0000000000000..f03f0d50b0e36 --- /dev/null +++ b/mods/utility_items/code/ma21.dm @@ -0,0 +1,5 @@ +/obj/item/gun/energy/plasmastun + item_icons = list( + slot_l_hand_str = 'mods/utility_items/icons/lefthand_guns.dmi', + slot_r_hand_str = 'mods/utility_items/icons/righthand_guns.dmi' + ) diff --git a/mods/utility_items/icons/lefthand_guns.dmi b/mods/utility_items/icons/lefthand_guns.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8ad41db4d3e9c88fb37b5dc05654869fac6d1dc0 GIT binary patch literal 1060 zcmeAS@N?(olHy`uVBq!ia0vp^2|(B;T>h!qu z_RWi7&|IM!yl(5}DGUtE$(}BbAr*7p&OVrbsX*lTe$zuKshX$P-R?+@EMNGKwczu! z%ue?8RbL&>l!Yc)oHVg6Fsr(Cu%-UM<31_hFvBv=R=)I2!mQg5Pdjm*S^K3@4o}p5 zjrYZkA{Bo>+U@_IeR-c(C1cx!=qt=K$|4vHbs8kZ9C)}D+E@h+Gj${~9@)T%SbH;?_BR zx`K%>GXuxR&wsAAH&$`PvWDn#GZ?JbFgSZDVxx&~bLO;yAFl;2d2p>)D`7J0_g7&s z&=O5C(odYF`ese$^?BQ^vu7Ec6*9Vcs5SHbb`H%o-&?v1BXx9i6lVG)m4CN1d8^s5 zdivr`^TZf7r0;Q5i#~8&fBwdgyR}QR{lwl??+4l_@_3WRu~flMmk9wPH@5NG{#~8wA1{#Pc8J+-AEl_il56{pQzO_Zc=RToHY+$#%W~!vhQX z3F6=NeKX>IX$W<;Gc?3p<}~?vU<${MlPy)8vsh5WRe06ui;E}l|MB@>v;$YjqeY01 z1}n?WMeoe_aTi20|LwERh+qHYX8pITxq;LF|LHgE>3(mX611x8@@C^VYaHLafB)Fk z{YTyD!*3t@tb8Z-_|Wsv(@tKY`J#`*(m(%r;ugO1ee>!lv1h_}@BO)Y_3Ff^!|jSz zlMm;-@q1s%pr6-m#qj8NY`E}=HwODcC!7>(d*!iDFV$9ek+J2Gr1uFS`}qIFUEQ=t zDNhIJoc~*5*ZoE(^9p9VEc^G9A@9trBGiEYEPigc?ecR+yCQ+vp25@A&t;ucLK6UK4&)91 literal 0 HcmV?d00001 diff --git a/mods/utility_items/icons/righthand_guns.dmi b/mods/utility_items/icons/righthand_guns.dmi new file mode 100644 index 0000000000000000000000000000000000000000..af4a3ea1301b78b7e3d3f5674b7484ec98f738dd GIT binary patch literal 1039 zcmeAS@N?(olHy`uVBq!ia0vp^2|(B;T>h!qu z_RWi7&|IM!yl(5}DGUtEex5FlAr*7p&bIfz?I6)!zwXtAvO=ve4JF4!rJ&X8`VP(d zeBjd5tHQDZ$yXbVj3?AEg^96kihe3RVc8`1NimIHJRK_8s_U2y6F#xK8`hpb`&(zC z((h0AY|A(5{y+D@hMz}Pe+Bo9vIqu4odyXp2Oe&PHdcYdOdW}gM>a4dp$jJ+D{Lu} zDHQ(t!-Z48N#m82+d~VdR59b^xt~AH%<5#lUizNx&!0asH+|TgI6~Kk@t)e%w(!c` z<$_n<{kF3?FCDf1oA!b4+7;Q63=Nmvns>~~kYFqL_?u~8{J~G3KAlM3D*9m8x=(+( za;l}bR>?9fczuT7KrU>#$eTlaHT#94PS!qu@y+i?-OGD?`=$tmhlk(duWNYBQCdCFUV{`4dp0X&fowYG0*z>;l#y6N2iX0 z=E^Ng1U(&Ah6LU8seiXOMCW2wda2JhldAaqD>VL&o?guL(48^w%K9B{d7b&! zP*@S!kd@Fb&-*MZlg|%=)<}Y?&SloNkV=V873FVSaOe*Zc6Qw Date: Wed, 4 Dec 2024 18:37:08 +0300 Subject: [PATCH 04/12] =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/utility_items/_utility_items.dme | 1 + mods/utility_items/code/modnye_patchi.dm | 39 +++++++++++++++++++++++ mods/utility_items/icons/pins.dmi | Bin 0 -> 5262 bytes 3 files changed, 40 insertions(+) create mode 100644 mods/utility_items/code/modnye_patchi.dm create mode 100644 mods/utility_items/icons/pins.dmi diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme index fd92a92250f05..db506c677e836 100644 --- a/mods/utility_items/_utility_items.dme +++ b/mods/utility_items/_utility_items.dme @@ -26,6 +26,7 @@ #include "code/chemistry.dm" #include "code/jobs.dm" #include "code/ma21.dm" +#include "code/modnye_patchi.dm" #endif diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm new file mode 100644 index 0000000000000..986c480873d25 --- /dev/null +++ b/mods/utility_items/code/modnye_patchi.dm @@ -0,0 +1,39 @@ +/obj/item/clothing/accessory/cross_blue + name = "TEST" + desc = "Test OBJECT" + icon = 'mods/utility_items/icons/pins.dmi' + accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') + icon_state = "small cross (blue)" + slot = ACCESSORY_SLOT_INSIGNIA + +/obj/item/clothing/accessory/cross_red + name = "TEST" + desc = "TEST OBJECT" + icon = 'mods/utility_items/icons/pins.dmi' + accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') + icon_state = "small cross(red)" + slot = ACCESSORY_SLOT_INSIGNIA + +/obj/item/clothing/accessory/flower_gold + name = "TEST" + desc = "TEST OBJECT" + icon = 'mods/utility_items/icons/pins.dmi' + accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') + icon_state = "brooch flower (gold)" + slot = ACCESSORY_SLOT_INSIGNIA + +/obj/item/clothing/accessory/flower_silver + name = "TEST" + desc = "TEST OBJECT" + icon = 'mods/utility_items/icons/pins.dmi' + accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') + icon_state = "brooch flower(silver)" + slot = ACCESSORY_SLOT_INSIGNIA + +/obj/item/clothing/accessory/flower_bronze + name = "TEST" + desc = "TEST OBJECT" + icon = 'mods/utility_items/icons/pins.dmi' + accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') + icon_state = "small cross(bronze)" + slot = ACCESSORY_SLOT_INSIGNIA diff --git a/mods/utility_items/icons/pins.dmi b/mods/utility_items/icons/pins.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d68c7d05055a71ab5e9df3a8d7c6b5fa29b85cc2 GIT binary patch literal 5262 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 XXQr?rIH27C(2ob2dK$Ppwvqn Date: Wed, 4 Dec 2024 23:15:31 +0300 Subject: [PATCH 05/12] / --- maps/sierra/loadout/loadout_accessories.dm | 24 ++++++++++++++++++++++ mods/utility_items/code/modnye_patchi.dm | 10 ++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/maps/sierra/loadout/loadout_accessories.dm b/maps/sierra/loadout/loadout_accessories.dm index 55d242e41cc8a..3912fd9533911 100644 --- a/maps/sierra/loadout/loadout_accessories.dm +++ b/maps/sierra/loadout/loadout_accessories.dm @@ -142,3 +142,27 @@ flags = GEAR_HAS_NO_CUSTOMIZATION cost = 0 +/datum/gear/accessory/cross_blue + display_name = "Cross blue" + path = /obj/item/clothing/accessory/cross_blue + cost = 2 + +/datum/gear/accessory/cross_red + display_name = "Cross red" + path = /obj/item/clothing/accessory/cross_red + cost = 2 + +/datum/gear/accessory/flower_gold + display_name = "Flower gold" + path = /obj/item/clothing/accessory/flower_gold + cost = 2 + +/datum/gear/accessory/flower_silver + display_name = "Flower silver" + path = /obj/item/clothing/accessory/flower_silver + cost = 2 + +/datum/gear/accessory/flower_bronze + display_name = "Flower bronze" + path = /obj/item/clothing/accessory/flower_bronze + cost = 2 diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm index 986c480873d25..e289e33d11577 100644 --- a/mods/utility_items/code/modnye_patchi.dm +++ b/mods/utility_items/code/modnye_patchi.dm @@ -1,5 +1,5 @@ /obj/item/clothing/accessory/cross_blue - name = "TEST" + name = "Cross blue" desc = "Test OBJECT" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') @@ -7,7 +7,7 @@ slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/cross_red - name = "TEST" + name = "Cross red" desc = "TEST OBJECT" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') @@ -15,7 +15,7 @@ slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/flower_gold - name = "TEST" + name = "Flower gold" desc = "TEST OBJECT" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') @@ -23,7 +23,7 @@ slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/flower_silver - name = "TEST" + name = "Flower silver" desc = "TEST OBJECT" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') @@ -31,7 +31,7 @@ slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/flower_bronze - name = "TEST" + name = "Flower bronze" desc = "TEST OBJECT" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') From bfbce676360b849b46f277cafed24dbcaff529f9 Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:28:54 +0300 Subject: [PATCH 06/12] =?UTF-8?q?=D0=92=D0=BE=D1=85=D0=B8=20=D0=9F=D0=9F?= =?UTF-8?q?=D0=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/species/outsider/vox.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm index c459bf92d902f..bc3face090ac4 100644 --- a/code/modules/species/outsider/vox.dm +++ b/code/modules/species/outsider/vox.dm @@ -53,7 +53,7 @@ siemens_coefficient = 0.2 species_flags = SPECIES_FLAG_NO_SCAN - spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION appearance_flags = SPECIES_APPEARANCE_HAS_EYE_COLOR | SPECIES_APPEARANCE_HAS_HAIR_COLOR blood_color = "#2299fc" From 16c02293ca58e4c31ff93480a85d640dbd319774 Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:12:32 +0300 Subject: [PATCH 07/12] zzzzzzzzzz mimimimimiimmimiimimimimimimi --- mods/utility_items/code/modnye_patchi.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm index e289e33d11577..f61e3fa829ec9 100644 --- a/mods/utility_items/code/modnye_patchi.dm +++ b/mods/utility_items/code/modnye_patchi.dm @@ -1,6 +1,6 @@ /obj/item/clothing/accessory/cross_blue name = "Cross blue" - desc = "Test OBJECT" + desc = "A beautiful metal cross. It looks like a medal, but does not have any distinctive signs." icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') icon_state = "small cross (blue)" @@ -8,7 +8,7 @@ /obj/item/clothing/accessory/cross_red name = "Cross red" - desc = "TEST OBJECT" + desc = "A beautiful metal cross. It looks like a medal, but does not have any distinctive signs." icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') icon_state = "small cross(red)" @@ -16,7 +16,7 @@ /obj/item/clothing/accessory/flower_gold name = "Flower gold" - desc = "TEST OBJECT" + desc = "Metal brooch, looks like a flower. This one is golden. It looks very stylish!" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') icon_state = "brooch flower (gold)" @@ -24,7 +24,7 @@ /obj/item/clothing/accessory/flower_silver name = "Flower silver" - desc = "TEST OBJECT" + desc = "Metal brooch, looks like a flower. This one is silver. It looks very stylish!" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') icon_state = "brooch flower(silver)" @@ -32,7 +32,7 @@ /obj/item/clothing/accessory/flower_bronze name = "Flower bronze" - desc = "TEST OBJECT" + desc = "Metal brooch, looks like a flower. This one is bronze. It looks very stylish!" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') icon_state = "small cross(bronze)" From 2bb76b1a61ec4a2c186010ca287d3e369e258292 Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:25:17 +0300 Subject: [PATCH 08/12] shegar moment --- code/modules/species/outsider/vox.dm | 2 +- mods/utility_items/_utility_items.dme | 1 + mods/utility_items/code/FBP_vox.dm | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 mods/utility_items/code/FBP_vox.dm diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm index bc3face090ac4..c459bf92d902f 100644 --- a/code/modules/species/outsider/vox.dm +++ b/code/modules/species/outsider/vox.dm @@ -53,7 +53,7 @@ siemens_coefficient = 0.2 species_flags = SPECIES_FLAG_NO_SCAN - spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION | SPECIES_NO_FBP_CHARGEN appearance_flags = SPECIES_APPEARANCE_HAS_EYE_COLOR | SPECIES_APPEARANCE_HAS_HAIR_COLOR blood_color = "#2299fc" diff --git a/mods/utility_items/_utility_items.dme b/mods/utility_items/_utility_items.dme index 3c78208118301..a0a6b6754592e 100644 --- a/mods/utility_items/_utility_items.dme +++ b/mods/utility_items/_utility_items.dme @@ -31,5 +31,6 @@ #include "code/bottom.dm" #include "code/top.dm" #include "code\skrell-ship.dm" +#include "code/FBP_vox.dm" #endif diff --git a/mods/utility_items/code/FBP_vox.dm b/mods/utility_items/code/FBP_vox.dm new file mode 100644 index 0000000000000..1abe6a78ef244 --- /dev/null +++ b/mods/utility_items/code/FBP_vox.dm @@ -0,0 +1,2 @@ +/datum/species/vox + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_FBP_CONSTRUCTION From 623fd2f8970dbbe715530b0fb2d7f148949c9fee Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:51:04 +0300 Subject: [PATCH 09/12] Update loadout_accessories.dm --- maps/sierra/loadout/loadout_accessories.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maps/sierra/loadout/loadout_accessories.dm b/maps/sierra/loadout/loadout_accessories.dm index 3912fd9533911..f7834a3ba0f1f 100644 --- a/maps/sierra/loadout/loadout_accessories.dm +++ b/maps/sierra/loadout/loadout_accessories.dm @@ -145,24 +145,29 @@ /datum/gear/accessory/cross_blue display_name = "Cross blue" path = /obj/item/clothing/accessory/cross_blue + flags = GEAR_HAS_NO_CUSTOMIZATION cost = 2 /datum/gear/accessory/cross_red display_name = "Cross red" path = /obj/item/clothing/accessory/cross_red + flags = GEAR_HAS_NO_CUSTOMIZATION cost = 2 /datum/gear/accessory/flower_gold display_name = "Flower gold" path = /obj/item/clothing/accessory/flower_gold + flags = GEAR_HAS_NO_CUSTOMIZATION cost = 2 /datum/gear/accessory/flower_silver display_name = "Flower silver" path = /obj/item/clothing/accessory/flower_silver + flags = GEAR_HAS_NO_CUSTOMIZATION cost = 2 /datum/gear/accessory/flower_bronze display_name = "Flower bronze" path = /obj/item/clothing/accessory/flower_bronze + flags = GEAR_HAS_NO_CUSTOMIZATION cost = 2 From ba73c716d734e00b69cc3ca37816ccfab6423d44 Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 18:44:42 +0300 Subject: [PATCH 10/12] =?UTF-8?q?=D1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/utility_items/code/modnye_patchi.dm | 2 +- mods/utility_items/icons/pins.dmi | Bin 5262 -> 5256 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm index f61e3fa829ec9..2fdd257272a1b 100644 --- a/mods/utility_items/code/modnye_patchi.dm +++ b/mods/utility_items/code/modnye_patchi.dm @@ -35,5 +35,5 @@ desc = "Metal brooch, looks like a flower. This one is bronze. It looks very stylish!" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') - icon_state = "small cross(bronze)" + icon_state = "brooch flower(bronze)" slot = ACCESSORY_SLOT_INSIGNIA diff --git a/mods/utility_items/icons/pins.dmi b/mods/utility_items/icons/pins.dmi index d68c7d05055a71ab5e9df3a8d7c6b5fa29b85cc2..bb6a4013abb4024ede00a2ca3fa7636653635aa4 100644 GIT binary patch delta 267 zcmV+m0rdWkDTpbMB!BaIR9JLGWpiV4X>fFDZ*Bkpc%1E$y^g{#5C-e`DOS)xgYK_Q zgM%U$Ndvv*5R}YL>#M55^9UvRpyUvzoiXDA(SZ_*ELs1EK*5uJy$l+)8!LkY4 z&_fR2Uo7i2c73>hd{99{4zq@w+xKuVZqfvc&Y5;OV_A#jA%BNYmK{h9`uct*c{FED zFKZ1sd(m;t56T$Wlk*-HjXAxlkWM&hL@VEF@jy)N@jy*&GNP4lbh*=#+VE`|Wd!GO zs6tW}Rh(0u#c+&+^)BgTzAfbxCI5jx1&nB=;5=m+BU*XeZYq6S@N;|)o4SCa66_Zu RLZ4!U+zE#O0JA6oW)miJdkp{p delta 272 zcmV+r0q_2ZDUKfFDZ*Bkpc%1E$F>k^!5JuOV!e@ zS?Zw3L$bhbIm9FKxd(Z_vaT@ zOxVW}N_bncV$?W{@$v~#MGYm)JX+|;x$Ou$<0eh87@X;!W`C^ckph(P%8DJSgTB1K z#BWkSbJTRV){(O(oz}uZ83S8#A;6+DpZ6-HGfwho>Fa`j$LFwW WE2tX5&LN_p$pmV!*1@wN0caCz_lb=F From 963cd78bf6087e0277074d57cdbd9fe916a931ca Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:21:23 +0300 Subject: [PATCH 11/12] =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/utility_items/code/modnye_patchi.dm | 4 ++-- mods/utility_items/icons/pins.dmi | Bin 5256 -> 4997 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm index 2fdd257272a1b..ddca025332684 100644 --- a/mods/utility_items/code/modnye_patchi.dm +++ b/mods/utility_items/code/modnye_patchi.dm @@ -3,7 +3,7 @@ desc = "A beautiful metal cross. It looks like a medal, but does not have any distinctive signs." icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') - icon_state = "small cross (blue)" + icon_state = "small_cross (blue)" slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/cross_red @@ -11,7 +11,7 @@ desc = "A beautiful metal cross. It looks like a medal, but does not have any distinctive signs." icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') - icon_state = "small cross(red)" + icon_state = "small_cross(red)" slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/flower_gold diff --git a/mods/utility_items/icons/pins.dmi b/mods/utility_items/icons/pins.dmi index bb6a4013abb4024ede00a2ca3fa7636653635aa4..8bd3210bd95d9c516ca00fd6ace4b93b32ff9cdf 100644 GIT binary patch literal 4997 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 literal 5256 zcma)A2T&9Hw_ci3gdiYQI#*G_L{X5MfQSmx1StZB8cOKBr9h-8Ac_hiC7>6iBO)CV zBm!3{p-7Vw5CQ2OObGD8eeeC}&YS;x^LA#>+279DGkbpfo$q|Jk4%hia&wAu0sz2$ z`o-7(MO47V9>ZWXBO65!~0 zR>}==I2obaEKM`K&r5ul+`QsH_rsaQrNq8Bbf+R7i=zUpeDqDPn{osX{_M5>Ysz)| z(+7^xp6fgmxWeMqU{ozS(nR|@Pi1W8=&mosyN@-YJ3Uy{$vWYubewUj_$_W44Sgo; zimM?Q$*mgE>(>SPDm?srQ$jFFwW;W-(KUD73lxua*q!Bdn4#C@H!pnx>-tl^uX%~M zu+I4v=-d^&muZ&O>YIq$zBunpP@EC?<1h-!mgtr@so^3bdp~T{`#j2KEg+I7qaOQ) zZ%If-2k-cBj3W*J_)Tu>YMV1E&cgT#%%R%wX7Xx0nKIFe&p1a(wz$#nC!XB=*nM*L zMa8MMSkVkt$FQ$Koe)L8Q)gYGljfK{SYZ@$sJCd4#4FAeee;UwOF-(Se#}P^6KlaXD`$Y4GR8ZnDC-i0Rb#P(wVHHiYTyZUxmV$*yRe%&wm>k0f1LpP2xb$ z$jGGit}G*&y0Ew>2V4s{Q&hL|*E5fy#9<*a=)+rC zrpeM`qcbf0tZK|JnLfI4git3xq7)s8h|Tqv@4K1YH(MN#PWY;Rs3niDQ|3j`Q%ROzrA~Oof%T|TS=dJz{MxswNMsIrRXP2R9y9iq9N&+o zkc@?D$=g7W%C4*QM8rE`ktO}0ptzju`Kk156*2S9$x!F_7pjH^bu{})N}4{(1uwcl z!`GN0mB^`J_E#fSzUr))hbzC98-_SSfWWPw&7nG!sUXmJc(C_tVc|zvaY;#_-66D_ z`Q5SKhcT7ty;@mXRu;Ga1uay#`rShF`1D6HxP9lv;ozmpR$ha5GZu|a)zvWkziwu) z6>1Vsp(LcX3xnAkb82cVl~^A@UNq&4L_4zYw*7&ScUkU$Aww&IWwFzjTCQcLi zX2NIY>@-1Z?zZ3e+stjGA^U05+}>|hX5od#?cS?_Lh&lKrG8>b-fk-RhQ;KWp7isGPapu}TES z+{OcLWU(hq*!~V!^S=~P*_|k&#EFh2IT&yIQ1x@yFSOmX9Ws9vk;pOL$Qqps*%d~? z!BOuW(9MoQw|pKyPsfB>ArpS|X8drT#X}sTk+g8L%uf1{F)am2J25e76&ChUh_>*l zVq@c%ltbO-SFTT!GmY!%)U1^Q`KcJG(>zWs4>>;k*YfCFA3f@cK8wJ1GMWh+Xyet( zV%PAw&;3M=!nSwLBJ&M6=lV$2J)B;rln<1BLMsGUE1|0uF2kdyn zt$uo<Wei>=@5^GC9EuG7*yRSt}b7x=rCI;1ZB}(_8RaDXU)Nkxl`adjG%(N6TB43uI-Nx_@T#gTiAx%}D1a7R#TchiV#}@Y#3F zm4#tVQ_l#PQaI!RrdSm&*%Si5iBLSRs2Ve`&UGd!W`nWGojXbNus+hby|?TO^9D-yrDswc;HNt~Gzn36|yK?B#7NM5g~0}6K)8^D*VrP4=udxWu&u6#CC z>Mpm>J&%%%$E(Ch?GUI%C;9%tjiR?eM7i?e+h^?6h|3$RdQQxY`to~}h~Xn#Amf3t zWbsXww>aBB!Wjfmnw~iIj8T?wi_&37Ksh*+dke4VMh%mGk3`2_X6-Y8G$sb0jXU`GB#4Xl!_WPGdp(=?f_zu`>?BJi6RdL2 zERiZS?psM`ZhMVicaxJL0@zcEl$>EAP3Z}%)blU56crT-F*)_iH}7udCi+O%Zhk@) zcV|9A`OV?>EU3Ad$e_J)$N8;_>Ecn$%of3VvD_6MtHv5`Cw)~<5qiCYuFt5_#Bynf zGfI{zURNf!txb=d-B*zBvqIJp6O$>^$mu>I*;pOeu{FOutrhAuF9_Xoh4R}BKd{-` z9wC1gRI7u#3?1)Lf#PDY>n$WRZX1k}S(eXE$fzWGT_bc0g{+BS@9x$L(R^W+O% z-7U?Ch-zIKws8p;_QZ=x`Le*L8)2rSyKsViXsYG-axVj^DPNrBN%I>8@6-lR=$W~s zEAqf+;g4m%%#Ufihwd~yTMtO5Ab0kw?4?bNd_1}~S!U}s^?!MoyaANblqz}O^V@c0 zD-k+#g^v!`mqZ`6bUHO2R0V1_%i>rj7h8U2?bTzg7LDS=Nc6PPb zoQ`1|sUi($4O1}i;enX!Y>CW*^5e}a2Zxc=4nblR(dv>UF1_c`%F|JrKfv?0=l5je zaV%+1Z?HmY_zLm$S^P)KyQ?6}iy0Hap}t#MgVbT~T1_R4u`vjkRQtI{tqBT|{j7Ta z!!mXQLQMJeNn2OuWLaIX&;FCZgGi+nS}}gI34VC8M6}v!Ur6FmeLg)~qH((l+SZ#4 zw&?@^Vy@r?A~%IR8$iQVJpy!jmspmi-D26BfE?yEaCTFxrp#{J>}> zt%`ud;Q-)4k_0e(xD)=ds`dSD*8s4A2zqnD*#fiP+h1UGrebo9qk~bu-Csi)9GkteF*`SPqr)dZm?-XFM^|FDO33J#;WfR7u<|FH z#kbzC_?i8VvwBniu(>h)S3A8>_))l1NXq{;hr*s<&rJEPW(a8xzvL=P3uewL0odj`D#t?n@J5| zai;)teqMs=?iMMvHfyQm(8AiO=Fe(bX3Ny9f`-HK^ajgWzGQ1g)DFCkiY#85b>a1%M+&yvX{lrK5UW_K zx4vq+B%rp^$Pde1PnJJMI)OOAA%_G@;R|bbW~SxSa?&O>~&7+QJ@gGvrWS2O7TK8hw^noA$qlX_|%|QNjnYLfQyC-gitc=YU zAE;l*uPwsN_vJ;C2r24_o$0s9gg9%ZZht&ty856*42yB|YE`_a3g2R~?|*FJTxs1w zt7n4P;8Em!i6ykt`QS3DIIy}%S{DCR*L0Q7^Fz+Y2osjs@@r^U~m>y4M^)~iL ztu~MlZ}o%O16QuLg>7%IL!}V%41>zy|>+Ghk4+ICG^PB5&>`N$> zp_G>FEieN`_XrEnHIG4Gv3DlBkBkHNIkH24aBBSqqw&LD`)0V8wOcV|+IiiVJ9|Wo+mF2FBUUIDJ_@o$Ho3hGF_YrqI6y*gwbAKLe8Tig;(N zBquo0P)Y1o){qK{)&5@iNO57|ZAb97{{^^|JPlE#+h8i1wKYDVatiBT2J$&Z#Die8 zm3gsaIb(|?vD^dl(D`KVkKFTV`Gon4PfbxfSCNCmMdXzi2V|n=&mye|Eg(4zF4@*D z32qlx+OxxGF(nfl&m~@MPoAz`ET_H!0p!DJKjUn2PHVq0)XRVZ0T2t7<<^zQjxbZ} z_qH)BZF>rHuq=H=^6TWwJ%X<}e31%#6+H9o)~(|cUV1h*Cn6}e+|B!Q`~}-WlA1{i z&U{=v__Z69#kuPR+X-P>4+~|nj5nK|MO;x<{!!5`v6-hu|A3o*Um+d+2P2^^em4@Z z-%2*QcQ3{Tq!DLTa>`&O?CbNRgp{T^o~_pDYY?A&Fbztd_cX?XatGlJ!KKS{*N4?W z&Bf%2u`y3q%j(H_u=+2fEO?WCPstrxxv_=AK27?xrgHDMxy(W6&dA{ueP{Xid)JQ+ zYj-8rcBs4>s0MP}`x()*iLT$+5aJG{)v`1!WWU|4)mp|uP1K^q{ zQOYYcxJ`2Ne%K3wtZ^cNI*~v?B}+LLD!Vb%kIb`p+viz9LD1J(xHMD%IhLM S`gH)~xP8M&w@k-A`ab}K0v(kA From 9d60c338adedf3e4da21106549bd7b12af053f6c Mon Sep 17 00:00:00 2001 From: Teteshnik1 <149588524+Teteshnik1@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:37:21 +0300 Subject: [PATCH 12/12] / --- mods/utility_items/code/modnye_patchi.dm | 4 ++-- mods/utility_items/icons/pins.dmi | Bin 4997 -> 3530 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/utility_items/code/modnye_patchi.dm b/mods/utility_items/code/modnye_patchi.dm index ddca025332684..654774163d4d0 100644 --- a/mods/utility_items/code/modnye_patchi.dm +++ b/mods/utility_items/code/modnye_patchi.dm @@ -3,7 +3,7 @@ desc = "A beautiful metal cross. It looks like a medal, but does not have any distinctive signs." icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') - icon_state = "small_cross (blue)" + icon_state = "small_cross(blue)" slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/cross_red @@ -19,7 +19,7 @@ desc = "Metal brooch, looks like a flower. This one is golden. It looks very stylish!" icon = 'mods/utility_items/icons/pins.dmi' accessory_icons = list(slot_w_uniform_str = 'mods/utility_items/icons/pins.dmi', slot_wear_suit_str = 'mods/utility_items/icons/pins.dmi') - icon_state = "brooch flower (gold)" + icon_state = "brooch flower(gold)" slot = ACCESSORY_SLOT_INSIGNIA /obj/item/clothing/accessory/flower_silver diff --git a/mods/utility_items/icons/pins.dmi b/mods/utility_items/icons/pins.dmi index 8bd3210bd95d9c516ca00fd6ace4b93b32ff9cdf..27a0547739da74de8d0f49db3facadb5a48fb0a0 100644 GIT binary patch literal 3530 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