From 46189db3216ed1006a572f58fae4ec7652c6b190 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:59:52 -0400 Subject: [PATCH 1/7] Update rocket.dm --- code/datums/ammo/rocket.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 7581d434c4b4..adb03cecc8ec 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -196,11 +196,6 @@ var/datum/reagent/napalm/blue/reagent = new() new /obj/flamer_fire(turf, cause_data, reagent, 3) - var/datum/effect_system/smoke_spread/phosphorus/landingSmoke = new /datum/effect_system/smoke_spread/phosphorus - landingSmoke.set_up(3, 0, turf, null, 6, cause_data) - landingSmoke.start() - landingSmoke = null - /datum/ammo/rocket/wp/on_hit_mob(mob/mob, obj/projectile/projectile) drop_flame(get_turf(mob), projectile.weapon_cause_data) From c13a7a0c90f57faf0273048dd5791d023f60fac2 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:13:12 -0400 Subject: [PATCH 2/7] Update rocket.dm --- code/datums/ammo/rocket.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 140a63629b65..ee92ae9c63ae 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -196,6 +196,11 @@ var/datum/reagent/napalm/blue/reagent = new() new /obj/flamer_fire(turf, cause_data, reagent, 3) + var/datum/effect_system/smoke_spread/landing_smoke = new /datum/effect_system/smoke_spread + landing_smoke.set_up(3, 0, turf, null, 6, cause_data) + landing_smoke.start() + landing_smoke = null + /datum/ammo/rocket/wp/on_hit_mob(mob/mob, obj/projectile/projectile) drop_flame(get_turf(mob), projectile.weapon_cause_data) From 08164801997c5f9503dc6282d85f59f460992ccf Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:41:19 -0400 Subject: [PATCH 3/7] Update rocket.dm --- code/datums/ammo/rocket.dm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index ee92ae9c63ae..d3e5b7ec1f7c 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -196,10 +196,10 @@ var/datum/reagent/napalm/blue/reagent = new() new /obj/flamer_fire(turf, cause_data, reagent, 3) - var/datum/effect_system/smoke_spread/landing_smoke = new /datum/effect_system/smoke_spread - landing_smoke.set_up(3, 0, turf, null, 6, cause_data) - landing_smoke.start() - landing_smoke = null + var/datum/effect_system/smoke_spread/phosphorus/landing_Smoke = new /datum/effect_system/smoke_spread/phosphorus + landing_Smoke.set_up(3, 0, turf, null, 6, cause_data) + landing_Smoke.start() + landing_Smoke = null /datum/ammo/rocket/wp/on_hit_mob(mob/mob, obj/projectile/projectile) drop_flame(get_turf(mob), projectile.weapon_cause_data) @@ -273,6 +273,23 @@ drop_flame(get_turf(projectile), projectile.weapon_cause_data) explosion(projectile.loc, -1, 2, 4, 5, , , ,projectile.weapon_cause_data) +/datum/ammo/rocket/wp/quad/quadcucked + name = "thermobaric rocket" + flags_ammo_behavior = AMMO_ROCKET|AMMO_STRIKES_SURFACE + + damage = 100 + max_range = 32 + shell_speed = AMMO_SPEED_TIER_3 + +/datum/ammo/rocket/wp/quad/quadcucked/drop_flame(turf/turf, datum/cause_data/cause_data) + . = ..() + playsound(turf, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) + if(!istype(turf)) return + smoke.set_up(1, turf) + smoke.start() + var/datum/reagent/napalm/ut/reagent = new() + new /obj/flamer_fire(turf, cause_data, reagent, 3) + /datum/ammo/rocket/custom name = "custom rocket" accurate_range = 8 From 77a3e185fccac190f06aaa15f8e4d1582cb1729e Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:43:32 -0400 Subject: [PATCH 4/7] Update rocket.dm --- code/datums/ammo/rocket.dm | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index d3e5b7ec1f7c..722602cada69 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -196,10 +196,10 @@ var/datum/reagent/napalm/blue/reagent = new() new /obj/flamer_fire(turf, cause_data, reagent, 3) - var/datum/effect_system/smoke_spread/phosphorus/landing_Smoke = new /datum/effect_system/smoke_spread/phosphorus - landing_Smoke.set_up(3, 0, turf, null, 6, cause_data) - landing_Smoke.start() - landing_Smoke = null + var/datum/effect_system/smoke_spread/phosphorus/landingSmoke = new /datum/effect_system/smoke_spread/phosphorus + landingSmoke.set_up(3, 0, turf, null, 6, cause_data) + landingSmoke.start() + landingSmoke = null /datum/ammo/rocket/wp/on_hit_mob(mob/mob, obj/projectile/projectile) drop_flame(get_turf(mob), projectile.weapon_cause_data) @@ -273,23 +273,6 @@ drop_flame(get_turf(projectile), projectile.weapon_cause_data) explosion(projectile.loc, -1, 2, 4, 5, , , ,projectile.weapon_cause_data) -/datum/ammo/rocket/wp/quad/quadcucked - name = "thermobaric rocket" - flags_ammo_behavior = AMMO_ROCKET|AMMO_STRIKES_SURFACE - - damage = 100 - max_range = 32 - shell_speed = AMMO_SPEED_TIER_3 - -/datum/ammo/rocket/wp/quad/quadcucked/drop_flame(turf/turf, datum/cause_data/cause_data) - . = ..() - playsound(turf, 'sound/weapons/gun_flamethrower3.ogg', 75, 1, 7) - if(!istype(turf)) return - smoke.set_up(1, turf) - smoke.start() - var/datum/reagent/napalm/ut/reagent = new() - new /obj/flamer_fire(turf, cause_data, reagent, 3) - /datum/ammo/rocket/custom name = "custom rocket" accurate_range = 8 From 8e7831a1bd024f051a2a4214f3110cebafafdd17 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:45:21 -0400 Subject: [PATCH 5/7] Update smoke.dm --- code/game/objects/effects/effect_system/smoke.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index c9e404ae5b60..cded08d1d375 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -241,8 +241,7 @@ burn_damage *= xeno_yautja_reduction M.burn_skin(burn_damage) - M.adjust_fire_stacks(applied_fire_stacks) - M.fire_reagent = new /datum/reagent/napalm/ut() + M.adjust_fire_stacks(applied_fire_stacks, /datum/reagent/napalm/ut) M.IgniteMob() M.updatehealth() From 7e0bb79e2a1d35779fc27fad9684a2d0a61ca173 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:50:30 -0400 Subject: [PATCH 6/7] Update smoke.dm --- code/game/objects/effects/effect_system/smoke.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index cded08d1d375..fdaa75b12e44 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -241,7 +241,7 @@ burn_damage *= xeno_yautja_reduction M.burn_skin(burn_damage) - M.adjust_fire_stacks(applied_fire_stacks, /datum/reagent/napalm/ut) + M.adjust_fire_stacks(applied_fire_stacks, "utnapthal") M.IgniteMob() M.updatehealth() From 6dd2332838bb12b54369491d8678161ecd54d8dc Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:56:20 -0400 Subject: [PATCH 7/7] Update smoke.dm --- code/game/objects/effects/effect_system/smoke.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index fdaa75b12e44..3a555ae54557 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -240,8 +240,9 @@ if(isyautja(M) || isxeno(M)) burn_damage *= xeno_yautja_reduction + var/reagent = new /datum/reagent/napalm/ut() M.burn_skin(burn_damage) - M.adjust_fire_stacks(applied_fire_stacks, "utnapthal") + M.adjust_fire_stacks(applied_fire_stacks, reagent) M.IgniteMob() M.updatehealth()