Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds upgraded fuel tanks to the research biomass machine #6415

Merged
merged 9 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
#define MATRIX_NVG 1
#define MATRIX_WIDE 2

#define RESEARCH_UPGRADE_NULL null
#define RESEARCH_UPGRADE_EXCLUDE_BUY -2
#define RESEARCH_UPGRADE_CATEGORY -1 //lord forgive me
#define RESEARCH_UPGRADE_TIER_1 1
Expand Down
23 changes: 23 additions & 0 deletions code/datums/research_upgrade_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
behavior = RESEARCH_UPGRADE_TIER_1
upgrade_type = ITEM_ACCESSORY_UPGRADE
clearance_req = 4

/datum/research_upgrades/item/nanosplints
name = "Reinforced Fiber Splints"
desc = "A set of splints made from durable carbon fiber sheets reinforced with flexible titanium lattice, comes in a stack of five."
Expand All @@ -111,6 +112,28 @@
behavior = RESEARCH_UPGRADE_TIER_5 //adjust this to change amount of nanosplints in a stack, cant be higher than five, go change max_amount in the nanosplint itself, then change it.
upgrade_type = ITEM_ACCESSORY_UPGRADE

/datum/research_upgrades/item/flamer_tank
name = "Upgraded Incinerator Tank"
desc = "An upgraded incinerator tank, with larger capacity and able to handle stronger fuels."
value_upgrade = 300
clearance_req = 1
change_purchase = 100
minimum_price = 100
maximum_price = 1000
item_reference = /obj/item/ammo_magazine/flamer_tank/custom/upgraded
behavior = RESEARCH_UPGRADE_NULL
upgrade_type = ITEM_ACCESSORY_UPGRADE

/datum/research_upgrades/item/flamer_tank/smoke
name = "Upgraded Incinerator Smoke Tank"
desc = "An upgraded incinerator smoke tank with a larger capacity."
value_upgrade = 100 //not useful enough to be expensive
clearance_req = 1
item_reference = /obj/item/ammo_magazine/flamer_tank/smoke/upgraded
change_purchase = 50
minimum_price = 100
maximum_price = 500

/datum/research_upgrades/armor
name = "Armor"
behavior = RESEARCH_UPGRADE_CATEGORY
Expand Down
21 changes: 21 additions & 0 deletions code/modules/projectiles/magazines/flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,24 @@
matter = list("metal" = 3750)
flamer_chem = null
custom = TRUE

//tanks printable by the research biomass machine
/obj/item/ammo_magazine/flamer_tank/custom/upgraded
name = "Upgraded custom incinerator tank"
desc = "A fuel tank used to store fuel for use in the M240 incinerator unit. This one has been modified with a larger and more sophisticated internal propellant tank, allowing for bigger capacity and stronger fuels."
matter = list("metal" = 50) // no free metal
flamer_chem = null
max_rounds = 200
max_range = 7
fuel_pressure = 1
max_duration = 50
max_intensity = 60
custom = TRUE

/obj/item/ammo_magazine/flamer_tank/smoke/upgraded
name = "Large custom incinerator smoke tank"
desc = "A tank holding powdered smoke that expands when exposed to an open flame and carries any chemicals along with it. This one has been outfitted with an upgraded internal compressor, allowing for bigger capacity."
matter = list("metal" = 50) //no free metal
flamer_chem = null
custom = TRUE
max_rounds = 150
Loading