Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476

[MIRROR] Uppercases slot defines.
This commit is contained in:
LetterJay
2018-05-21 11:23:02 -05:00
committed by GitHub
228 changed files with 1641 additions and 1642 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(PDAs)
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags_1 = NOBLUDGEON_1
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_ID | SLOT_BELT
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF