From 2cf47dbe9c2cdc36201c71cbd9bf330344f26073 Mon Sep 17 00:00:00 2001 From: Aylong Date: Tue, 14 Nov 2023 20:10:37 +0200 Subject: [PATCH 1/4] No more initialized --- _maps/map_files220/cyberiad/cyberiad.dmm | 17 +++++------------ _maps/map_files220/delta/delta.dmm | 21 +++++++-------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 764d9ec08395..7304eb495f4a 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -11544,7 +11544,6 @@ pixel_y = 30 }, /obj/item/reagent_containers/food/drinks/britcup{ - initialized = 1; list_reagents = list("tea"=15); pixel_x = 4; pixel_y = 2 @@ -32216,7 +32215,6 @@ }, /obj/machinery/light/directional/south, /obj/item/reagent_containers/food/drinks/britcup{ - initialized = 1; list_reagents = list("tea"=15); pixel_x = 4; pixel_y = 2 @@ -48258,18 +48256,15 @@ /obj/structure/table/glass/reinforced/plastitanium, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ pixel_y = 12; - pixel_x = 6; - initialized = 1 + pixel_x = 6 }, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_y = 8; - pixel_x = -1; - initialized = 1 + pixel_x = -1 }, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_y = 2; - pixel_x = -1; - initialized = 1 + pixel_x = -1 }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel{ @@ -56913,8 +56908,7 @@ }, /obj/item/reagent_containers/food/snacks/grown/banana{ pixel_x = -4; - pixel_y = -6; - initialized = 1 + pixel_y = -6 }, /obj/item/bikehorn{ pixel_y = 4; @@ -67457,8 +67451,7 @@ }, /obj/item/reagent_containers/food/drinks/bottle/holywater{ pixel_y = 4; - pixel_x = -8; - initialized = 1 + pixel_x = -8 }, /obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dust, diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index d7f4d3fb3c65..5e63019c5516 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -50947,8 +50947,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/tray, /obj/item/ashtray/glass{ - pixel_y = 4; - initialized = 1 + pixel_y = 4 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -73930,14 +73929,12 @@ /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = -6; - initialized = 1; + pixel_x = -6 volume = 0 }, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = 8; - initialized = 1; + pixel_x = 8 volume = 0 }, /obj/machinery/light/small/directional/south, @@ -82917,8 +82914,7 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/holywater{ pixel_y = 4; - pixel_x = -8; - initialized = 1 + pixel_x = -8 }, /obj/item/storage/bible{ pixel_y = 6; @@ -84947,8 +84943,7 @@ /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 8; - pixel_x = -6; - initialized = 1 + pixel_x = -6 }, /obj/item/paper/pamphlet/deltainfo{ pixel_y = 4; @@ -86683,8 +86678,7 @@ }, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = -6; - initialized = 1 + pixel_x = -6 }, /turf/simulated/floor/plasteel{ icon_state = "cmo" @@ -101438,8 +101432,7 @@ /obj/machinery/light/small/directional/south, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = 8; - initialized = 1; + pixel_x = 8 volume = 0 }, /turf/simulated/floor/plasteel{ From d10b55fad27cf9759a81c0900b46bbc92461625b Mon Sep 17 00:00:00 2001 From: Aylong Date: Tue, 14 Nov 2023 20:33:16 +0200 Subject: [PATCH 2/4] Whoops --- _maps/map_files220/delta/delta.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 5e63019c5516..925c2168135a 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -73929,12 +73929,12 @@ /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = -6 + pixel_x = -6; volume = 0 }, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = 8 + pixel_x = 8; volume = 0 }, /obj/machinery/light/small/directional/south, @@ -101432,7 +101432,7 @@ /obj/machinery/light/small/directional/south, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 6; - pixel_x = 8 + pixel_x = 8; volume = 0 }, /turf/simulated/floor/plasteel{ From f5c3810e420a7aa6261f264b18d779171fa2c605 Mon Sep 17 00:00:00 2001 From: Aylong Date: Tue, 14 Nov 2023 20:43:04 +0200 Subject: [PATCH 3/4] Space skin --- modular_ss220/objects/code/card_skins.dm | 160 +++++++++++++++++++++++ modular_ss220/objects/icons/id_skins.dmi | Bin 0 -> 4949 bytes 2 files changed, 160 insertions(+) create mode 100644 modular_ss220/objects/code/card_skins.dm create mode 100644 modular_ss220/objects/icons/id_skins.dmi diff --git a/modular_ss220/objects/code/card_skins.dm b/modular_ss220/objects/code/card_skins.dm new file mode 100644 index 000000000000..43ae0254bd5d --- /dev/null +++ b/modular_ss220/objects/code/card_skins.dm @@ -0,0 +1,160 @@ +/obj/item/card/id + var/have_skin = FALSE + var/skinable = TRUE + +/obj/item/card/id/guest + skinable = FALSE + +/obj/item/card/id/data + skinable = FALSE + +/obj/item/card/id/away + skinable = FALSE + +/obj/item/card/id/thunderdome + skinable = FALSE + +/obj/item/card/id/attackby(obj/item/item as obj, mob/user as mob, params) + . = ..() + if(istype(item, /obj/item/id_skin)) + if(have_skin) + to_chat(usr, span_warning("На карте уже есть наклейка, сначала соскребите её!")) + return + if(!skinable) + to_chat(usr, span_warning("Наклейка не подходит для [src]!")) + return + else + var/obj/item/id_skin/skin = item + var/mutable_appearance/card_skin = mutable_appearance(skin.icon, skin.icon_state) + card_skin.color = skin.color + to_chat(user, "Вы наклеили [skin.pronoun_name] на [src].") + desc = initial(desc) + desc += "
[skin.info]" + add_overlay(card_skin) + have_skin = TRUE + qdel(skin) + return + +/obj/item/card/id/verb/remove_skin() + set name = "Соскрести наклейку" + set category = "Object" + set src in range(0) + + if(usr.stat || HAS_TRAIT(usr, TRAIT_UI_BLOCKED) || usr.restrained()) + return + + if(have_skin) + to_chat(usr, span_notice("Вы начинаете соскребать наклейку с карты.")) + if(do_after(usr, 5 SECONDS, target = src, progress = TRUE)) + to_chat(usr, span_notice("Вы соскребаете наклейку с карты.")) + src.overlays.Cut() + have_skin = FALSE + else + to_chat(usr, span_warning("На карте нет наклейки!")) + +/obj/item/id_skin + name = "\improper наклейка на карту" + desc = "Этим можно изменить внешний вид своей карты! Покажи службе безопасности какой ты стильный." + icon = 'modular_ss220/objects/icons/id_skins.dmi' + icon_state = "" + var/pronoun_name = "наклейку" + var/info = "На ней наклейка." + +/obj/item/id_skin/colored + name = "\improper голо-наклейка на карту" + desc = "Голографическая наклейка на карту, вы можете выбрать цвет который она примет. После наклеивания на карту, сменить цвет нельзя!" + icon_state = "colored" + pronoun_name = "голо-наклейку" + info = "На ней голо-наклейка." + var/list/color_list = list("Красный", "Зелёный", "Синий", "Жёлтый", "Оранжевый", "Фиолетовый", "Голубой", "Циановый", "Аквамариновый", "Розовый") + +/obj/item/id_skin/colored/shiny + name = "\improper металлическая голо-наклейка" + icon_state = "colored_shiny" + +/obj/item/id_skin/colored/attack_self(mob/living/user as mob) + var/choice = input(user, "Какой цвет предпочитаете?", "Выбор цвета") as null|anything in list("Выбрать предустановленный", "Выбрать вручную") + if(!choice) + return + switch(choice) + if("Выбрать предустановленный") + choice = input(user, "Выберите цвет", "Выбор цвета") as null|anything in color_list + if(!choice) + return + switch(choice) + if("Красный") + color = LIGHT_COLOR_RED + if("Зелёный") + color = LIGHT_COLOR_GREEN + if("Синий") + color = LIGHT_COLOR_LIGHTBLUE + if("Жёлтый") + color = LIGHT_COLOR_HOLY_MAGIC + if("Оранжевый") + color = LIGHT_COLOR_ORANGE + if("Фиолетовый") + color = LIGHT_COLOR_LAVENDER + if("Голубой") + color = LIGHT_COLOR_LIGHT_CYAN + if("Циановый") + color = LIGHT_COLOR_CYAN + if("Аквамариновый") + color = LIGHT_COLOR_BLUEGREEN + if("Розовый") + color = LIGHT_COLOR_PINK + if("Выбрать вручную") + color = input(user,"Выберите цвет") as color + +/obj/item/id_skin/prisoner + name = "\improper тюремная наклейка на карту" + icon_state = "prisoner" + pronoun_name = "тюремную наклейку" + info = "На ней тюремная наклейка." + +/obj/item/id_skin/silver + name = "\improper серебрянная наклейка на карту" + icon_state = "silver" + pronoun_name = "серебрянную наклейку" + info = "На ней серебрянная наклейка." + +/obj/item/id_skin/gold + name = "\improper золотая наклейка на карту" + icon_state = "gold" + pronoun_name = "золотую наклейку" + info = "На ней золотая наклейка." + +/obj/item/id_skin/business + name = "\improper бизнесменская наклейка на карту" + icon_state = "business" + pronoun_name = "бизнесменскую наклейку" + info = "На ней бизнесменская наклейка." + +/obj/item/id_skin/lifetime + name = "\improper стильная наклейка на карту" + icon_state = "lifetime" + pronoun_name = "стильную наклейку" + info = "На ней стильная наклейка." + +/obj/item/id_skin/ussp + name = "\improper коммунистическая наклейка на карту" + icon_state = "ussp" + pronoun_name = "коммунистическую наклейку" + info = "На ней коммунистическая наклейка." + +/obj/item/id_skin/clown + name = "\improper клоунская наклейка на карту" + icon_state = "clown" + pronoun_name = "клоунскую наклейку" + info = "На ней клоунская наклейка." + +/obj/item/id_skin/rainbow + name = "\improper радужная наклейка на карту" + icon_state = "rainbow" + pronoun_name = "радужную наклейку" + info = "На ней радужная наклейка." + +/obj/item/id_skin/space + name = "\improper КОСМИЧЕСКАЯ наклейка на карту" + icon_state = "space" + pronoun_name = "КОСМИЧЕСКУЮ наклейку" + info = "На ней КОСМИЧЕСКАЯ наклейка." diff --git a/modular_ss220/objects/icons/id_skins.dmi b/modular_ss220/objects/icons/id_skins.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3f97613f7be0cee7395f399c21cfe005d17a17ee GIT binary patch literal 4949 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 Date: Tue, 14 Nov 2023 21:11:40 +0200 Subject: [PATCH 4/4] Revert "Space skin" This reverts commit f5c3810e420a7aa6261f264b18d779171fa2c605. --- modular_ss220/objects/code/card_skins.dm | 160 ----------------------- modular_ss220/objects/icons/id_skins.dmi | Bin 4949 -> 0 bytes 2 files changed, 160 deletions(-) delete mode 100644 modular_ss220/objects/code/card_skins.dm delete mode 100644 modular_ss220/objects/icons/id_skins.dmi diff --git a/modular_ss220/objects/code/card_skins.dm b/modular_ss220/objects/code/card_skins.dm deleted file mode 100644 index 43ae0254bd5d..000000000000 --- a/modular_ss220/objects/code/card_skins.dm +++ /dev/null @@ -1,160 +0,0 @@ -/obj/item/card/id - var/have_skin = FALSE - var/skinable = TRUE - -/obj/item/card/id/guest - skinable = FALSE - -/obj/item/card/id/data - skinable = FALSE - -/obj/item/card/id/away - skinable = FALSE - -/obj/item/card/id/thunderdome - skinable = FALSE - -/obj/item/card/id/attackby(obj/item/item as obj, mob/user as mob, params) - . = ..() - if(istype(item, /obj/item/id_skin)) - if(have_skin) - to_chat(usr, span_warning("На карте уже есть наклейка, сначала соскребите её!")) - return - if(!skinable) - to_chat(usr, span_warning("Наклейка не подходит для [src]!")) - return - else - var/obj/item/id_skin/skin = item - var/mutable_appearance/card_skin = mutable_appearance(skin.icon, skin.icon_state) - card_skin.color = skin.color - to_chat(user, "Вы наклеили [skin.pronoun_name] на [src].") - desc = initial(desc) - desc += "
[skin.info]" - add_overlay(card_skin) - have_skin = TRUE - qdel(skin) - return - -/obj/item/card/id/verb/remove_skin() - set name = "Соскрести наклейку" - set category = "Object" - set src in range(0) - - if(usr.stat || HAS_TRAIT(usr, TRAIT_UI_BLOCKED) || usr.restrained()) - return - - if(have_skin) - to_chat(usr, span_notice("Вы начинаете соскребать наклейку с карты.")) - if(do_after(usr, 5 SECONDS, target = src, progress = TRUE)) - to_chat(usr, span_notice("Вы соскребаете наклейку с карты.")) - src.overlays.Cut() - have_skin = FALSE - else - to_chat(usr, span_warning("На карте нет наклейки!")) - -/obj/item/id_skin - name = "\improper наклейка на карту" - desc = "Этим можно изменить внешний вид своей карты! Покажи службе безопасности какой ты стильный." - icon = 'modular_ss220/objects/icons/id_skins.dmi' - icon_state = "" - var/pronoun_name = "наклейку" - var/info = "На ней наклейка." - -/obj/item/id_skin/colored - name = "\improper голо-наклейка на карту" - desc = "Голографическая наклейка на карту, вы можете выбрать цвет который она примет. После наклеивания на карту, сменить цвет нельзя!" - icon_state = "colored" - pronoun_name = "голо-наклейку" - info = "На ней голо-наклейка." - var/list/color_list = list("Красный", "Зелёный", "Синий", "Жёлтый", "Оранжевый", "Фиолетовый", "Голубой", "Циановый", "Аквамариновый", "Розовый") - -/obj/item/id_skin/colored/shiny - name = "\improper металлическая голо-наклейка" - icon_state = "colored_shiny" - -/obj/item/id_skin/colored/attack_self(mob/living/user as mob) - var/choice = input(user, "Какой цвет предпочитаете?", "Выбор цвета") as null|anything in list("Выбрать предустановленный", "Выбрать вручную") - if(!choice) - return - switch(choice) - if("Выбрать предустановленный") - choice = input(user, "Выберите цвет", "Выбор цвета") as null|anything in color_list - if(!choice) - return - switch(choice) - if("Красный") - color = LIGHT_COLOR_RED - if("Зелёный") - color = LIGHT_COLOR_GREEN - if("Синий") - color = LIGHT_COLOR_LIGHTBLUE - if("Жёлтый") - color = LIGHT_COLOR_HOLY_MAGIC - if("Оранжевый") - color = LIGHT_COLOR_ORANGE - if("Фиолетовый") - color = LIGHT_COLOR_LAVENDER - if("Голубой") - color = LIGHT_COLOR_LIGHT_CYAN - if("Циановый") - color = LIGHT_COLOR_CYAN - if("Аквамариновый") - color = LIGHT_COLOR_BLUEGREEN - if("Розовый") - color = LIGHT_COLOR_PINK - if("Выбрать вручную") - color = input(user,"Выберите цвет") as color - -/obj/item/id_skin/prisoner - name = "\improper тюремная наклейка на карту" - icon_state = "prisoner" - pronoun_name = "тюремную наклейку" - info = "На ней тюремная наклейка." - -/obj/item/id_skin/silver - name = "\improper серебрянная наклейка на карту" - icon_state = "silver" - pronoun_name = "серебрянную наклейку" - info = "На ней серебрянная наклейка." - -/obj/item/id_skin/gold - name = "\improper золотая наклейка на карту" - icon_state = "gold" - pronoun_name = "золотую наклейку" - info = "На ней золотая наклейка." - -/obj/item/id_skin/business - name = "\improper бизнесменская наклейка на карту" - icon_state = "business" - pronoun_name = "бизнесменскую наклейку" - info = "На ней бизнесменская наклейка." - -/obj/item/id_skin/lifetime - name = "\improper стильная наклейка на карту" - icon_state = "lifetime" - pronoun_name = "стильную наклейку" - info = "На ней стильная наклейка." - -/obj/item/id_skin/ussp - name = "\improper коммунистическая наклейка на карту" - icon_state = "ussp" - pronoun_name = "коммунистическую наклейку" - info = "На ней коммунистическая наклейка." - -/obj/item/id_skin/clown - name = "\improper клоунская наклейка на карту" - icon_state = "clown" - pronoun_name = "клоунскую наклейку" - info = "На ней клоунская наклейка." - -/obj/item/id_skin/rainbow - name = "\improper радужная наклейка на карту" - icon_state = "rainbow" - pronoun_name = "радужную наклейку" - info = "На ней радужная наклейка." - -/obj/item/id_skin/space - name = "\improper КОСМИЧЕСКАЯ наклейка на карту" - icon_state = "space" - pronoun_name = "КОСМИЧЕСКУЮ наклейку" - info = "На ней КОСМИЧЕСКАЯ наклейка." diff --git a/modular_ss220/objects/icons/id_skins.dmi b/modular_ss220/objects/icons/id_skins.dmi deleted file mode 100644 index 3f97613f7be0cee7395f399c21cfe005d17a17ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4949 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