mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-19 05:26:28 +00:00
7d47fbef42
## About The Pull Request Fixes #71826 This does the following: - Makes candles a subtype of flare - Fixes candles having lighting inconsistencies - Fixes burning items (welder, candles, flares, etc.) not causing ignition effects when held in hand - Adds burnt flares and melted candles to maint loot and trash spawners - Add match lighting sound when candles are lit - Add time defines for fuel amounts and rounded them (ex. instead of 32.3333 minutes, it's now 35 minutes) - Light sources that burn will now spawn a trash item once fuel is spent - Light sources that burn now have a welder hitsound - Light sources that burn can now be extinguished by a fire extinguisher (except flares) - Light sources that burn can now be used to ignite another object on fire (ex. a lit candle can be used to light a cigarette) - Light sources that burn and are lit now do `BURN` damage while attacking ## Why It's Good For The Game Code is more cleaner and consistent. Also fixes some bugs. ## Changelog 🆑 soundadd: Candles will now use the match lighting sound when lit soundadd: Light sources that burn will now have a welding hitsound fix: Fix candle light behaving erratically fix: Fix burning items that are held in hand will now have an ignition effect on the turf. (ex. lit welders in hand will now ignite plasma in the air) balance: Light sources that burn and are lit now do `BURN` damage while attacking balance: Light sources fuel amounts were rounded to exact numbers (ex. instead of 32.3333 minutes, it's now 35 minutes) qol: Light items that burn can now be extinguished by a fire extinguisher (except flares), used to ignite another object on fire, and will now leave a trash item once fuel is used qol: Add burnt flares and melted candles to trash spawners refactor: Refactor lighting items that use fuel to be more robust /🆑 Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
159 lines
4.1 KiB
Plaintext
159 lines
4.1 KiB
Plaintext
/datum/export/toolbox
|
|
cost = CARGO_CRATE_VALUE * 0.02
|
|
unit_name = "toolbox"
|
|
export_types = list(/obj/item/storage/toolbox)
|
|
|
|
// mechanical toolbox: 22cr
|
|
// emergency toolbox: 17-20cr
|
|
// electrical toolbox: 36cr
|
|
// robust: priceless
|
|
|
|
// Basic tools
|
|
/datum/export/screwdriver
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "screwdriver"
|
|
export_types = list(/obj/item/screwdriver)
|
|
include_subtypes = FALSE
|
|
|
|
/datum/export/wrench
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "wrench"
|
|
export_types = list(/obj/item/wrench)
|
|
|
|
/datum/export/crowbar
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "crowbar"
|
|
export_types = list(/obj/item/crowbar)
|
|
|
|
/datum/export/wirecutters
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "pair"
|
|
message = "of wirecutters"
|
|
export_types = list(/obj/item/wirecutters)
|
|
|
|
|
|
/datum/export/weldingtool
|
|
cost = CARGO_CRATE_VALUE * 0.025
|
|
unit_name = "welding tool"
|
|
export_types = list(/obj/item/weldingtool)
|
|
include_subtypes = FALSE
|
|
|
|
/datum/export/weldingtool/emergency
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "emergency welding tool"
|
|
export_types = list(/obj/item/weldingtool/mini)
|
|
|
|
/datum/export/weldingtool/industrial
|
|
cost = CARGO_CRATE_VALUE * 0.05
|
|
unit_name = "industrial welding tool"
|
|
export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
|
|
|
|
|
|
/datum/export/extinguisher
|
|
cost = CARGO_CRATE_VALUE * 0.075
|
|
unit_name = "fire extinguisher"
|
|
export_types = list(/obj/item/extinguisher)
|
|
include_subtypes = FALSE
|
|
|
|
/datum/export/extinguisher/mini
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "pocket fire extinguisher"
|
|
export_types = list(/obj/item/extinguisher/mini)
|
|
|
|
|
|
/datum/export/flashlight
|
|
cost = CARGO_CRATE_VALUE * 0.025
|
|
unit_name = "flashlight"
|
|
export_types = list(/obj/item/flashlight)
|
|
include_subtypes = FALSE
|
|
|
|
/datum/export/flashlight/flare
|
|
cost = CARGO_CRATE_VALUE * 0.01
|
|
unit_name = "flare"
|
|
export_types = list(/obj/item/flashlight/flare)
|
|
|
|
/datum/export/flashlight/seclite
|
|
cost = CARGO_CRATE_VALUE * 0.05
|
|
unit_name = "seclite"
|
|
export_types = list(/obj/item/flashlight/seclite)
|
|
|
|
|
|
/datum/export/analyzer
|
|
cost = CARGO_CRATE_VALUE * 0.025
|
|
unit_name = "analyzer"
|
|
export_types = list(/obj/item/analyzer)
|
|
|
|
/datum/export/analyzer/t_scanner
|
|
cost = CARGO_CRATE_VALUE * 0.025
|
|
unit_name = "t-ray scanner"
|
|
export_types = list(/obj/item/t_scanner)
|
|
|
|
|
|
/datum/export/radio
|
|
cost = CARGO_CRATE_VALUE * 0.025
|
|
unit_name = "radio"
|
|
export_types = list(/obj/item/radio)
|
|
exclude_types = list(/obj/item/radio/mech)
|
|
|
|
//Advanced/Power Tools.
|
|
/datum/export/weldingtool/experimental
|
|
cost = CARGO_CRATE_VALUE * 0.45
|
|
unit_name = "experimental welding tool"
|
|
export_types = list(/obj/item/weldingtool/experimental)
|
|
|
|
/datum/export/jawsoflife
|
|
cost = CARGO_CRATE_VALUE * 0.5
|
|
unit_name = "jaws of life"
|
|
export_types = list(/obj/item/crowbar/power)
|
|
|
|
/datum/export/handdrill
|
|
cost = CARGO_CRATE_VALUE * 0.5
|
|
unit_name = "hand drill"
|
|
export_types = list(/obj/item/screwdriver/power)
|
|
|
|
/datum/export/rld_mini
|
|
cost = CARGO_CRATE_VALUE * 0.75
|
|
unit_name = "mini rapid lighting device"
|
|
export_types = list(/obj/item/construction/rld/mini)
|
|
|
|
/datum/export/rsf
|
|
cost = CARGO_CRATE_VALUE * 0.5
|
|
unit_name = "rapid service fabricator"
|
|
export_types = list(/obj/item/rsf)
|
|
|
|
/datum/export/rcd
|
|
cost = CARGO_CRATE_VALUE * 0.5
|
|
unit_name = "rapid construction device"
|
|
export_types = list(/obj/item/construction/rcd)
|
|
|
|
/datum/export/rcd_ammo
|
|
cost = CARGO_CRATE_VALUE * 0.3
|
|
unit_name = "compressed matter cardridge"
|
|
export_types = list(/obj/item/rcd_ammo)
|
|
|
|
/datum/export/rpd
|
|
cost = CARGO_CRATE_VALUE * 0.5
|
|
unit_name = "rapid pipe dispenser"
|
|
export_types = list(/obj/item/pipe_dispenser)
|
|
|
|
//artisanal exports for the mom and pops
|
|
/datum/export/soap
|
|
cost = CARGO_CRATE_VALUE * 0.375
|
|
unit_name = "soap"
|
|
export_types = list(/obj/item/soap)
|
|
|
|
/datum/export/soap/homemade
|
|
cost = CARGO_CRATE_VALUE * 0.15
|
|
unit_name = "artisanal soap"
|
|
export_types = list(/obj/item/soap/homemade)
|
|
|
|
/datum/export/soap/omega
|
|
cost = CARGO_CRATE_VALUE * 14
|
|
unit_name = "omega soap"
|
|
export_types = list(/obj/item/soap/omega)
|
|
|
|
/datum/export/candle
|
|
cost = CARGO_CRATE_VALUE * 0.125
|
|
unit_name = "candle"
|
|
export_types = list(/obj/item/flashlight/flare/candle)
|