mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Turns the station into 420-station 13. (#4971)
* adds rolling paper and joints F O U R T W E N T Y B L A Z E I T * adds joint sprites (they're pretty bad though) * adds rolling paper box, adds papers to cig vendors * c h a n g e l o g smoke weed every day
This commit is contained in:
@@ -836,6 +836,7 @@
|
||||
/obj/item/weapon/storage/fancy/cigarettes/luckystars = 5,
|
||||
/obj/item/weapon/storage/fancy/cigarettes/jerichos = 5,
|
||||
/obj/item/weapon/storage/fancy/cigarettes/menthols = 5,
|
||||
/obj/item/weapon/storage/fancy/rollingpapers = 5,
|
||||
/obj/item/weapon/storage/box/matches = 10,
|
||||
/obj/item/weapon/flame/lighter/random = 4)
|
||||
contraband = list(/obj/item/weapon/flame/lighter/zippo = 4)
|
||||
@@ -848,6 +849,7 @@
|
||||
/obj/item/weapon/storage/fancy/cigarettes/luckystars = 17,
|
||||
/obj/item/weapon/storage/fancy/cigarettes/jerichos = 22,
|
||||
/obj/item/weapon/storage/fancy/cigarettes/menthols = 18,
|
||||
/obj/item/weapon/storage/fancy/rollingpapers = 10,
|
||||
/obj/item/weapon/storage/box/matches = 1,
|
||||
/obj/item/weapon/flame/lighter/random = 2)
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ MATCHES
|
||||
CIGARETTES
|
||||
CIGARS
|
||||
SMOKING PIPES
|
||||
CUSTOM CIGS
|
||||
CHEAP LIGHTERS
|
||||
ZIPPO
|
||||
|
||||
@@ -454,6 +455,41 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
item_state = "cobpipe"
|
||||
chem_volume = 35
|
||||
|
||||
///////////////
|
||||
//CUSTOM CIGS//
|
||||
///////////////
|
||||
//and by custom cigs i mean craftable joints. smoke weed every day
|
||||
|
||||
/obj/item/clothing/mask/smokable/cigarette/joint
|
||||
name = "joint"
|
||||
desc = "This probably shouldn't ever show up."
|
||||
icon_state = "joint"
|
||||
max_smoketime = 500
|
||||
smoketime = 500
|
||||
nicotine_amt = 0
|
||||
|
||||
/obj/item/weapon/rollingpaper
|
||||
name = "rolling paper"
|
||||
desc = "A small, thin piece of easily flammable paper, commonly used for rolling and smoking various dried plants."
|
||||
icon = 'icons/obj/cigarettes.dmi'
|
||||
icon_state = "cig paper"
|
||||
|
||||
/obj/item/weapon/rollingpaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/reagent_containers/food/snacks))
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/grown/G = W
|
||||
if (!G.dry)
|
||||
user << "<span class='notice'>[G] must be dried before you roll it into [src].</span>"
|
||||
return
|
||||
var/obj/item/clothing/mask/smokable/cigarette/joint/J = new /obj/item/clothing/mask/smokable/cigarette/joint(user.loc)
|
||||
to_chat(usr,"<span class='notice'>You roll the [G.name] into a joint!</span>")
|
||||
J.add_fingerprint(user)
|
||||
if(G.reagents)
|
||||
G.reagents.trans_to_obj(J, G.reagents.total_volume)
|
||||
J.name = "[G.name] joint"
|
||||
J.desc = "A joint lovingly rolled and filled with [G.name]. Blaze it."
|
||||
qdel(G)
|
||||
qdel(src)
|
||||
|
||||
/////////
|
||||
//ZIPPO//
|
||||
/////////
|
||||
|
||||
@@ -253,6 +253,19 @@
|
||||
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
|
||||
..()
|
||||
|
||||
/obj/item/weapon/storage/fancy/rollingpapers
|
||||
name = "rolling paper pack"
|
||||
desc = "A small cardboard pack containing several folded rolling papers."
|
||||
icon_state = "paperbox"
|
||||
icon = 'icons/obj/cigarettes.dmi'
|
||||
w_class = ITEMSIZE_TINY
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_BELT
|
||||
storage_slots = 14
|
||||
can_hold = list(/obj/item/weapon/rollingpaper)
|
||||
icon_type = "paper"
|
||||
starts_with = list(/obj/item/weapon/rollingpaper = 14)
|
||||
|
||||
/*
|
||||
* Vial Box
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
################################
|
||||
# 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
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: battlefieldCommander
|
||||
|
||||
# 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: "Added craftable joints. Dry something (ideally ambrosia) on the drying rack and apply it to a rolling paper to create a joint you can smoke."
|
||||
- rscadd: "Added a box of rolling papers to the cigarette vending machine."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 21 KiB |
Reference in New Issue
Block a user