From 3163228475534234fe2407aea65c4553934e6f38 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:39:59 -0400 Subject: [PATCH 1/8] Update ammo.dm --- code/datums/ammo/ammo.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 7a4006deee73..7f44f2945bd0 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -84,7 +84,7 @@ /// that will be given to a projectile with the current ammo datum var/list/list/traits_to_give - var/flamer_reagent_type = /datum/reagent/napalm/ut + var/flamer_reagent_id = "utnapthal" /// The flicker that plays when a bullet hits a target. Usually red. Can be nulled so it doesn't show up at all. var/hit_effect_color = "#FF0000" @@ -243,5 +243,12 @@ if(locate(/obj/flamer_fire) in T) return - var/datum/reagent/R = new flamer_reagent_type() - new /obj/flamer_fire(T, cause_data, R) + var/datum/reagent/ref = GLOB.chemical_reagents_list[flamer_reagent_id] //this is probably a bad way of doing this but it works + var/datum/reagent/P = new ref.type + P.intensityfire = ref.intensityfire + P.durationfire = ref.durationfire + P.burncolor = ref.burncolor + P.fire_penetrating = ref.fire_penetrating + P.burn_sprite = ref.burn_sprite + + new /obj/flamer_fire(T, cause_data, P) From f9da248bc8272570236304a94f2b1ba94d23d97a Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:40:35 -0400 Subject: [PATCH 2/8] Update misc.dm --- code/datums/ammo/misc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index 62a78539b6a2..bcb9673548db 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -49,11 +49,11 @@ drop_flame(get_turf(P), P.weapon_cause_data) /datum/ammo/flamethrower/tank_flamer - flamer_reagent_type = /datum/reagent/napalm/blue + flamer_reagent_id = "napalmx" /datum/ammo/flamethrower/sentry_flamer flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME - flamer_reagent_type = /datum/reagent/napalm/blue + flamer_reagent_id = "napalmx" accuracy = HIT_ACCURACY_TIER_8 accurate_range = 6 From ad30e3b6076c19e01a83a2d65caa1cb74bf996b8 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:41:34 -0400 Subject: [PATCH 3/8] Update gun_attachables.dm --- code/modules/projectiles/gun_attachables.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 1807213f6226..7e617e92e513 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3199,7 +3199,7 @@ Defined in conflicts.dm of the #defines folder. var/obj/projectile/P = new(src, create_cause_data(initial(name), user, src)) var/datum/ammo/flamethrower/ammo_datum = new projectile_type - ammo_datum.flamer_reagent_type = flamer_reagent.type + ammo_datum.flamer_reagent_id = flamer_reagent.id P.generate_bullet(ammo_datum) P.icon_state = "naptha_ball" P.color = flamer_reagent.color From 74b568bf1b1eeeebc37950adf6a206114b03c485 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:53:20 -0400 Subject: [PATCH 4/8] Update ammo.dm --- code/datums/ammo/ammo.dm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 7f44f2945bd0..a1c1f675e144 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -237,18 +237,18 @@ P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! -/datum/ammo/proc/drop_flame(turf/T, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 - if(!istype(T)) +/datum/ammo/proc/drop_flame(turf/Turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 + if(!istype(Turf)) return - if(locate(/obj/flamer_fire) in T) + if(locate(/obj/flamer_fire) in Turf) return - var/datum/reagent/ref = GLOB.chemical_reagents_list[flamer_reagent_id] //this is probably a bad way of doing this but it works - var/datum/reagent/P = new ref.type - P.intensityfire = ref.intensityfire - P.durationfire = ref.durationfire - P.burncolor = ref.burncolor - P.fire_penetrating = ref.fire_penetrating - P.burn_sprite = ref.burn_sprite + var/datum/reagent/reference = GLOB.chemical_reagents_list[flamer_reagent_id] //this is probably a bad way of doing this but it works + var/datum/reagent/chemical = new reference.type + chemical.intensityfire = reference.intensityfire + chemical.durationfire = reference.durationfire + chemical.burncolor = reference.burncolor + chemical.fire_penetrating = reference.fire_penetrating + chemical.burn_sprite = reference.burn_sprite - new /obj/flamer_fire(T, cause_data, P) + new /obj/flamer_fire(Turf, cause_data, chemical) From a5a62fd71fd438b5487f8661c7e8a9a0f031fa5c Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:39:24 -0400 Subject: [PATCH 5/8] Update code/datums/ammo/ammo.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/ammo/ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index a1c1f675e144..7b9184a401f7 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -237,8 +237,8 @@ P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! -/datum/ammo/proc/drop_flame(turf/Turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 - if(!istype(Turf)) +/datum/ammo/proc/drop_flame(turf/turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 + if(!istype(turf)) return if(locate(/obj/flamer_fire) in Turf) return From 305599d4378c329b12d6b95e9923e1ef4cc32fb4 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:39:34 -0400 Subject: [PATCH 6/8] Update code/datums/ammo/ammo.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/ammo/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 7b9184a401f7..5aab7d8d97ae 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -240,7 +240,7 @@ /datum/ammo/proc/drop_flame(turf/turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 if(!istype(turf)) return - if(locate(/obj/flamer_fire) in Turf) + if(locate(/obj/flamer_fire) in turf) return var/datum/reagent/reference = GLOB.chemical_reagents_list[flamer_reagent_id] //this is probably a bad way of doing this but it works From 42cdf7948ecff3d291b9efaad36622244b9a6397 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:39:42 -0400 Subject: [PATCH 7/8] Update code/datums/ammo/ammo.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/ammo/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 5aab7d8d97ae..76be7e9fe2e1 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -251,4 +251,4 @@ chemical.fire_penetrating = reference.fire_penetrating chemical.burn_sprite = reference.burn_sprite - new /obj/flamer_fire(Turf, cause_data, chemical) + new /obj/flamer_fire(turf, cause_data, chemical) From c384c306266490f3442f928545e942e1a3b47751 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:39:51 -0400 Subject: [PATCH 8/8] Update code/datums/ammo/ammo.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/ammo/ammo.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 76be7e9fe2e1..229c10b31e3a 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -243,12 +243,6 @@ if(locate(/obj/flamer_fire) in turf) return - var/datum/reagent/reference = GLOB.chemical_reagents_list[flamer_reagent_id] //this is probably a bad way of doing this but it works - var/datum/reagent/chemical = new reference.type - chemical.intensityfire = reference.intensityfire - chemical.durationfire = reference.durationfire - chemical.burncolor = reference.burncolor - chemical.fire_penetrating = reference.fire_penetrating - chemical.burn_sprite = reference.burn_sprite + var/datum/reagent/chemical = GLOB.chemical_reagents_list[flamer_reagent_id] new /obj/flamer_fire(turf, cause_data, chemical)