Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next

Hopefully everything works here. Need to do some testing.

soh/src/code/z_actor.c

@@ -1966,6 +1966,10 @@ s32 GiveItemWithoutActor(GlobalContext* globalCtx, s32 getItemId) {
                 player->getItemId = getItemId;
                 player->interactRangeActor = &player->actor;
                 player->getItemDirection = player->actor.shape.rot.y;
+                // Player state 26 = Player is frozen
+                if (player->stateFlags1 & (PLAYER_STATE1_26)) {
+                    player->pendingIceTrap = false;
+                }
                 return true;
             }
         }