Maintenance Cigarettes (#8438)

* maintcigs * Update code/game/objects/items/weapons/storage/fancy.dm Co-authored-by: Firefox13 <57810301+Firefox13@users.noreply.github.com> * fix tested dont worry * Update code/game/objects/items/weapons/storage/fancy.dm alright fiiiiiiiiiiiine Co-authored-by: Firefox13 <57810301+Firefox13@users.noreply.github.com> * heres your fix * Update code/game/objects/items/weapons/cigs_lighters.dm Co-authored-by: Firefox13 <57810301+Firefox13@users.noreply.github.com> --------- Co-authored-by: Firefox13 <57810301+Firefox13@users.noreply.github.com>
discordia-space · Mar 8, 2024 · 62d5d3b · 62d5d3b
1 parent a4b65f3
commit 62d5d3b
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 9 deletions.
diff --git a/code/__DEFINES/spawner/_spawner.dm b/code/__DEFINES/spawner/_spawner.dm
@@ -387,6 +387,15 @@
 #define SPAWN_TAG_MEDICINE_CONTRABAND SPAWN_TAG_MEDICINE+";"+SPAWN_CONTRABAND
 #define SPAWN_TAG_MEDICINE_ADVANCED SPAWN_TAG_MEDICINE+";"+SPAWN_MEDICINE_ADVANCED
 
+//ITEMS - DRUGS
+#define SPAWN_DRUG "drug"
+#define SPAWN_CIGARETTE "cigarettes"
+#define SPAWN_CIGARETTE_MAINTS "maint cigarettes"
+
+#define SPAWN_TAG_DRUG SPAWN_TAG_ITEM+";"+SPAWN_DRUG
+#define SPAWN_TAG_CIGARETTE SPAWN_TAG_DRUG+";"+SPAWN_CIGARETTE
+#define SPAWN_TAG_CIGARETTE_MAINTS SPAWN_TAG_DRUG+";"+SPAWN_CIGARETTE_MAINTS
+
 //ITEMS - BEAKER
 #define SPAWN_TAG_VIAL SPAWN_TAG_ITEM+";"+SPAWN_SCIENCE+";"+SPAWN_MEDICAL+";beaker;vial"
 

diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -244,6 +244,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "cigoff"
 	w_class = ITEM_SIZE_TINY
 	slot_flags = SLOT_EARS | SLOT_MASK
+	spawn_tags = SPAWN_CIGARETTE
 	attack_verb = list("burnt", "singed")
 	icon_on = "cigon"  //Note - these are in masks.dmi not in cigarette.dmi
 	icon_off = "cigoff"
@@ -322,6 +323,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "nomadoff"
 	icon_on = "nomadon"
 	icon_off = "nomadoff"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
 	type_butt = /obj/item/trash/cigbutt/nomad
 
 /obj/item/clothing/mask/smokable/cigarette/lucky
@@ -331,8 +333,39 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "luckyoff"
 	icon_on = "luckyon"
 	icon_off = "luckyoff"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
 	type_butt = /obj/item/trash/cigbutt/lucky
 
+/obj/item/clothing/mask/smokable/cigarette/robusto
+	desc = "A roll of tobacco and nicotine. Gives the feeling of old wars. Let's crack some skulls!"
+	preloaded_reagents = list("nicotine" = 6, "violence" = 3)
+	icon_state = "robustoff"
+	item_state = "robustoff"
+	icon_on = "robuston"
+	icon_off = "robustoff"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	type_butt = /obj/item/trash/cigbutt/robusto
+
+/obj/item/clothing/mask/smokable/cigarette/buckshot
+	desc = "A roll of tobacco and nicotine. Maint cig, some say it helps take the edge off better than most."
+	preloaded_reagents = list("nicotine" = 6, "paracetamol" = 3)
+	icon_state = "klassikaoff"
+	item_state = "klassikaoff"
+	icon_on = "klassikaon"
+	icon_off = "klassikaoff"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	type_butt = /obj/item/trash/cigbutt/buckshot
+
+/obj/item/clothing/mask/smokable/cigarette/quasimorph
+	desc = "A roll of tobacco and nicotine. Maint cig, ancient paper, how old is this...?"
+	preloaded_reagents = list("nicotine" = 6, "dexalin" = 3)
+	icon_state = "kosmosoff"
+	item_state = "kosmosoff"
+	icon_on = "kosmoson"
+	icon_off = "kosmosoff"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	type_butt = /obj/item/trash/cigbutt/quasimorph
+
 ////////////
 // CIGARS //
 ////////////
@@ -407,6 +440,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/trash/cigbutt/lucky
 	icon_state = "luckybutt"
 
+/obj/item/trash/cigbutt/robusto
+	icon_state = "robustbutt"
+
+/obj/item/trash/cigbutt/buckshot
+	icon_state = "klassikabutt"
+
+/obj/item/trash/cigbutt/quasimorph
+	icon_state = "kosmosbutt"
+
 /////////////////
 //SMOKING PIPES//
 /////////////////

diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
@@ -150,6 +150,7 @@
 	w_class = ITEM_SIZE_TINY
 	throwforce = WEAPON_FORCE_HARMLESS
 	slot_flags = SLOT_BELT
+	spawn_tags = SPAWN_CIGARETTE
 	storage_slots = 6
 	item_obj = /obj/item/clothing/mask/smokable/cigarette
 	can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter)
