Manual pull 83910 (#28201)

After Attack Fixes (#83910)

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
Gandalf
2024-06-15 18:47:27 +01:00
committed by GitHub
co-authored by MrMelbert
parent 135c84aba9
commit ffe5ae7172
9 changed files with 131 additions and 83 deletions
+5 -6
View File
@@ -16,19 +16,19 @@
var/datum/storage/tray_storage = test_tray.atom_storage
tray_storage.collection_mode = COLLECT_ONE
test_tray.pre_attack(the_bread, human)
test_tray.melee_attack_chain(human, the_bread)
TEST_ASSERT_EQUAL((the_bread in test_tray.contents), TRUE, "The bread did not get picked up by the serving tray")
test_tray.pre_attack(banana, human)
test_tray.melee_attack_chain(human, banana)
TEST_ASSERT_EQUAL((banana in test_tray.contents), TRUE, "The banana did not get picked up by the serving tray")
the_table.attackby(test_tray, human)
test_tray.melee_attack_chain(human, the_table)
TEST_ASSERT_EQUAL(test_tray.contents.len, 0, "The serving tray did not drop all items on hitting the table")
test_tray.pre_attack(sugarcookie, human)
test_tray.melee_attack_chain(human, sugarcookie)
TEST_ASSERT_EQUAL((sugarcookie in test_tray.contents), TRUE, "The sugarcookie did not get picked up by the serving tray")
@@ -41,7 +41,6 @@
human.equip_to_slot(test_tray, ITEM_SLOT_RPOCKET)
TEST_ASSERT(human.get_item_by_slot(ITEM_SLOT_RPOCKET), "Serving tray failed to fit in the Right Pocket")
test_tray.attack(human, human)
test_tray.melee_attack_chain(human, human)
TEST_ASSERT_EQUAL(test_tray.contents.len, 0, "The serving tray did not drop all items on hitting a human")