Merge remote-tracking branch 'upstream/master' into fuck512

This commit is contained in:
Archie
2021-06-28 03:32:04 -03:00
61 changed files with 4386 additions and 3937 deletions
@@ -408,16 +408,12 @@ Contains:
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/miner
name = "inquisitor's hardsuit"
icon_state = "hardsuit-inq"
item_state = "hardsuit-inq"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/miner
armor = list("melee" = 70, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
slowdown = 1
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/miner
name = "inquisitor's helmet"
icon_state = "hardsuit0-inq"
item_state = "hardsuit0-inq"
armor = list("melee" = 70, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/miner