From c0b10f240511dc2cb4002983f09219257f571498 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 13 Mar 2023 23:52:57 -0800 Subject: [PATCH 1/3] Siege Hivebots Use Proper Projectile --- .../subtypes/mechanical/hivebot/ranged_damage.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index 077cf1ebac..e60965e84e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -112,7 +112,12 @@ /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege name = "siege engine hivebot" desc = "A large robot capable of delivering long range bombardment." +<<<<<<< HEAD projectiletype = /obj/item/projectile/arc/test +======= + projectiletype = /obj/item/projectile/arc/fragmentation/mortar + projectilesound = 'sound/weapons/mech_mortar.ogg' +>>>>>>> 7b35dc7e9ea... Merge pull request #9039 from Mechoid/SiegeHivebot icon_scale_x = 2 icon_scale_y = 2 icon_state = "red" @@ -158,4 +163,4 @@ projectiletype = /obj/item/projectile/arc/fragmentation /decl/mob_organ_names/hivebotsiege - hit_zones = list("central chassis", "armor plating", "reinforced positioning servo", "head", "sensor suite", "manipulator arm", "heavy weapons mount", "advanced weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg") \ No newline at end of file + hit_zones = list("central chassis", "armor plating", "reinforced positioning servo", "head", "sensor suite", "manipulator arm", "heavy weapons mount", "advanced weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg") From 8fa3852d5ea15ae8f2945b7bd4e0f0c6d5f9aee2 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 14 Mar 2023 18:05:10 +1000 Subject: [PATCH 2/3] Update ranged_damage.dm --- .../simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index e60965e84e..bed168ecd5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -112,12 +112,8 @@ /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege name = "siege engine hivebot" desc = "A large robot capable of delivering long range bombardment." -<<<<<<< HEAD - projectiletype = /obj/item/projectile/arc/test -======= projectiletype = /obj/item/projectile/arc/fragmentation/mortar projectilesound = 'sound/weapons/mech_mortar.ogg' ->>>>>>> 7b35dc7e9ea... Merge pull request #9039 from Mechoid/SiegeHivebot icon_scale_x = 2 icon_scale_y = 2 icon_state = "red" From 1471721003c5cea3ff1ab9f2f1f0d3988e5b9f66 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 14 Mar 2023 18:08:41 +1000 Subject: [PATCH 3/3] Update ranged_damage.dm --- .../simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index bed168ecd5..854e58ae12 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -113,7 +113,6 @@ name = "siege engine hivebot" desc = "A large robot capable of delivering long range bombardment." projectiletype = /obj/item/projectile/arc/fragmentation/mortar - projectilesound = 'sound/weapons/mech_mortar.ogg' icon_scale_x = 2 icon_scale_y = 2 icon_state = "red"