From c2ff1c674bebcbd980f6ae07b9ab3d18fbe4573a Mon Sep 17 00:00:00 2001
From: linnpap <77863456+linnpap@users.noreply.github.com>
Date: Wed, 13 Oct 2021 15:08:32 -0500
Subject: [PATCH] [NON MODULAR] Vape carts + THC tweaks (#8285)

* cart life 2

* more carts

* 1984

* Update cigs_lighters.dm

* replaced empty mutatelists with null

* variable name shit

* bullshit

* muh indentations

* oh my fucking godDDD

* I LOVE BYOND

* please JUST FUCKING WORK

* suggested changes

* balance change
---
 code/game/objects/items/cigs_lighters.dm      |   2 +-
 code/modules/hydroponics/grown/cannabis.dm    |   9 +-
 code/modules/vending/cigarette.dm             |  13 ++-
 icons/obj/reagentfillings.dmi                 | Bin 6307 -> 6375 bytes
 .../code/modules/uplink/uplink_items.dm       |   8 ++
 .../morenarcotics/chemistry/reagents/thc.dm   |   1 +
 .../modules/morenarcotics/icons/crack.dmi     | Bin 5576 -> 5849 bytes
 .../modules/morenarcotics/items/vapecarts.dm  |  94 ++++++++++++++++++
 tgstation.dme                                 |   1 +
 9 files changed, 121 insertions(+), 7 deletions(-)
 create mode 100644 modular_skyrat/modules/morenarcotics/items/vapecarts.dm

diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 4b0cf87350b..a793bf36ab0 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -967,7 +967,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(!screw)
 			screw = TRUE
 			to_chat(user, span_notice("You open the cap on [src]."))
-			reagents.flags |= OPENCONTAINER
+			//reagents.flags |= OPENCONTAINER - SKYRAT REMOVAL - VAPE CARTS
 			if(obj_flags & EMAGGED)
 				add_overlay("vapeopen_high")
 			else if(super)
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 59ecbde8476..aee80304d3b 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -18,7 +18,8 @@
 						/obj/item/seeds/cannabis/death,
 						/obj/item/seeds/cannabis/white,
 						/obj/item/seeds/cannabis/ultimate)
-	reagents_add = list(/datum/reagent/drug/thc = 0.15, /datum/reagent/toxin/lipolicide = 0.35) //SKYRAT EDIT - MORENARCOTICS
+	reagents_add = list(/datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS
+	//axed lipolicide, replaced space drugs with thc
 
 
 /obj/item/seeds/cannabis/rainbow
@@ -40,7 +41,7 @@
 	plantname = "Deathweed"
 	product = /obj/item/food/grown/cannabis/death
 	mutatelist = null
-	reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15, /datum/reagent/toxin/lipolicide = 0.15) //SKYRAT EDIT - MORENARCOTICS
+	reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS
 	rarity = 40
 
 /obj/item/seeds/cannabis/white
@@ -52,7 +53,7 @@
 	instability = 30
 	product = /obj/item/food/grown/cannabis/white
 	mutatelist = null
-	reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15, /datum/reagent/toxin/lipolicide = 0.15) //SKYRAT EDIT - MORENARCOTICS
+	reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS
 	rarity = 40
 
 
@@ -73,7 +74,7 @@
 						/datum/reagent/drug/methamphetamine = 0.15,
 						/datum/reagent/drug/bath_salts = 0.15,
 						/datum/reagent/drug/krokodil = 0.15,
-						/datum/reagent/toxin/lipolicide = 0.15,
+						//SKYRAT REMOVAL // /datum/reagent/toxin/lipolicide = 0.15,
 						/datum/reagent/drug/nicotine = 0.1)
 	rarity = 69
 	graft_gene = /datum/plant_gene/trait/glow/green
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 20575d57543..ce19a8b0351 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -13,11 +13,20 @@
 		/obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
 		/obj/item/storage/box/matches = 10,
 		/obj/item/lighter/greyscale = 4,
