Merge pull request #5134 from VOREStation/upstream-merge-6126

[MIRROR] Fixes some items having item_flag PHORONGUARD
This commit is contained in:
Novacat
2019-04-24 18:19:38 -04:00
committed by GitHub
3 changed files with 7 additions and 4 deletions
@@ -47,7 +47,8 @@
suit_type = "alien"
icon_state = "vox_rig"
armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50)
item_flags = THICKMATERIAL|PHORONGUARD
flags = PHORONGUARD
item_flags = THICKMATERIAL
siemens_coefficient = 0.2
offline_slowdown = 5
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
@@ -58,7 +58,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
flags = PHORONGUARD
item_flags = THICKMATERIAL | PHORONGUARD
item_flags = THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/suit_cooling_unit)
slowdown = 3
+4 -2
View File
@@ -8,7 +8,8 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
siemens_coefficient = 0.9
item_flags = THICKMATERIAL | PHORONGUARD
flags = PHORONGUARD
item_flags = THICKMATERIAL
/obj/item/clothing/suit/bio_suit
name = "bio suit"
@@ -23,7 +24,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
siemens_coefficient = 0.9
item_flags = THICKMATERIAL | PHORONGUARD
flags = PHORONGUARD
item_flags = THICKMATERIAL
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general