Merge pull request #13626 from zeroisthebiggay/GOD

[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
This commit is contained in:
silicons
2020-10-28 07:53:44 -07:00
committed by GitHub
2 changed files with 4 additions and 0 deletions

View File

@@ -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 = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
force = 12
force_on = 20 //force when active
throwforce = 20
@@ -1177,6 +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 = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
icon_state = "heckgun"
slot_flags = null
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/heck
@@ -1207,6 +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 = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
icon_state = "hierophant_club_ready_beacon"
item_state = "hierophant_club_ready_beacon"
icon = 'icons/obj/lavaland/artefacts.dmi'