mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 20:11:04 +01:00
The Rollable Cigs and Chews Update (#7631)
This commit is contained in:
Wowzewow (Wezzy)
@@ -118,7 +118,7 @@
|
||||
desc = "A faithful box that will remain with you, no matter where you go, and probably save you."
|
||||
icon_state = "e_box"
|
||||
autodrobe_no_remove = 1
|
||||
starts_with = list(/obj/item/clothing/mask/breath = 1,
|
||||
starts_with = list(/obj/item/clothing/mask/breath = 1,
|
||||
/obj/item/tank/emergency_oxygen = 1,
|
||||
/obj/item/device/flashlight/flare = 1
|
||||
)
|
||||
@@ -476,6 +476,7 @@
|
||||
W.lit = 1
|
||||
W.damtype = "burn"
|
||||
W.icon_state = "match_lit"
|
||||
W.item_state = "match_lit"
|
||||
START_PROCESSING(SSprocessing, W)
|
||||
else
|
||||
playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
|
||||
|
||||
@@ -151,11 +151,16 @@
|
||||
//CIG PACK//
|
||||
////////////
|
||||
/obj/item/storage/fancy/cigarettes
|
||||
name = "cigarette packet"
|
||||
desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
|
||||
name = "Trans-Stellar Duty Free cigarette packet"
|
||||
desc = "A ubiquitous brand of cigarettes, found in the facilities of every major spacefaring corporation in the universe. As mild and flavorless as it gets."
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "cigpacket"
|
||||
item_state = "cigpacket"
|
||||
icon_type = "cigarette"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
use_sound = 'sound/items/drop/paper.ogg'
|
||||
w_class = 1
|
||||
@@ -163,8 +168,7 @@
|
||||
slot_flags = SLOT_BELT
|
||||
storage_slots = 6
|
||||
var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette
|
||||
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/cigbutt)
|
||||
icon_type = "cigarette"
|
||||
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt)
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/Initialize()
|
||||
flags |= NOREACT
|
||||
@@ -213,21 +217,21 @@
|
||||
// get it? A - AcmeCo, B - Blank, C - Cigar, D - DromedaryCo. How convenient is that? - Wezzy
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/acmeco
|
||||
name = "\improper AcmeCo packet"
|
||||
name = "\improper AcmeCo cigarette 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 = "Apacket"
|
||||
item_state = "Apacket" //Doesn't have an inhand state, but neither does dromedary, so, ya know..
|
||||
item_state = "Apacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/acmeco
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/blank
|
||||
name = "\improper blank packet"
|
||||
name = "\improper blank cigarette packet"
|
||||
desc = "A packet of six blank cigarettes. The healthiest cigarettes on the market!"
|
||||
icon_state = "Bpacket"
|
||||
item_state = "Bpacket" //Doesn't have an inhand state, but neither does dromedary, so, ya know..
|
||||
item_state = "Bpacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/blank
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/dromedaryco
|
||||
name = "\improper DromedaryCo packet"
|
||||
name = "\improper DromedaryCo cigarette 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"
|
||||
@@ -239,12 +243,16 @@
|
||||
icon_state = "cigarcase"
|
||||
item_state = "cigarcase"
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
drop_sound = 'sound/items/drop/gloves.ogg'
|
||||
use_sound = 'sound/items/drop/paper.ogg'
|
||||
drop_sound = 'sound/items/drop/shovel.ogg'
|
||||
use_sound = 'sound/items/storage/briefcase.ogg'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
w_class = 1
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
storage_slots = 7
|
||||
storage_slots = 8
|
||||
can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar)
|
||||
icon_type = "cigar"
|
||||
|
||||
@@ -283,6 +291,20 @@
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/nicotine
|
||||
name = "\improper Nico-Tine cigarette packet"
|
||||
desc = "A packet of six Nico-Tine cigarettes. Allegedly advertised as the most enviromentally friendly cigarettes in the market. It doesn't specify how, but it definitely isn't your body."
|
||||
icon_state = "Epacket"
|
||||
item_state = "Epacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/nicotine
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/rugged
|
||||
name = "\improper Lucky Strike cigarette packet"
|
||||
desc = "A packet of six Lucky Strike cigarettes. Rumored to be part of an Idris money laundering scheme, it's original purpose long forgotten."
|
||||
icon_state = "Fpacket"
|
||||
item_state = "Fpacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/rugged
|
||||
|
||||
/*
|
||||
* Vial Box
|
||||
*/
|
||||
|
||||
@@ -48,3 +48,149 @@
|
||||
/obj/item/storage/box/pineapple/fill()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
//cigarette papers
|
||||
/obj/item/storage/fancy/cigpaper
|
||||
name = "\improper Gen. Eric cigarette paper"
|
||||
desc = "A ubiquitous brand of cigarette paper, allegedly endorsed by 24th century war hero General Eric Osmundsun for rolling your own cigarettes. Osmundsun died in a freak kayak accident. As it ate him alive during his last campaign. It was pretty freaky."
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "cigpaperbook_generic"
|
||||
item_state = "cigpacket"
|
||||
drop_sound = 'sound/items/drop/wrapper.ogg'
|
||||
use_sound = 'sound/items/drop/paper.ogg'
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
w_class = 2
|
||||
max_storage_space = 10
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
starts_with = list(/obj/item/paper/cig = 10)
|
||||
make_exact_fit()
|
||||
|
||||
/obj/item/storage/fancy/cigpaper/update_icon()
|
||||
. = ..()
|
||||
if(contents.len)
|
||||
icon_state = "[initial(icon_state)]"
|
||||
else
|
||||
icon_state = "[initial(icon_state)]_empty"
|
||||
|
||||
/obj/item/storage/cigfilters
|
||||
name = "box of cigarette filters"
|
||||
desc = "A box of generic cigarette filters for those who rolls their own but prefers others to inhale the fumes."
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "cigfilters_generic"
|
||||
item_state = "cigpacket"
|
||||
w_class = 2
|
||||
starts_with = list(/obj/item/paper/cig/filter = 10)
|
||||
make_exact_fit()
|
||||
|
||||
/obj/item/storage/fancy/cigpaper/fine
|
||||
name = "\improper Trident cigarette paper"
|
||||
desc = "A fancy brand of Trident cigarette paper, for rolling your own cigarettes. Like a person who appreciates the finer things in life."
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "cigpaperbook_fine"
|
||||
item_state = "Dpacket"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
starts_with = list(/obj/item/paper/cig/fine = 10)
|
||||
|
||||
//chewing tobacco
|
||||
/obj/item/storage/chewables
|
||||
name = "box of chewing wads master"
|
||||
desc = "A generic brand of Waffle Co Wads, unflavored chews. Why do these exist?"
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "placeholder"
|
||||
item_state = "cigpacket"
|
||||
drop_sound = 'sound/items/drop/shovel.ogg'
|
||||
use_sound = 'sound/items/storage/pillbottle.ogg'
|
||||
w_class = 2
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6)
|
||||
make_exact_fit()
|
||||
|
||||
/obj/item/storage/chewables/tobacco/bad
|
||||
name = "can of Rredouane Cuts chewing tobacco"
|
||||
desc = "A cheap, widely used replacement for cigarettes, it provided much needed respite for soldiers in Adhomian wars."
|
||||
icon_state = "chew_bad"
|
||||
item_state = "Fpacket"
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/bad = 6)
|
||||
|
||||
/obj/item/storage/chewables/tobacco
|
||||
name = "tin of Mendell Smooth chewing tobacco"
|
||||
desc = "Packaged and shipped straight from District 8, popularised by the city-slickers of Vega De Rosa."
|
||||
icon_state = "chew_generic"
|
||||
item_state = "cigpacket"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/generic = 6)
|
||||
storage_slots = 6
|
||||
|
||||
/obj/item/storage/chewables/tobacco/fine
|
||||
name = "tin of Taba-Kamu chewing tobacco"
|
||||
desc = "Said to be cultivated by employees of Nojusuru Foods in secret, the strand has been released for the public to enjoy."
|
||||
icon_state = "chew_fine"
|
||||
item_state = "Dpacket"
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6)
|
||||
|
||||
/obj/item/storage/fancy/chewables/tobacco/nico
|
||||
name = "box of Nico-Tine gum"
|
||||
desc = "A Sol-approved brand of nicotine gum. Cut out the middleman for your addiction fix."
|
||||
icon = 'icons/obj/cigs_lighters.dmi'
|
||||
icon_state = "chew_nico"
|
||||
item_state = "Epacket"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/nico = 6)
|
||||
storage_slots = 6
|
||||
drop_sound = 'sound/items/drop/box.ogg'
|
||||
use_sound = 'sound/items/storage/box.ogg'
|
||||
|
||||
/obj/item/storage/fancy/chewables/tobacco/update_icon()
|
||||
icon_state = "[initial(icon_state)][contents.len]"
|
||||
|
||||
//loose leaf
|
||||
|
||||
/obj/item/storage/chewables/rollable/bad
|
||||
name = "box of S'th Kasavakh tobacco"
|
||||
desc = "A box of coarse gritty tobacco which still manages to grow against the desertification of Moghes."
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/bad = 8)
|
||||
icon_state = "roll_bad"
|
||||
item_state = "Fpacket"
|
||||
|
||||
/obj/item/storage/chewables/rollable
|
||||
name = "box of Agyre Lake tobacco"
|
||||
desc = "Advertised to be grown using fresh water pumped directly from the titular Martian lake."
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco = 8)
|
||||
icon_state = "roll_generic"
|
||||
item_state = "cigpacket"
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
|
||||
)
|
||||
max_storage_space = 8
|
||||
drop_sound = 'sound/items/drop/box.ogg'
|
||||
use_sound = 'sound/items/storage/box.ogg'
|
||||
|
||||
/obj/item/storage/chewables/rollable/fine
|
||||
name = "box of Excelsior Epsilon tobacco"
|
||||
desc = "Quality tobacco favored by the Corporates of Eridani - just don't read the label at the bottom."
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/fine = 8)
|
||||
icon_state = "roll_fine"
|
||||
item_state = "Dpacket"
|
||||
|
||||
/obj/item/storage/chewables/rollable/nico
|
||||
name = "box of Golden Sol tobacco"
|
||||
desc = "A exclusive brand of overpriced tobacco, allegedly grown at a lagrange point station in Sol system."
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/pure = 8)
|
||||
icon_state = "roll_nico"
|
||||
item_state = "Epacket"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user