mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
LemonInTheDarkandGitHub
8c2c72b0ed
## About The Pull Request Gives duffelbags their proper slot count They inherited this from backpacks, but I sorta just forgot about that [Creates "levels" of locked objects, uses that to make locked duffels work](https://github.com/tgstation/tgstation/pull/76442/commits/c613c00f62fa3ff03bb33737d24da9acbf2050e3) [c613c00](https://github.com/tgstation/tgstation/pull/76442/commits/c613c00f62fa3ff03bb33737d24da9acbf2050e3) Turns locked into something that holds defines, this makes life a lot easier. Requires a lot of boilerplate because of how many uses of these procs there are and all the passthrough and shit. Adds a few outfit subtypes to avoid this class of failure in future. Renames the args in a few but not all touched procs, one thing at a time Closes #76407 Closes #76430 Had the lock check in the wrong place Closes #76441 GOD I HATE TK SO MUCH Wrote half the pr without glasses so if it's weird gimme some grace yeah? ## Changelog 🆑 fix: Fixes some fuck with duffelbags, them not holding enough + issues with spawning gear in them (job shit and all) /🆑
88 lines
3.5 KiB
Plaintext
88 lines
3.5 KiB
Plaintext
#define CHECK_OUTFIT_SLOT(outfit_key, slot_name) if (outfit.##outfit_key) { \
|
|
H.equip_to_slot_or_del(new outfit.##outfit_key(H), ##slot_name, TRUE); \
|
|
/* We don't check the result of equip_to_slot_or_del because it returns false for random jumpsuits, as they delete themselves on init */ \
|
|
var/obj/item/outfit_item = H.get_item_by_slot(##slot_name); \
|
|
if (!outfit_item) { \
|
|
TEST_FAIL("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \
|
|
} \
|
|
outfit_item.on_outfit_equip(H, FALSE, ##slot_name); \
|
|
}
|
|
|
|
/// See #66313 and #60901. outfit_sanity used to runtime whenever you had two mergable sheets in either hand. Previously, this only had a 3% chance of occuring. Now 100%.
|
|
/datum/outfit/stacks_in_hands
|
|
name = "Mr. Runtime"
|
|
|
|
uniform = /obj/item/clothing/under/suit/tuxedo
|
|
glasses = /obj/item/clothing/glasses/sunglasses
|
|
mask = /obj/item/clothing/mask/cigarette/cigar/havana
|
|
shoes = /obj/item/clothing/shoes/laceup
|
|
l_hand = /obj/item/stack/spacecash/c1000
|
|
r_hand = /obj/item/stack/spacecash/c1000
|
|
|
|
/// outfit_sanity needs to cover insertions into duffelbags
|
|
/datum/outfit/duffel_user
|
|
name = "Mr. Runtime"
|
|
back = /obj/item/storage/backpack/duffelbag
|
|
backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
|
|
|
|
/// Satchels too
|
|
/datum/outfit/stachel_user
|
|
name = "Mr. Runtime"
|
|
back = /obj/item/storage/backpack/satchel
|
|
backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
|
|
|
|
/// And just in case we'll check backpacks
|
|
/datum/outfit/backpack_user
|
|
name = "Mr. Runtime"
|
|
back = /obj/item/storage/backpack
|
|
backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
|
|
|
|
|
|
|
|
/datum/unit_test/outfit_sanity/Run()
|
|
var/datum/outfit/prototype_outfit = /datum/outfit
|
|
var/prototype_name = initial(prototype_outfit.name)
|
|
var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human/consistent)
|
|
|
|
for (var/outfit_type in subtypesof(/datum/outfit))
|
|
// Only make one human and keep undressing it because it's much faster
|
|
for (var/obj/item/I in H.get_equipped_items(include_pockets = TRUE))
|
|
qdel(I)
|
|
|
|
var/datum/outfit/outfit = new outfit_type
|
|
|
|
if(outfit.name == prototype_name)
|
|
TEST_FAIL("[outfit.type]'s name is invalid! Uses default outfit name!")
|
|
outfit.pre_equip(H, TRUE)
|
|
|
|
CHECK_OUTFIT_SLOT(uniform, ITEM_SLOT_ICLOTHING)
|
|
CHECK_OUTFIT_SLOT(suit, ITEM_SLOT_OCLOTHING)
|
|
CHECK_OUTFIT_SLOT(belt, ITEM_SLOT_BELT)
|
|
CHECK_OUTFIT_SLOT(gloves, ITEM_SLOT_GLOVES)
|
|
CHECK_OUTFIT_SLOT(shoes, ITEM_SLOT_FEET)
|
|
CHECK_OUTFIT_SLOT(head, ITEM_SLOT_HEAD)
|
|
CHECK_OUTFIT_SLOT(mask, ITEM_SLOT_MASK)
|
|
CHECK_OUTFIT_SLOT(neck, ITEM_SLOT_NECK)
|
|
CHECK_OUTFIT_SLOT(ears, ITEM_SLOT_EARS)
|
|
CHECK_OUTFIT_SLOT(glasses, ITEM_SLOT_EYES)
|
|
CHECK_OUTFIT_SLOT(back, ITEM_SLOT_BACK)
|
|
CHECK_OUTFIT_SLOT(id, ITEM_SLOT_ID)
|
|
CHECK_OUTFIT_SLOT(l_pocket, ITEM_SLOT_LPOCKET)
|
|
CHECK_OUTFIT_SLOT(r_pocket, ITEM_SLOT_RPOCKET)
|
|
CHECK_OUTFIT_SLOT(suit_store, ITEM_SLOT_SUITSTORE)
|
|
if (outfit.backpack_contents || outfit.box)
|
|
var/list/backpack_contents = outfit.backpack_contents?.Copy()
|
|
if (outfit.box)
|
|
if (!backpack_contents)
|
|
backpack_contents = list()
|
|
backpack_contents.Insert(1, outfit.box)
|
|
backpack_contents[outfit.box] = 1
|
|
|
|
for (var/path in backpack_contents)
|
|
var/number = backpack_contents[path] || 1
|
|
for (var/_ in 1 to number)
|
|
if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE, indirect_action = TRUE))
|
|
TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.")
|
|
|
|
#undef CHECK_OUTFIT_SLOT
|