Wizard Staves fit in Wizard Robes (#20905)

* try to fix

* Sirryan Review

* i am awful at Ctrl + F it seems
This commit is contained in:
matttheficus
2023-06-09 12:05:57 -04:00
committed by GitHub
parent 9418e343c4
commit 014c684ac5
4 changed files with 6 additions and 3 deletions
+2
View File
@@ -557,6 +557,8 @@
var/ignore_suitadjust = TRUE
var/adjust_flavour = null
var/list/hide_tail_by_species = null
/// Maximum weight class of an item in the suit storage slot.
var/max_suit_w = WEIGHT_CLASS_BULKY
//Proc that opens and closes jackets.
/obj/item/clothing/suit/proc/adjustsuit(mob/user)
+2 -1
View File
@@ -89,7 +89,8 @@
permeability_coefficient = 0.01
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
allowed = list(/obj/item/teleportation_scroll)
allowed = list(/obj/item/teleportation_scroll, /obj/item/gun/magic/staff, /obj/item/melee/ghost_sword, /obj/item/lava_staff, /obj/item/hierophant_club)
max_suit_w = WEIGHT_CLASS_HUGE
flags_inv = HIDEJUMPSUIT
strip_delay = 50
put_on_delay = 50
@@ -809,7 +809,7 @@
if(!disable_warning)
to_chat(H, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return FALSE
if(I.w_class > WEIGHT_CLASS_BULKY)
if(I.w_class > H.wear_suit.max_suit_w)
if(!disable_warning)
to_chat(H, "<span class='warning'>[I] is too big to attach.</span>")
return FALSE
+1 -1
View File
@@ -461,7 +461,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(!disable_warning)
to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
if(src.w_class > WEIGHT_CLASS_BULKY)
if(w_class > H.wear_suit.max_suit_w)
if(!disable_warning)
to_chat(usr, "The [name] is too big to attach.")
return 0