diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm index 5fd4db677e9..4ca4320f569 100644 --- a/code/game/objects/items/tajara.dm +++ b/code/game/objects/items/tajara.dm @@ -88,3 +88,126 @@ in basic survival and reconnaissance skills emphasizing on self dependence within the frozen wilderness of Adhomai. As a scouting unit, Ha'narri travel lightly on equipment, \ carrying primarily the essentials for survival and only a token amount of ammunition. Many detachments also make use of snow skiis in order to travel quickly in mountainous regions. \ They are well-known for their iconic thick light-colored cloaks which they wear while traversing the vast countrysides for warmth, as well as camouflage." + +/obj/item/pocketwatch/adhomai + name = "adhomian watch" + desc = "A watch made in the traditional adhomian style. It can be stored in a pocket or worn around the neck." + desc_fluff = "Because your wrists have better things to do." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "adhomai_clock" + item_state = "adhomai_clock" + contained_sprite = TRUE + slot_flags = SLOT_TIE + +/obj/item/pocketwatch/adhomai/checktime(mob/user) + set category = "Object" + set name = "Check Time" + set src in usr + + if(closed) + to_chat(usr, SPAN_WARNING("You check your watch, realising it's closed.")) + else + + var/adhomian_year = game_year + 1158 + + var/current_month = time2text(world.realtime, "Month") + var/current_day = text2num(time2text(world.realtime, "DD")) + var/adhomian_day + var/adhomian_month + switch(current_month) + if("January", "February", "March") + adhomian_month = "Menshe-aysaif" + if (current_month == "February") + adhomian_day = current_day + 15 + if (current_month == "March") + adhomian_day = current_day + 30 + + if("April", "May", "June") + adhomian_month = "Sil'nryy-aysaif" + if (current_month == "May") + adhomian_day = current_day + 15 + if (current_month == "June") + adhomian_day = current_day + 30 + + if("July", "August", "September") + adhomian_month = "Menshe-rhazzimy" + if (current_month == "August") + adhomian_day = current_day + 15 + if (current_month == "September") + adhomian_day = current_day + 30 + + if("October", "November", "December") + adhomian_month = "Sil’nryy-rhazzimy" + if (current_month == "November") + adhomian_day = current_day + 15 + if (current_month == "December") + adhomian_day = current_day + 30 + + var/real_time = text2num(time2text(world.time + (roundstart_hour HOURS), "hh")) + var/adhomian_time = real_time + if(IsOdd(current_day)) + adhomian_time = real_time + 24 + adhomian_day -= 1 + + to_chat(usr, "You check your \the [src], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is '[adhomian_day]th day of [adhomian_month] [adhomian_year]'.") + + +/obj/item/flame/lighter/adhomai + name = "adhomian lighter" + desc = "An adhomian lighter, it is designated to protect the flame from the strong winds of the Tajaran homeworld." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "trenchlighter" + item_state = "trenchlighter" + base_state = "trenchlighter" + contained_sprite = TRUE + activation_sound = 'sound/items/cigs_lighters/zippo_on.ogg' + deactivation_sound = 'sound/items/cigs_lighters/zippo_off.ogg' + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' + var/protection = FALSE + +/obj/item/flame/lighter/adhomai/update_icon() + if(!protection) + icon_state = "[base_state]" + item_state = "[base_state]" + return + + if(lit) + icon_state = "[base_state]-on" + item_state = "[base_state]-on" + else + icon_state = "[base_state]-proc" + item_state = "[base_state]" + +/obj/item/flame/lighter/adhomai/attack_self(mob/living/user) + if(!protection) + to_chat(user, SPAN_WARNING("You fail to light \the [src], you need to lift the windshield before lighting it.")) + return FALSE + else + ..() + +/obj/item/flame/lighter/adhomai/attack_hand(mob/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.l_store == src && !H.get_active_hand()) + H.put_in_hands(src) + H.l_store = null + return + if(H.r_store == src && !H.get_active_hand()) + H.put_in_hands(src) + H.r_store = null + return + if(H.belt == src && !H.get_active_hand()) + H.put_in_hands(src) + H.belt = null + return + + if (loc == user) + if(!lit) + protection = !protection + playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) + update_icon() + else + ..() + + add_fingerprint(user) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ced55fce020..f42da6d70a1 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -347,9 +347,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM reagents.add_reagent("tobaccobad",10) reagents.add_reagent("nicotine",5) -/obj/item/clothing/mask/smokable/cigarette/pra +/obj/item/clothing/mask/smokable/cigarette/adhomai + name = "adhomian cigarette" + desc = "An adhomian cigarette made from processed S'rendarr's Hand." -/obj/item/clothing/mask/smokable/cigarette/pra/Initialize() +/obj/item/clothing/mask/smokable/cigarette/adhomai/Initialize() . = ..() reagents.clear_reagents() reagents.add_reagent("tobacco",5) @@ -606,20 +608,27 @@ CIGARETTE PACKETS ARE IN FANCY.DM drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' -/obj/item/flame/lighter/random - New() - icon_state = "lighter-[pick("r","c","y","g")]" - item_state = icon_state - base_state = icon_state +/obj/item/flame/lighter/random/Initialize() + . = ..() + icon_state = "lighter-[pick("r","c","y","g")]" + item_state = icon_state + base_state = icon_state + +/obj/item/flame/lighter/zippo/update_icon() + if(lit) + icon_state = "[base_state]on" + item_state = "[base_state]on" + else + icon_state = "[base_state]" + item_state = "[base_state]" /obj/item/flame/lighter/attack_self(mob/living/user) if(!base_state) base_state = icon_state if(user.r_hand == src || user.l_hand == src) if(!lit) - lit = 1 - icon_state = "[base_state]on" - item_state = "[base_state]on" + lit = TRUE + update_icon() playsound(src.loc, pick(activation_sound), 75, 1) if(istype(src, /obj/item/flame/lighter/zippo) ) user.visible_message(span("notice", "Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")) @@ -640,9 +649,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM set_light(2, 1, l_color = LIGHT_COLOR_LAVA) START_PROCESSING(SSprocessing, src) else - lit = 0 - icon_state = "[base_state]" - item_state = "[base_state]" + lit = FALSE + update_icon() playsound(src.loc, deactivation_sound, 75, 1) if(istype(src, /obj/item/flame/lighter/zippo) ) user.visible_message(span("notice", "You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 1ea7283d8ce..80bc3db6592 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -313,14 +313,26 @@ desc = "A packet of six adhomian \"Working Tajara\" cigarettes, imported straight from the People's Republic of Adhomai." icon_state = "prapacket" item_state = "prapacket" - cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/pra + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard) - storage_slots = 7 /obj/item/storage/fancy/cigarettes/pra/fill() ..() new /obj/item/tajcard(src) +/obj/item/storage/fancy/cigarettes/dpra + name = "\improper Shastar Leaves cigarette packet" + desc = "A packet of six adhomian \"Shastar Leaves\" cigarettes, imported straight from the Democratic People's Republic of Adhomai." + icon_state = "dprapacket" + item_state = "dprapacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai + +/obj/item/storage/fancy/cigarettes/nka + name = "\improper Royal Choice cigarette packet" + desc = "A packet of six adhomian \"Royal Choice\" cigarettes, imported straight from the New Kingdom of Adhomai." + icon_state = "nkapacket" + item_state = "nkapacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai /* * Vial Box diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 94668dfb3a5..65dcc6b239f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -30,6 +30,8 @@ cigarettes["DromedaryCo cigarette packet"] = /obj/item/storage/fancy/cigarettes/dromedaryco cigarettes["Nico-Tine cigarette packet"] = /obj/item/storage/fancy/cigarettes/nicotine cigarettes["Working Tajara cigarette packet"] = /obj/item/storage/fancy/cigarettes/pra + cigarettes["Shastar Leaves cigarette packet"] = /obj/item/storage/fancy/cigarettes/dpra + cigarettes["Royal Choice cigarette packet"] = /obj/item/storage/fancy/cigarettes/nka gear_tweaks += new/datum/gear_tweak/path(cigarettes) /datum/gear/smoking/chew diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index f9cff3581bd..b6c6b69030a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -172,13 +172,6 @@ sort_category = "Xenowear - Tajara" whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") -/datum/gear/accessory/partymembership - display_name = "honorary party member card" - path = /obj/item/clothing/accessory/badge/hadii_card - sort_category = "Xenowear - Tajara" - whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - flags = GEAR_HAS_DESC_SELECTION - /datum/gear/gloves/shumalia_belt display_name = "hammer buckle belt" description = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila." @@ -194,3 +187,47 @@ cost = 4 whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") sort_category = "Xenowear - Tajara" + +/datum/gear/accessory/tajaran_card + display_name = "tajaran cards, badges and pins selection" + path = /obj/item/clothing/accessory/badge/hadii_card + sort_category = "Xenowear - Tajara" + whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/tajaran_card/New() + ..() + var/card = list() + card["honorary party member card"] = /obj/item/clothing/accessory/badge/hadii_card + card["almariist pin"] = /obj/item/clothing/accessory/dpra_badge + card["royalist badge"] = /obj/item/clothing/accessory/nka_badge + gear_tweaks += new/datum/gear_tweak/path(card) + +/datum/gear/tajaran_passports + display_name = "adhomian passports selection" + path = /obj/item/clothing/accessory/badge/pra_passport + sort_category = "Xenowear - Tajara" + whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/tajaran_passports/New() + ..() + var/passports = list() + passports["people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/pra_passport + passports["democratic people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/dpra_passport + passports["new kingdom of adhomai passport"] = /obj/item/clothing/accessory/badge/nka_passport + gear_tweaks += new/datum/gear_tweak/path(passports) + +/datum/gear/accessory/adhomai_zippo + display_name = "adhomian lighter" + path = /obj/item/flame/lighter/adhomai + sort_category = "Xenowear - Tajara" + whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/adhomai_pocketwatch + display_name = "adhomian lighter" + path = /obj/item/pocketwatch/adhomai + sort_category = "Xenowear - Tajara" + whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 7ea8ebd0242..fa3fec66238 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -97,11 +97,44 @@ They follow Hadiism as their main ideology, with the objective of securing the tajaran freedom and place in the galactic community. Membership of the Hadiist Party is not open. \ For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \ seem as nothing but a honor and does not grant any status or position that a regular Party member would have." - w_class = 1 + w_class = ITEMSIZE_TINY + flippable = TRUE + v_flippable = FALSE drop_sound = 'sound/items/drop/card.ogg' pickup_sound = 'sound/items/pickup/card.ogg' +/obj/item/clothing/accessory/dpra_badge + name = "almariist pin" + desc = "A pin worn by supporters of the Democratic People's Republic of Adhomai and the ideals of almariism." + icon_state = "dpra-badge" + overlay_state = "dpra-badge" + desc_fluff = "The government of the DPRA seeks to dismantle the ethnic caste system present in Tajaran society. Instead of creating policies and using the force of the state \ + to do so, they believe that this goal can be reached by giving the necessary opportunities and freedom from external influences to the Tajara species. Local autonomy and regional \ + cultures are protected by the authorities. Traditional Zhan communities, rock nomads and Amohdan lodges are allowed to thrive in the territories of the Democratic People's Republic. \ + This ideology is known as Al'mariism, as it seeks to preserve the initial ideals of the first revolution." + slot_flags = SLOT_TIE + w_class = ITEMSIZE_TINY + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/nka_badge + name = "royalist badge" + desc = "A badge worn by the supporters of the New Kingdom of Adhomai and its royalist ideals." + icon_state = "nka-badge" + overlay_state = "nka-badge" + desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \ + part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \ + their customary roles related to their ethnicity." + slot_flags = SLOT_TIE + w_class = ITEMSIZE_TINY + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + /obj/item/clothing/accessory/hadii_pin name = "hadiist party pin" desc = "A small, red flag pin worn by members of the Hadiist party." @@ -112,12 +145,13 @@ They follow Hadiism as their main ideology, with the objective of securing the Tajaran freedom and place in the galactic community. Membership of the Hadiist Party is not open. \ For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \ seen as nothing but a honor and does not grant any status or position that a regular Party member would have." - flippable = 1 + flippable = TRUE + drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' /obj/item/clothing/accessory/dpra_pin - name = "almariist pin" + name = "almariist representative pin" desc = "A small, black flag pin worn by government officials of the Democratic People's Republic of Adhomai." icon_state = "pin-ala" item_state = "pin-ala" @@ -126,7 +160,8 @@ to do so, they believe that this goal can be reached by giving the necessary opportunities and freedom from external influences to the Tajara species. Local autonomy and regional \ cultures are protected by the authorities. Traditional Zhan communities, rock nomads and Amohdan lodges are allowed to thrive in the territories of the Democratic People's Republic. \ This ideology is known as Al'mariism, as it seeks to preserve the initial ideals of the first revolution." - flippable = 1 + flippable = TRUE + drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' @@ -139,6 +174,52 @@ desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \ part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \ their customary roles related to their ethnicity." - flippable = 1 + + flippable = TRUE drop_sound = 'sound/items/drop/ring.ogg' - pickup_sound = 'sound/items/pickup/ring.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/badge/pra_passport + name = "people's republic of adhomai passport" + desc = "A passport issued to the citizens of the People's Republic of Adhomai." + icon_state = "pra-passport" + overlay_state = "pra-passport" + slot_flags = null + w_class = ITEMSIZE_TINY + flippable = FALSE + v_flippable = FALSE + + badge_string = "People's Republic of Adhomai Citizen" + + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + +/obj/item/clothing/accessory/badge/dpra_passport + name = "democratic people's republic of adhomai passport" + desc = "A passport issued to the citizens of the Democratic People's Republic of Adhomai." + icon_state = "dpra-passport" + overlay_state = "dpra-passport" + slot_flags = null + w_class = ITEMSIZE_TINY + flippable = FALSE + v_flippable = FALSE + + badge_string = "Democratic People's Republic of Adhomai Citizen" + + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + +/obj/item/clothing/accessory/badge/nka_passport + name = "new kingdom of adhomai passport" + desc = "A passport issued to the citizens of the New Kingdom of Adhomai." + icon_state = "dpra-passport" + overlay_state = "dpra-passport" + slot_flags = null + w_class = ITEMSIZE_TINY + flippable = FALSE + v_flippable = FALSE + + badge_string = "New Kingdom of Adhomai Citizen" + + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 455721fe582..963cb9a7b20 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1184,3 +1184,12 @@ /obj/item/reagent_containers/food/snacks/icecream ) result = /obj/item/reagent_containers/food/snacks/banana_split + +/datum/recipe/lardwich + items = list( + /obj/item/reagent_containers/food/snacks/flatbread, + /obj/item/reagent_containers/food/snacks/flatbread, + /obj/item/reagent_containers/food/snacks/spreads/lard + ) + result = /obj/item/reagent_containers/food/snacks/lardwich + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index bb4e67aad7d..274aa5a2bba 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -76,6 +76,7 @@ chaitea spawn_reagent = "chaitea" ciderhot spawn_reagent = "ciderhot" hot_coco spawn_reagent = "hot_coco" + fatshouter_milk spawn_reagent = "fatshouter_milk" // ERT norepi spawn_reagent = "norepinephrine" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index bed8ed175e8..2c20f2bf8fd 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5498,8 +5498,10 @@ icon_state = "lard" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("fat" = 3) - nutriment_amt = 5 + +/obj/item/reagent_containers/food/snacks/spreads/lard/Initialize() + . = ..() + reagents.add_reagent("triglyceride", 5) /obj/item/reagent_containers/food/snacks/chipplate/tajcandy name = "plate of sugar tree candy" @@ -5541,5 +5543,17 @@ . = ..() reagents.add_reagent("sugar", 3) +/obj/item/reagent_containers/food/snacks/lardwich + name = "hro'zamal lard sandwhich" + desc = "A lard sandwhich prepared in the style of Hro'zamal, usually made from Schlorrgo lard." + icon_state = "lardwich" + nutriment_desc = list("bread" = 2) + nutriment_amt = 6 + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/lardwich/Initialize() + . = ..() + reagents.add_reagent("triglyceride", 5) + #undef NUTRIMENT_GOOD #undef NUTRIMENT_BAD diff --git a/html/changelogs/alberyk-coolloadoutstuff.yml b/html/changelogs/alberyk-coolloadoutstuff.yml new file mode 100644 index 00000000000..d35fea701c6 --- /dev/null +++ b/html/changelogs/alberyk-coolloadoutstuff.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1, Chada1 + +delete-after: True + +changes: + - rscadd: "Added new Tajaran related items to the loadout." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index ebace966d27..322f24ef300 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 6ca9c65f019..0980ba8e6da 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 62e38a138b8..ed7558490a6 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 5b7c2fe4816..e8ffe93eb51 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index e2efd00fa3f..286e7d876ac 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