some derps

This commit is contained in:
phil235
2016-09-27 22:49:27 +02:00
parent 2d2975f783
commit 20af3ea260
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -595,7 +595,7 @@
. += image(icon = 'icons/effects/effects.dmi', icon_state = "[shield_state]")
/obj/item/clothing/head/helmet/space/hardsuit/shielded
resistance_flags = ACID_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
///////////////Capture the Flag////////////////////
+1 -1
View File
@@ -157,7 +157,7 @@
blood_overlay_type = "armor"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
actions_types = list(/datum/action/item_action/toggle)
resistance_flags = ACID_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
hit_reaction_chance = 50
+2 -2
View File
@@ -72,7 +72,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
resistance_flags = ACID_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/head/cloakhood/drake
name = "drake helm"
@@ -81,7 +81,7 @@
armor = list(melee = 70, bullet = 30, laser = 50, energy = 40, bomb = 70, bio = 60, rad = 50, fire = 50, acid = 100)
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
resistance_flags = ACID_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
/* //wip
/obj/item/clothing/cloak/wizard //Not actually obtainable until proper balancing can be done
+1 -1
View File
@@ -146,7 +146,7 @@
resistance_flags = 0
/obj/item/clothing/suit/wizrobe/paper
name = "papier-m?ch? robe"
name = "papier-mâché robe"
desc = "A robe held together by various bits of clear-tape and paste."
icon_state = "wizard-paper"
item_state = "wizrobe"