mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 13:07:46 +01:00
Adds Chemical flamethrowers (#25091)
* Initial work * Good enough to open a PR out of draft * Make these use the vars on the flamethrower * Moar fixes * Undefines define * Update code/game/objects/items/weapons/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * This won't compile * GDN review * Fixes CI * Fixes CI even more * 5 ammo per tile now * Heavily nerfs adding multiple fires * Adds phlogiston as a burnable reagent * Fixes the fire name * Placeholder sprite + ammo use fix * Now in cargo partially * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Lewc Review * Adds nuclear variant * Adds the chem flamethrower to the nukie uplink, alongside ammo * More fire armor tweaks * GDN review * Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * TEMPORARY PUSH * Adds inhands * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Fixes inhands * Makes air hot again * Lewc review * Audible messages and canister refilling * Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
DGamerL
co-authored by
GDN
Henri215
1080pCat
Luc
Burzah
GDN
Henri215
1080pCat
Luc
Burzah
parent
6ae5bfef8a
commit
e3c73110db
@@ -6,6 +6,8 @@
|
||||
color = "#FFAF00"
|
||||
process_flags = ORGANIC | SYNTHETIC
|
||||
taste_description = "burning"
|
||||
burn_temperature = T0C + 500
|
||||
burn_duration = 20 SECONDS
|
||||
var/temp_fire = 4000
|
||||
var/temp_deviance = 1000
|
||||
var/size_divisor = 40
|
||||
@@ -43,6 +45,7 @@
|
||||
temp_deviance = 500
|
||||
size_divisor = 80
|
||||
mob_burning = 3 // 15
|
||||
burn_temperature = T0C + 700
|
||||
|
||||
/datum/reagent/napalm
|
||||
name = "Napalm"
|
||||
@@ -52,6 +55,9 @@
|
||||
process_flags = ORGANIC | SYNTHETIC
|
||||
color = "#C86432"
|
||||
taste_description = "burning"
|
||||
burn_temperature = T0C + 500
|
||||
burn_duration = 40 SECONDS
|
||||
fire_stack_applications = 4 // BURN BABY BURN
|
||||
|
||||
/datum/reagent/napalm/reaction_temperature(exposed_temperature, exposed_volume)
|
||||
if(exposed_temperature > T0C + 100)
|
||||
@@ -91,6 +97,9 @@
|
||||
drink_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
|
||||
taste_description = "mistakes"
|
||||
process_flags = ORGANIC | SYNTHETIC
|
||||
burn_temperature = T0C + 400
|
||||
burn_duration = 15 SECONDS // Barely better than default
|
||||
|
||||
var/max_radius = 7
|
||||
var/min_radius = 0
|
||||
var/volume_radius_modifier = -0.15
|
||||
@@ -139,7 +148,7 @@
|
||||
T.create_reagents(50)
|
||||
T.reagents.add_reagent("fuel", volume)
|
||||
|
||||
/datum/reagent/fuel/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)//Splashing people with welding fuel to make them easy to ignite!
|
||||
/datum/reagent/fuel/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) // Splashing people with welding fuel to make them easy to ignite!
|
||||
if(method == REAGENT_TOUCH)
|
||||
if(M.on_fire)
|
||||
M.adjust_fire_stacks(6)
|
||||
@@ -152,6 +161,8 @@
|
||||
color = "#7A2B94"
|
||||
taste_description = "corporate assets going to waste"
|
||||
taste_mult = 1.5
|
||||
burn_temperature = T0C + 400
|
||||
burn_duration = 20 SECONDS
|
||||
|
||||
/datum/reagent/plasma/reaction_temperature(exposed_temperature, exposed_volume)
|
||||
if(exposed_temperature >= T0C + 100)
|
||||
@@ -185,6 +196,8 @@
|
||||
color = "#673910" // rgb: 103, 57, 16
|
||||
process_flags = ORGANIC | SYNTHETIC
|
||||
taste_description = "rust"
|
||||
burn_temperature = T0C + 1500 // hahahahHAHAHAHAH LET IT BURN
|
||||
burn_duration = 5 SECONDS // Not for long though
|
||||
|
||||
/datum/reagent/thermite/reaction_mob(mob/living/M, method= REAGENT_TOUCH, volume)
|
||||
if(method == REAGENT_TOUCH)
|
||||
@@ -237,6 +250,9 @@
|
||||
metabolization_rate = 4
|
||||
process_flags = ORGANIC | SYNTHETIC
|
||||
taste_mult = 0
|
||||
burn_temperature = T0C + 700
|
||||
burn_duration = 15 SECONDS
|
||||
fire_stack_applications = 3
|
||||
|
||||
/datum/reagent/clf3/on_mob_life(mob/living/M)
|
||||
if(M.on_fire)
|
||||
|
||||
@@ -45,6 +45,13 @@
|
||||
// Affects the quantity of the reagent that is requested by CC.
|
||||
var/goal_difficulty = REAGENT_GOAL_SKIP
|
||||
|
||||
/// At what temperature does this reagent burn? Currently only used for chemical flamethrowers
|
||||
var/burn_temperature = T0C
|
||||
/// How long would a fire burn using this reagent? Currently only used for chemical flamethrowers
|
||||
var/burn_duration = 30 SECONDS
|
||||
/// How many firestacks will the reagent apply when it is burning? Currently only used for chemical flamethrowers
|
||||
var/fire_stack_applications = 1
|
||||
|
||||
/datum/reagent/Destroy()
|
||||
. = ..()
|
||||
holder = null
|
||||
|
||||
Reference in New Issue
Block a user