From 6577aaac91921502c3ec8aa7c68695c9ff35faa9 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sun, 25 Oct 2020 05:30:06 -0400 Subject: [PATCH 1/4] FRUSTRATION --- code/modules/mining/lavaland/necropolis_chests.dm | 4 ++++ .../mob/living/simple_animal/hostile/megafauna/legion.dm | 1 + 2 files changed, 5 insertions(+) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a967fea75a..947ee14874 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -760,6 +760,7 @@ /obj/item/melee/transforming/cleaving_saw name = "cleaving saw" desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF force = 12 force_on = 20 //force when active throwforce = 20 @@ -1026,6 +1027,7 @@ /obj/item/lava_staff name = "staff of lava" desc = "The ability to fill the emergency shuttle with lava. What more could you want out of life?" + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon_state = "staffofstorms" item_state = "staffofstorms" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' @@ -1177,6 +1179,7 @@ /obj/item/gun/ballistic/revolver/doublebarrel/super name = "super combat shotgun" desc = "From the belly of the beast - or rather, demon. Twice as lethal as a less-than-super shotgun, but a tad bulkier." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon_state = "heckgun" slot_flags = null mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/heck @@ -1207,6 +1210,7 @@ /obj/item/hierophant_club name = "hierophant club" desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon_state = "hierophant_club_ready_beacon" item_state = "hierophant_club_ready_beacon" icon = 'icons/obj/lavaland/artefacts.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 3c6857b54e..b066e7454a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -263,6 +263,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza /obj/item/staff/storm name = "staff of storms" desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon_state = "staffofstorms" item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' From 5eec2b76f54e1cdc22569c61bbf8767900a9f93d Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sun, 25 Oct 2020 05:34:24 -0400 Subject: [PATCH 2/4] OK MAYBE NOT INDESTRUCTIBLE OK --- code/modules/mining/lavaland/necropolis_chests.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 947ee14874..577663fab8 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -325,7 +325,7 @@ icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "memento_mori" actions_types = list(/datum/action/item_action/hands_free/memento_mori) - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/mob/living/carbon/human/active_owner /obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot, mob/user, datum/action/A) @@ -760,7 +760,7 @@ /obj/item/melee/transforming/cleaving_saw name = "cleaving saw" desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force." - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF force = 12 force_on = 20 //force when active throwforce = 20 @@ -1027,7 +1027,6 @@ /obj/item/lava_staff name = "staff of lava" desc = "The ability to fill the emergency shuttle with lava. What more could you want out of life?" - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon_state = "staffofstorms" item_state = "staffofstorms" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' @@ -1179,7 +1178,7 @@ /obj/item/gun/ballistic/revolver/doublebarrel/super name = "super combat shotgun" desc = "From the belly of the beast - or rather, demon. Twice as lethal as a less-than-super shotgun, but a tad bulkier." - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "heckgun" slot_flags = null mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/heck @@ -1210,7 +1209,7 @@ /obj/item/hierophant_club name = "hierophant club" desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat." - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "hierophant_club_ready_beacon" item_state = "hierophant_club_ready_beacon" icon = 'icons/obj/lavaland/artefacts.dmi' From 2c278ba370d90c48c714927d3f6292742432f198 Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sun, 25 Oct 2020 05:34:53 -0400 Subject: [PATCH 3/4] A A --- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 577663fab8..0953ea138d 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -325,7 +325,7 @@ icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "memento_mori" actions_types = list(/datum/action/item_action/hands_free/memento_mori) - resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/mob/living/carbon/human/active_owner /obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot, mob/user, datum/action/A) From 626fcf0aebe400967742cb8aeba661591cefb74c Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Sun, 25 Oct 2020 05:36:59 -0400 Subject: [PATCH 4/4] OOPS FUCK --- .../mob/living/simple_animal/hostile/megafauna/legion.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index b066e7454a..174883650d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -263,7 +263,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza /obj/item/staff/storm name = "staff of storms" desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it." - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF icon_state = "staffofstorms" item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi'