cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NON MODULAR] Vape carts + THC tweaks (#8285)

Browse Source 
* 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
This commit is contained in:
linnpap
2021-10-13 21:08:32 +01:00
committed by GitHub
parent fa519bdde3
commit c2ff1c674b
9 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cigs_lighters.dm
+1 -1
View File
@@ -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)
code/modules/hydroponics/grown/cannabis.dm
+5 -4
View File
@@ -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
code/modules/vending/cigarette.dm
+11 -2
View File
@@ -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,
icons/obj/reagentfillings.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
+8
View File
@@ -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"
modular_skyrat/modules/morenarcotics/chemistry/reagents/thc.dm
+1
View File
@@ -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"))
..()
modular_skyrat/modules/morenarcotics/icons/crack.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

modular_skyrat/modules/morenarcotics/items/vapecarts.dm
+94
View File
@@ -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
tgstation.dme
+1
View File
@@ -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"