mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 14:31:59 +01:00
Adding the new cigarettes and tobacco in the loadout. (#7764)
This commit is contained in:
Wowzewow (Wezzy)
@@ -237,19 +237,6 @@
|
||||
item_state = "Dpacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/pra
|
||||
name = "\improper Working Tajara packet"
|
||||
desc = "A packet of six adhomian \"Working Tajara?\" cigarettes, imported straight from the People's Republic of Adhomai."
|
||||
icon_state = "prapacket"
|
||||
item_state = "prapacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/pra
|
||||
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard)
|
||||
storage_slots = 7
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/pra/fill()
|
||||
..()
|
||||
new /obj/item/tajcard(src)
|
||||
|
||||
/obj/item/storage/fancy/cigar
|
||||
name = "cigar case"
|
||||
desc = "A case for holding your cigars when you are not smoking them."
|
||||
@@ -313,11 +300,25 @@
|
||||
|
||||
/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."
|
||||
desc = "A packet of six Lucky Strike cigarettes. Rumored to be part of an Idris money laundering scheme, its original purpose long forgotten."
|
||||
icon_state = "Fpacket"
|
||||
item_state = "Fpacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/rugged
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/pra
|
||||
name = "\improper Working Tajara cigarette packet"
|
||||
desc = "A packet of six adhomian \"Working Tajara\" cigarettes, imported straight from the People's Republic of Adhomai."
|
||||
icon_state = "prapacket"
|
||||
item_state = "prapacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/pra
|
||||
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard)
|
||||
storage_slots = 7
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/pra/fill()
|
||||
..()
|
||||
new /obj/item/tajcard(src)
|
||||
|
||||
|
||||
/*
|
||||
* Vial Box
|
||||
*/
|
||||
|
||||
@@ -166,14 +166,14 @@
|
||||
//loose leaf
|
||||
|
||||
/obj/item/storage/chewables/rollable/bad
|
||||
name = "box of S'th Kasavakh tobacco"
|
||||
name = "box of S'th Kasavakh tobacco leaves"
|
||||
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"
|
||||
name = "box of Agyre Lake tobacco leaves"
|
||||
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"
|
||||
@@ -187,14 +187,14 @@
|
||||
use_sound = 'sound/items/storage/box.ogg'
|
||||
|
||||
/obj/item/storage/chewables/rollable/fine
|
||||
name = "box of Excelsior Epsilon tobacco"
|
||||
name = "box of Excelsior Epsilon tobacco leaves"
|
||||
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"
|
||||
name = "box of Golden Sol tobacco leaves"
|
||||
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"
|
||||
|
||||
@@ -1,35 +1,90 @@
|
||||
/datum/gear/smokingpipe
|
||||
display_name = "pipe, smoking"
|
||||
path = /obj/item/clothing/mask/smokable/pipe
|
||||
|
||||
/datum/gear/cornpipe
|
||||
display_name = "pipe, corn"
|
||||
path = /obj/item/clothing/mask/smokable/pipe/cobpipe
|
||||
|
||||
/datum/gear/matchbook
|
||||
/datum/gear/smoking
|
||||
display_name = "matchbook"
|
||||
path = /obj/item/storage/box/matches
|
||||
sort_category = "Smoking"
|
||||
|
||||
/datum/gear/zippo
|
||||
/datum/gear/smoking/zippo
|
||||
display_name = "zippo"
|
||||
path = /obj/item/flame/lighter/zippo
|
||||
|
||||
/datum/gear/lighter
|
||||
/datum/gear/smoking/lighter
|
||||
display_name = "cheap lighter"
|
||||
path = /obj/item/flame/lighter
|
||||
|
||||
/datum/gear/cigarcase
|
||||
/datum/gear/smoking/cigarcase
|
||||
display_name = "cigar case"
|
||||
path = /obj/item/storage/fancy/cigar
|
||||
cost = 2
|
||||
|
||||
/datum/gear/cigarette
|
||||
display_name = "cigarette packet"
|
||||
/datum/gear/smoking/cigarettes
|
||||
display_name = "cigarette packet selection"
|
||||
description = "A selection of cigarette packets."
|
||||
path = /obj/item/storage/fancy/cigarettes
|
||||
cost = 2
|
||||
|
||||
/datum/gear/dromedaryco
|
||||
display_name = "dromedaryco cigarette packet"
|
||||
path = /obj/item/storage/fancy/cigarettes/dromedaryco
|
||||
/datum/gear/smoking/cigarettes/New()
|
||||
..()
|
||||
var/cigarettes = list()
|
||||
cigarettes["Lucky Strike cigarette packet"] = /obj/item/storage/fancy/cigarettes/rugged
|
||||
cigarettes["Trans-Stellar Duty Free cigarette packet"] = /obj/item/storage/fancy/cigarettes
|
||||
cigarettes["DromedaryCo cigarette packet"] = /obj/item/storage/fancy/cigarettes/dromedaryco
|
||||
cigarettes["Nico-Tine cigarette packet"] = /obj/item/storage/fancy/cigarettes/nicotine
|
||||
cigarettes["Working Tajara cigarette packet"] = /obj/item/storage/fancy/cigarettes/pra
|
||||
gear_tweaks += new/datum/gear_tweak/path(cigarettes)
|
||||
|
||||
/datum/gear/pracigarette
|
||||
display_name = "working tajara cigarette packet"
|
||||
path = /obj/item/storage/fancy/cigarettes/pra
|
||||
/datum/gear/smoking/chew
|
||||
display_name = "chewing tobacco selection"
|
||||
description = "A selection of chewing tobacco."
|
||||
path = /obj/item/storage/chewables/tobacco
|
||||
cost = 2
|
||||
|
||||
/datum/gear/smoking/chew/New()
|
||||
..()
|
||||
var/chews = list()
|
||||
chews["Rredouane Cuts chewing tobacco"] = /obj/item/storage/chewables/tobacco/bad
|
||||
chews["Mendell Smooth chewing tobacco"] = /obj/item/storage/chewables/tobacco
|
||||
chews["Taba-Kamu chewing tobacco"] = /obj/item/storage/chewables/tobacco/fine
|
||||
chews["box of Nico-Tine gum"] = /obj/item/storage/fancy/chewables/tobacco/nico
|
||||
gear_tweaks += new/datum/gear_tweak/path(chews)
|
||||
|
||||
/datum/gear/smoking/leaves
|
||||
display_name = "tobacco leaf selection"
|
||||
description = "A selection of tobacco leaves."
|
||||
path = /obj/item/storage/chewables/rollable
|
||||
cost = 2
|
||||
|
||||
/datum/gear/smoking/leaves/New()
|
||||
..()
|
||||
var/leaves = list()
|
||||
leaves["S'th Kasavakh tobacco leaves"] = /obj/item/storage/chewables/rollable/bad
|
||||
leaves["Agyre Lake tobacco leaves"] = /obj/item/storage/chewables/rollable
|
||||
leaves["Excelsior Epsilon tobacco leaves"] = /obj/item/storage/chewables/rollable/fine
|
||||
leaves["Golden Sol tobacco leaves"] = /obj/item/storage/chewables/rollable/nico
|
||||
gear_tweaks += new/datum/gear_tweak/path(leaves)
|
||||
|
||||
/datum/gear/smoking/pipe
|
||||
display_name = "pipe selection"
|
||||
path = /obj/item/clothing/mask/smokable/pipe
|
||||
|
||||
/datum/gear/smoking/pipe/New()
|
||||
..()
|
||||
var/pipe = list()
|
||||
pipe["smoking pipe"] = /obj/item/clothing/mask/smokable/pipe
|
||||
pipe["smoking pipe, corn"] = /obj/item/clothing/mask/smokable/pipe/cobpipe
|
||||
gear_tweaks += new/datum/gear_tweak/path(pipe)
|
||||
|
||||
/datum/gear/smoking/cigfilters
|
||||
display_name = "cigarette filters"
|
||||
path = /obj/item/storage/cigfilters
|
||||
|
||||
/datum/gear/smoking/cigpaper
|
||||
display_name = "cigarette paper selection"
|
||||
description = "A selection of cigarette papers."
|
||||
path = /obj/item/storage/fancy/cigpaper
|
||||
|
||||
/datum/gear/smoking/cigpaper/New()
|
||||
..()
|
||||
var/cigpaper = list()
|
||||
cigpaper["Gen. Eric cigarette paper"] = /obj/item/storage/fancy/cigpaper
|
||||
cigpaper["Trident cigarette paper"] = /obj/item/storage/fancy/cigpaper/fine
|
||||
gear_tweaks += new/datum/gear_tweak/path(cigpaper)
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Wowzewow (Wezzy)
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "New cigarette and tobacco stuff has been added to the loadout. They are in a new tab."
|
||||
- imageadd: "Improves PRA cigarettebox sprite."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.1 KiB |
Reference in New Issue
Block a user