Tajaran Update: A Clockwork Earthen-Root (#9086)

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)

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."))

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