diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm index f1e3f6781e9..13580ab5816 100644 --- a/code/_globalvars/lists/maint_loot_tables.dm +++ b/code/_globalvars/lists/maint_loot_tables.dm @@ -159,6 +159,7 @@ GLOBAL_LIST_INIT(maintenance_loot_tier_2, list( /obj/item/storage/backpack/satchel_flat, /obj/item/storage/belt/military/traitor, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, + /obj/item/storage/fancy/cigarettes/cigpack_carcinoma, /obj/item/storage/pill_bottle/fakedeath, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/toolbox/syndicate, diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 98a3ee11893..97bf237230e 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1252,7 +1252,9 @@ /obj/item/storage/fancy/rollingpapers = 5, /obj/item/food/grown/tobacco/pre_dried = 5,) - contraband = list(/obj/item/storage/fancy/cigarettes/cigpack_midori = 6) + contraband = list(/obj/item/storage/fancy/cigarettes/cigpack_midori = 6, + /obj/item/storage/fancy/cigarettes/cigpack_carcinoma = 6 + ) prices = list(/obj/item/clothing/mask/cigarette/cigar = 100, /obj/item/storage/fancy/cigarettes/cigpack_carp = 25, @@ -1266,6 +1268,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 50, /obj/item/storage/fancy/cigarettes/cigpack_solar_rays = 25, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 35, + /obj/item/storage/fancy/cigarettes/cigpack_carcinoma = 70, /obj/item/reagent_containers/patch/nicotine = 70, /obj/item/storage/fancy/matches = 20, /obj/item/lighter/random = 40, @@ -1288,6 +1291,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_midori = 6, /obj/item/storage/fancy/cigarettes/cigpack_our_brand = 6, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 6, + /obj/item/storage/fancy/cigarettes/cigpack_carcinoma = 6, /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 10, /obj/item/storage/fancy/cigarettes/cigpack_solar_rays = 6, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6, @@ -1329,6 +1333,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 10, /obj/item/storage/fancy/cigarettes/cigpack_candy = 10, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 10, + /obj/item/storage/fancy/cigarettes/cigpack_carcinoma = 10, /obj/item/storage/fancy/cigarettes/cigpack_solar_rays = 10, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 10, /obj/item/reagent_containers/patch/nicotine = 20, diff --git a/code/game/objects/items/cigs.dm b/code/game/objects/items/cigs.dm index 3d90f444664..8325f22e9d1 100644 --- a/code/game/objects/items/cigs.dm +++ b/code/game/objects/items/cigs.dm @@ -422,6 +422,16 @@ LIGHTERS ARE IN LIGHTERS.DM desc = "A roll of dried plant matter wrapped in thin paper." list_reagents = list() +/obj/item/clothing/mask/cigarette/carcinoma + name = "\improper Carcinoma Angel cigarette" + desc = "A truly evil looking cigarette. The smell of tobacco is so overpowering that you can practically feel the cancer forming inside you already." + icon_state = "death_cig" + butt_type = /obj/item/cigbutt/death + +/obj/item/clothing/mask/cigarette/random/New() + list_reagents = list("nicotine" = 40, "dnicotine" = 10, pick("carpotoxin", "toxin", "atrazine") = 1) + ..() + /obj/item/cigbutt name = "cigarette butt" desc = "A manky old cigarette butt." @@ -435,6 +445,11 @@ LIGHTERS ARE IN LIGHTERS.DM desc = "A manky old cigarette butt with an evil look about it." icon_state = "syndie_cig_butt" +/obj/item/cigbutt/death + name = "dark cigarette butt" + desc = "A manky old cigarette butt, it did its part in the job of killing someone's lungs." + icon_state = "death_cig_butt" + /obj/item/cigbutt/Initialize(mapload) . = ..() scatter_atom() diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 459060142df..97f666b8831 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -401,6 +401,16 @@ cigarette_slogan = "Strong flavour, dense smoke, infused with omnizine." cigarette_type = /obj/item/clothing/mask/cigarette/syndicate +/obj/item/storage/fancy/cigarettes/cigpack_carcinoma + name = "\improper Carcinoma Angel packet" + desc = "True to their name, Carcinoma Angels will bring your breathless body to heaven. \ + This is an attempt to create the most cancerous cigarettes in the universe, for specific connoisseurs. \ + These cigarettes have been banned across most of known space due to their reckless marketing strategy and obvious health risks." + icon_state = "death_packet" + inhand_icon_state = "enigma_packet" + cigarette_slogan = "That which does not kill us makes us stronger." + cigarette_type = /obj/item/clothing/mask/cigarette/carcinoma + /obj/item/storage/fancy/rollingpapers name = "rolling paper pack" desc = "A pack of Nanotrasen brand rolling papers." diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index b7ffccd5863..9c5ac733b23 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -165,6 +165,29 @@ return ..() +/datum/reagent/nicotine/dense + name = "Densed Nicotine" + id = "dnicotine" + description = "Deals minor lung damage. If overdosed it will also deal toxin and oxygen damage." + color = "#305e47" + overdose_threshold = 15 + minor_addiction = FALSE + taste_description = "harsh" + +/datum/reagent/nicotine/dense/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + var/death_smoke_message = pick("You feel grimy.", "You feel less lively.", "You feel more bleak.", "You feel you're dying inside.", "You feel you're one step closer to grave.") + if(prob(10)) + to_chat(M, "[death_smoke_message]") + + var/obj/item/organ/internal/lungs/A = M.get_int_organ(/obj/item/organ/internal/lungs) + if(ishuman(M)) + if(prob(5)) + A.receive_damage(1) + M.emote("cough") + + return ..() | update_flags + // basic antistun chem, removes stuns and stamina, mild downsides /datum/reagent/crank name = "Crank" diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index fe6c037e0e8..15bbb5552b0 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/inhands/smoking_lefthand.dmi b/icons/mob/inhands/smoking_lefthand.dmi index aaa9074dd2f..9baeb19b576 100644 Binary files a/icons/mob/inhands/smoking_lefthand.dmi and b/icons/mob/inhands/smoking_lefthand.dmi differ diff --git a/icons/mob/inhands/smoking_righthand.dmi b/icons/mob/inhands/smoking_righthand.dmi index 0ca2b29fb08..656b23e73ec 100644 Binary files a/icons/mob/inhands/smoking_righthand.dmi and b/icons/mob/inhands/smoking_righthand.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index 5da35e6fba2..2fa6e0b326c 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/clothing/smoking.dmi b/icons/obj/clothing/smoking.dmi index d6c59c613aa..5705158ea9a 100644 Binary files a/icons/obj/clothing/smoking.dmi and b/icons/obj/clothing/smoking.dmi differ