-		/obj/item/storage/fancy/rollingpapers = 5
+		/obj/item/storage/fancy/rollingpapers = 5,
+		//SKYRAT EDIT START - VAPECARTS
+		/obj/item/clothing/mask/vape = 5,
+		/obj/item/reagent_containers/vapecart = 10
 	)
 	contraband = list(
-		/obj/item/clothing/mask/vape = 5
+		//SKYRAT REMOVAL - /obj/item/clothing/mask/vape = 5
+		/obj/item/reagent_containers/vapecart/empty = 5,
+		/obj/item/reagent_containers/vapecart/bluekush = 4,
+		/obj/item/reagent_containers/vapecart/reddiesel = 4,
+		/obj/item/reagent_containers/vapecart/pwrgame = 4,
+		/obj/item/reagent_containers/vapecart/cheese = 4
 	)
+	//SKYRAT EDIT END - VAPECARTS
 	premium = list(
 		/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
 		/obj/item/storage/box/gum/nicotine = 2,
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index dd4231f42060f47dd04f2ad0bbed5232ff0d3ebe..a6018cb115d2e1d76d7cab8c5e1f4dbd980d685f 100644
GIT binary patch
delta 4136
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
U_<JqM0C$`@X=hbpaV_@$08o4!;{X5v

delta 4104
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

diff --git a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
index e124a459de6..d36a56d931a 100644
--- a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
+++ b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
@@ -197,6 +197,14 @@
 	item = /obj/item/syndie_glue
 	cost = 3
 
+/datum/uplink_item/device_tools/syndikush
+	name = "Syndikush Green Crack cart"
+	desc = "A cheap Chinese vape cart that contains a potent combination of THC and \
+			stimulants. Not made with real crack."
+	item = /obj/item/reagent_containers/vapecart/syndicate
+	cost = 5
+	surplus = 90
+
 //AMMO
 /datum/uplink_item/ammo/pistolaps_traitor
 	name = "9mm Stechkin APS Magazine"
diff --git a/modular_skyrat/modules/morenarcotics/chemistry/reagents/thc.dm b/modular_skyrat/modules/morenarcotics/chemistry/reagents/thc.dm
index 73d6c69e561..885c206ef47 100644
--- a/modular_skyrat/modules/morenarcotics/chemistry/reagents/thc.dm
+++ b/modular_skyrat/modules/morenarcotics/chemistry/reagents/thc.dm
@@ -30,6 +30,7 @@
 	M.throw_alert("stoned", /atom/movable/screen/alert/stoned)
 	M.sound_environment_override = SOUND_ENVIRONMENT_DRUGGED
 	M.Dizzy(5 * REM * delta_time)
+	M.adjust_nutrition(-1 * REM * delta_time) //munchies
 	if(DT_PROB(3.5, delta_time))
 		M.emote(pick("laugh","giggle"))
 	..()
diff --git a/modular_skyrat/modules/morenarcotics/icons/crack.dmi b/modular_skyrat/modules/morenarcotics/icons/crack.dmi
index 6dfae2583198e3104d85d097e3cdeee8c79dcce3..63267682c2b37f4ffb5a8eb9009b04b0a25138a5 100644
GIT binary patch
literal 5849
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
BtHuBT

literal 5576
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
B1d0Fv

diff --git a/modular_skyrat/modules/morenarcotics/items/vapecarts.dm b/modular_skyrat/modules/morenarcotics/items/vapecarts.dm
new file mode 100644
index 00000000000..ced93697347
--- /dev/null
+++ b/modular_skyrat/modules/morenarcotics/items/vapecarts.dm
@@ -0,0 +1,94 @@
+/obj/item/reagent_containers/vapecart
+	name = "vape cart"
+	desc = "A vape cart filled with nicotine."
+	icon = 'modular_skyrat/modules/morenarcotics/icons/crack.dmi'
+	icon_state = "vapecart"
+	fill_icon_state = "vapecart"
+	volume = 50
+	possible_transfer_amounts = list()
+	list_reagents = list(/datum/reagent/drug/nicotine = 50)
+	fill_icon_thresholds = list(0, 5, 20, 40)
+	custom_price = PAYCHECK_ASSISTANT
+
+/obj/item/reagent_containers/vapecart/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity)
+		return
+	if(istype(target, /obj/item/clothing/mask/vape))
+		var/obj/item/clothing/mask/vape/target_vape = target
+		if(target_vape.screw == TRUE && !target_vape.reagents.total_volume)
+			src.reagents.trans_to(target_vape, src.volume, transfered_by = user)
+			qdel(src)
+			to_chat(user, span_notice("You plug the [src.name] into the vape.</span>"))
+		else if(!target_vape.screw)
+			to_chat(user, span_warning("You need to open the cap to do that!</span>"))
+		else
+			to_chat(user, span_warning("[target_vape] is already full!</span>"))
+
+/obj/item/reagent_containers/vapecart/empty
+	name = "customizable vape cart"
+	desc = "Fill with whatever hazardous concoction of chemicals you desire!"
+	list_reagents = list()
+	reagent_flags = OPENCONTAINER
+	var/labelled = FALSE
+
+/obj/item/reagent_containers/vapecart/empty/attack_self(mob/user)
+	if(reagents.total_volume > 0)
+		to_chat(user, span_notice("You empty [src] of all reagents.</span>"))
+		reagents.clear_reagents()
+
+/obj/item/reagent_containers/vapecart/empty/attackby(obj/item/attacked_item, mob/user, params)
+	if (istype(attacked_item, /obj/item/pen) || istype(attacked_item, /obj/item/toy/crayon))
+		if(!user.is_literate())
+			to_chat(user, span_notice("You scribble illegibly on the label of the vape cart!</span>"))
+			return
+		var/new_title = stripped_input(user, "What would you like to label the vape cart?", name, null, 53)
+		if(!user.canUseTopic(src, BE_CLOSE))
+			return
+		if(user.get_active_held_item() != attacked_item)
+			return
+		if(new_title)
+			labelled = TRUE
+			name = "[new_title]"
+		else
+			labelled = FALSE
+			update_name()
+	else
+		return ..()
+
+/obj/item/reagent_containers/vapecart/empty/update_name(updates)
+	. = ..()
+	if(labelled)
+		return
+	name = "customizable vape cart"
+
+//thc carts
+/obj/item/reagent_containers/vapecart/bluekush
+	name = "Dr. Breen's Blue Kush Reserve cart"
+	desc = "Don't smoke the carts... They put something in it... t-to make you forget! I don't even remember how I got here..."
+	list_reagents = list(/datum/reagent/drug/thc = 20, /datum/reagent/consumable/berryjuice = 10)
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/vapecart/reddiesel
+	name = "Resistance Red Diesel cart"
+	desc = "Seems to be endorsed by a real scientist!"
+	list_reagents = list(/datum/reagent/drug/thc = 20, /datum/reagent/consumable/dr_gibb = 10)
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/vapecart/pwrgame
+	name = "Pwr Haze cart"
+	desc = "When did Pwr Game get into the cart business?"
+	list_reagents = list(/datum/reagent/drug/thc = 20, /datum/reagent/consumable/pwr_game = 10)
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/vapecart/cheese
+	name = "Cheesie Honker OG Kush cart"
+	desc = "*Contains no real cheese."
+	list_reagents = list(/datum/reagent/drug/thc = 20, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/vapecart/syndicate
+	name = "Syndikush Green Crack cart"
+	desc = "Green Crack is a strain of sativa, not actual crack."
+	list_reagents = list(/datum/reagent/drug/thc = 20, /datum/reagent/medicine/stimulants = 10)
+	custom_price = PAYCHECK_MEDIUM
diff --git a/tgstation.dme b/tgstation.dme
index 137887bf293..56cab18bc1b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4831,6 +4831,7 @@
 #include "modular_skyrat\modules\morenarcotics\items\cocaine.dm"
 #include "modular_skyrat\modules\morenarcotics\items\crackpipe.dm"
 #include "modular_skyrat\modules\morenarcotics\items\thc.dm"
+#include "modular_skyrat\modules\morenarcotics\items\vapecarts.dm"
 #include "modular_skyrat\modules\moretraitoritems\code\game\objects\items\cards_id.dm"
 #include "modular_skyrat\modules\moretraitoritems\code\game\objects\items\granters.dm"
 #include "modular_skyrat\modules\moretraitoritems\code\game\objects\items\weaponry.dm"