@@ -220,31 +221,56 @@
 /obj/item/storage/fancy/cigarettes/dromedaryco
 	name = "\improper DromedaryCo packet"
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
-	icon_state = "Dpacket"
-	item_state = "Dpacket"
+	icon_state = "dromedary_packet"
+	item_state = "dromedary_packet"
 	item_obj = /obj/item/clothing/mask/smokable/cigarette/dromedaryco
 
 /obj/item/storage/fancy/cigarettes/killthroat
 	name = "\improper AcmeCo packet"
 	desc = "A packet of six AcmeCo cigarettes. For those who somehow want to obtain the record for the most amount of cancerous tumors."
-	icon_state = "Bpacket"
-	item_state = "Bpacket" //Doesn't have an inhand state, but neither does dromedary, so, ya know..
+	icon_state = "acme_packet"
+	item_state = "acme_packet" //Doesn't have an inhand state, but neither does dromedary, so, ya know..
 	item_obj = /obj/item/clothing/mask/smokable/cigarette/killthroat
 
 /obj/item/storage/fancy/cigarettes/homeless
 	name = "\improper Nomads packet"
 	desc = "A packet of six Nomads cigarettes. Nomads's Extra strong for when your life is more extra hard"
-	icon_state = "Cpacket"
-	item_state = "Cpacket"
+	icon_state = "nomad_packet"
+	item_state = "nomad_packet"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
 	item_obj = /obj/item/clothing/mask/smokable/cigarette/homeless
 
 /obj/item/storage/fancy/cigarettes/lucky
 	name = "\improper Lucky Strikes packet"
 	desc = "A packet of six Lucky Strikes cigarettes. For some reason the Syndicate loved these things back in the war, still around as surplus today."
-	icon_state = "luckpacket"
-	item_state = "luckpacket"
+	icon_state = "luck_packet"
+	item_state = "luck_packet"
 	item_obj = /obj/item/clothing/mask/smokable/cigarette/lucky
 
+/obj/item/storage/fancy/cigarettes/robusto
+	name = "\improper Red Robusto packet"
+	desc = "A packet of six Red Robusto Cigarettes. Old Nanotrasen cigs, some say they make you more robust..."
+	icon_state = "robusto_packet"
+	item_state = "robusto_packet"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	item_obj = /obj/item/clothing/mask/smokable/cigarette/robusto
+
+/obj/item/storage/fancy/cigarettes/buckshot
+	name = "\improper Klassika Filter packet"
+	desc = "A packet of six Klassika Filter Cigarettes. Old unknown brand, says 'Klassika Filter' on the front..."
+	icon_state = "klassika_packet"
+	item_state = "klassika_packet"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	item_obj = /obj/item/clothing/mask/smokable/cigarette/buckshot
+
+/obj/item/storage/fancy/cigarettes/quasimorph
+	name = "\improper Kosmos packet"
+	desc = "A packet of six Kosmos Cigarettes. Old Russian brand, says 'Космос' on the front, along with a white rocket."
+	icon_state = "kosmos_packet"
+	item_state = "kosmos_packet"
+	spawn_tags = SPAWN_TAG_CIGARETTE_MAINTS
+	item_obj = /obj/item/clothing/mask/smokable/cigarette/quasimorph
+
 /obj/item/storage/fancy/cigcartons
 	name = "carton of cigarettes"
 	desc = "A box containing 10 packets of cigarettes."

diff --git a/code/modules/scrap/oldificator.dm b/code/modules/scrap/oldificator.dm
@@ -178,6 +178,15 @@
 			reagents.remove_reagent(R.id,rand(0, R.volume),TRUE)
 		reagents.add_reagent("mold", rand(0, actual_volume - reagents.total_volume))
 
+//makes old cigarettes rank
+/obj/item/clothing/mask/smokable/cigarette/make_old(low_quality_oldification)
+	.=..()
+	if(. && (!low_quality_oldification))
+		var/actual_volume = reagents.total_volume
+		for(var/datum/reagent/R in reagents.reagent_list)
+			reagents.remove_reagent(R.id,rand(0, R.volume),TRUE)
+		reagents.add_reagent("mold", rand(0, actual_volume - reagents.total_volume))
+
 //Old chemical bottles also hide their reagents
 /obj/item/reagent_containers/glass/bottle/make_old(low_quality_oldification)
 	.=..()
@@ -426,7 +435,7 @@
 			else
 				qdel(src)
 		else
-			expend() 
+			expend()
 
 /obj/item/projectile/make_old(low_quality_oldification)
 	return // why would the bullet being old change anything?

diff --git a/code/modules/scrap/scrap.dm b/code/modules/scrap/scrap.dm
@@ -413,6 +413,7 @@ GLOBAL_LIST_EMPTY(scrap_base_cache)
 		SPAWN_BOOZE,
 		SPAWN_JUNK, SPAWN_CLEANABLE,
 		SPAWN_MATERIAL_JUNK,
+		SPAWN_CIGARETTE_MAINTS,
 		SPAWN_PART_ARMOR = 0.1
 	)
 

diff --git a/icons/inventory/face/icon.dmi b/icons/inventory/face/icon.dmi
diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi