cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-27 22:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into economy-update-junk

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
parent 7b9f638832 0584d6b79a
commit c7c6e2d193
196 changed files with 865 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cigs_lighters.dm
+7 -5
View File
@@ -502,9 +502,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/cigarettes.dmi'
icon_state = "zippo"
item_state = "zippo"
heat = 1500
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
w_class = WEIGHT_CLASS_TINY
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
resistance_flags = FIRE_PROOF
price = 1
light_color = LIGHT_COLOR_FIRE
var/lit = 0
var/fancy = TRUE
var/overlay_state
@@ -514,10 +520,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
"thirteen",
"snake"
)
heat = 1500
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
/obj/item/lighter/Initialize()
. = ..()
@@ -906,7 +908,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = null
item_state = null
w_class = WEIGHT_CLASS_NORMAL
light_color = "#FFCC66"
light_color = COLOR_CREAMY_ORANGE
var/icon_off = "bong"
var/icon_on = "bong_lit"
var/chem_volume = 100